diff --git a/bower.json b/bower.json index 8bf3f917..02e2dd1d 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "stackedit", - "version": "2.1.5", + "version": "2.1.6", "description": "StackEdit is a free, open-source Markdown editor based on PageDown, the Markdown library used by Stack Overflow and the other Stack Exchange sites.", "dependencies": { "bootstrap": "3.0.0", diff --git a/cache.manifest b/cache.manifest index aa4b9a68..b2d75599 100644 --- a/cache.manifest +++ b/cache.manifest @@ -1,5 +1,5 @@ CACHE MANIFEST -#Date Sat Sep 21 2013 11:59:13 +#Date Sat Sep 21 2013 16:28:43 CACHE: index.html diff --git a/package.json b/package.json index e85d67aa..ac80f9d0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "stackedit", - "version": "2.1.5", + "version": "2.1.6", "description": "StackEdit is a free, open-source Markdown editor based on PageDown, the Markdown library used by Stack Overflow and the other Stack Exchange sites.", "main": "res/main.js", "directories": { diff --git a/res-min/main.js b/res-min/main.js index a96a0f8c..a96d8bed 100644 --- a/res-min/main.js +++ b/res-min/main.js @@ -11856,7 +11856,7 @@ printStackTrace.implementation = function() {}, printStackTrace.implementation.p }, utils; }); -var VERSION = "2.1.5", MAIN_URL = "http://benweet.github.io/stackedit/", GOOGLE_ANALYTICS_ACCOUNT_ID = "UA-39556145-1", GOOGLE_API_KEY = "AIzaSyAeCU8CGcSkn0z9js6iocHuPBX4f_mMWkw", GOOGLE_SCOPES = [ "https://www.googleapis.com/auth/drive.install", "https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/blogger", "https://picasaweb.google.com/data/" ], GOOGLE_DRIVE_APP_ID = "241271498917", DROPBOX_APP_KEY = "lq6mwopab8wskas", DROPBOX_APP_SECRET = "851fgnucpezy84t", BITLY_ACCESS_TOKEN = "317e033bfd48cf31155a68a536b1860013b09c4c", DEFAULT_FILE_TITLE = "Title", DEFAULT_FOLDER_NAME = "New folder", GDRIVE_DEFAULT_FILE_TITLE = "New Markdown document", EDITOR_DEFAULT_PADDING = 15, CHECK_ONLINE_PERIOD = 12e4, AJAX_TIMEOUT = 3e4, ASYNC_TASK_DEFAULT_TIMEOUT = 6e4, ASYNC_TASK_LONG_TIMEOUT = 18e4, SYNC_PERIOD = 18e4, USER_IDLE_THRESHOLD = 3e5, IMPORT_FILE_MAX_CONTENT_SIZE = 1e5, IMPORT_IMG_MAX_CONTENT_SIZE = 1e7, TEMPORARY_FILE_INDEX = "file.tempIndex", WELCOME_DOCUMENT_TITLE = "Welcome document", DOWNLOAD_PROXY_URL = "http://stackedit-download-proxy.herokuapp.com/", PICASA_PROXY_URL = "http://stackedit-picasa-proxy.herokuapp.com/", WORDPRESS_CLIENT_ID = "3185", WORDPRESS_PROXY_URL = "http://stackedit-wordpress-proxy.herokuapp.com/", SSH_PROXY_URL = "http://stackedit-ssh-proxy.herokuapp.com/", delayedFunction = void 0, BASE_URL = "http://localhost/stackedit/", GOOGLE_CLIENT_ID = "241271498917-lev37kef013q85avc91am1gccg5g8lrb.apps.googleusercontent.com", GITHUB_CLIENT_ID = "e47fef6055344579799d", GATEKEEPER_URL = "http://stackedit-gatekeeper-localhost.herokuapp.com/", TUMBLR_PROXY_URL = "http://stackedit-tumblr-proxy-local.herokuapp.com/"; +var VERSION = "2.1.6", MAIN_URL = "http://benweet.github.io/stackedit/", GOOGLE_ANALYTICS_ACCOUNT_ID = "UA-39556145-1", GOOGLE_API_KEY = "AIzaSyAeCU8CGcSkn0z9js6iocHuPBX4f_mMWkw", GOOGLE_SCOPES = [ "https://www.googleapis.com/auth/drive.install", "https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/blogger", "https://picasaweb.google.com/data/" ], GOOGLE_DRIVE_APP_ID = "241271498917", DROPBOX_APP_KEY = "lq6mwopab8wskas", DROPBOX_APP_SECRET = "851fgnucpezy84t", BITLY_ACCESS_TOKEN = "317e033bfd48cf31155a68a536b1860013b09c4c", DEFAULT_FILE_TITLE = "Title", DEFAULT_FOLDER_NAME = "New folder", GDRIVE_DEFAULT_FILE_TITLE = "New Markdown document", EDITOR_DEFAULT_PADDING = 15, CHECK_ONLINE_PERIOD = 12e4, AJAX_TIMEOUT = 3e4, ASYNC_TASK_DEFAULT_TIMEOUT = 6e4, ASYNC_TASK_LONG_TIMEOUT = 18e4, SYNC_PERIOD = 18e4, USER_IDLE_THRESHOLD = 3e5, IMPORT_FILE_MAX_CONTENT_SIZE = 1e5, IMPORT_IMG_MAX_CONTENT_SIZE = 1e7, TEMPORARY_FILE_INDEX = "file.tempIndex", WELCOME_DOCUMENT_TITLE = "Welcome document", DOWNLOAD_PROXY_URL = "http://stackedit-download-proxy.herokuapp.com/", PICASA_PROXY_URL = "http://stackedit-picasa-proxy.herokuapp.com/", WORDPRESS_CLIENT_ID = "3185", WORDPRESS_PROXY_URL = "http://stackedit-wordpress-proxy.herokuapp.com/", SSH_PROXY_URL = "http://stackedit-ssh-proxy.herokuapp.com/", delayedFunction = void 0, BASE_URL = "http://localhost/stackedit/", GOOGLE_CLIENT_ID = "241271498917-lev37kef013q85avc91am1gccg5g8lrb.apps.googleusercontent.com", GITHUB_CLIENT_ID = "e47fef6055344579799d", GATEKEEPER_URL = "http://stackedit-gatekeeper-localhost.herokuapp.com/", TUMBLR_PROXY_URL = "http://stackedit-tumblr-proxy-local.herokuapp.com/"; 0 === location.hostname.indexOf("benweet.github.io") && (BASE_URL = MAIN_URL, GOOGLE_CLIENT_ID = "241271498917-jpto9lls9fqnem1e4h6ppds9uob8rpvu.apps.googleusercontent.com", GITHUB_CLIENT_ID = "fa0d09514da8377ee32e", GATEKEEPER_URL = "http://stackedit-gatekeeper.herokuapp.com/", @@ -17691,7 +17691,7 @@ if (hljs.LANGUAGES.glsl = function(e) { var n = 0; return e = e.replace(/\[\^(.+?)\]/g, function(e, i) { var o = h(i), r = t.footnotes[o]; - if (void 0 === r) return ""; + if (void 0 === r) return e; n++, t.usedFootnotes.push(o); var s = '' + n + ""; return t.hashExtraInline(s); @@ -19461,7 +19461,7 @@ if (hljs.LANGUAGES.glsl = function(e) { }), v(); }, u.onEventMgrCreated(u), u; }), define("text!html/bodyIndex.html", [], function() { - return '
\n
\n
\n
\n \n \n \n \n \n \n \n \n
\n
\n
\n
\n
\n
\n\n
\n \n
\n
\n \n StackEdit Viewer Open from...\n
\n \n
\n\n Save as...\n
\n \n
\n
\n
SYNCHRONIZE
\n
\n Google Drive\n
\n \n
\n Dropbox\n
\n \n
\n Manage synchronization\n
\n
PUBLISH
\n
\n Publish on...\n
\n
    \n
\n
\n \n Manage publication\n
\n \n\n
\n
\n\n\n
\n \n
\n
\n \n \n
\n \n
\n
\n
\n
\n
\n
\n
\n
\n\n\n
\n
\n
\n\n
\n \n

Manage documents

\n
\n
\n
\n \n
\n

The following documents will be\n deleted locally:

\n

Please choose a destination\n folder:

\n
\n
\n
\n
\n Cancel\n OK\n Close\n
\n
\n
\n
\n\n\n
\n
\n
\n\n
\n \n

Hyperlink

\n
\n
\n

Please provide the link URL and an optional title:

\n
\n \n
\n
\n
\n Cancel\n OK\n
\n
\n
\n
\n\n\n
\n
\n
\n\n
\n \n

Image

\n
\n
\n

Please provide the image URL and an optional title:

\n
\n \n
\n
\n
\n Import\n from Google+ Cancel OK\n
\n
\n
\n
\n\n\n
\n
\n
\n\n
\n \n

Google+ image import

\n
\n
\n
\n
\n
\n \n
\n
\n
\n \n
\n \n
\n
\n
\n \n
\n px\n
\n
\n
\n
\n
\n Cancel\n OK\n
\n
\n
\n
\n\n\n
\n
\n
\n\n
\n \n

Delete

\n
\n
\n

\n Are you sure you want to delete ""?\n

\n
\n NOTE: This will not delete the file on synchronized\n locations.\n
\n
\n
\n Cancel\n Delete\n
\n
\n
\n
\n\n\n
\n
\n
\n\n
\n \n

Open from URL

\n
\n
\n

Please provide a link to a Markdown document.

\n
\n
\n \n
\n \n
\n
\n
\n
\n
\n Cancel\n OK\n
\n
\n
\n
\n\n\n
\n
\n
\n\n
\n \n

Import from hard drive

\n
\n
\n

Please select your Markdown files here:

\n

\n \n

\n

Or drag and drop your Markdown files here:

\n

Drop\n files here

\n
\n
\n Close\n
\n
\n
\n
\n\n\n
\n
\n
\n\n
\n \n

Convert HTML to Markdown

\n
\n
\n

Please select your HTML files here:

\n

\n \n

\n

Or drag and drop your HTML files here:

\n

Drop\n files here

\n

Or insert your HTML code here:

\n \n
\n
\n Close OK\n
\n
\n
\n
\n\n\n
\n
\n
\n\n
\n \n

Export to Google Drive

\n
\n
\n

\n This will save "" to your \n Google Drive\n account and keep it synchronized.\n

\n
\n
\n \n
\n
\n \n
\n \n
\n
\n If no folder ID is supplied, the\n file will be created in your root folder. \n
\n
\n
\n
\n
\n \n
\n
\n
\n \n
\n This will overwrite the existing file\n on the server. \n
\n
\n
\n
\n NOTE:\n
    \n
  • You can move or rename the file afterwards within Google\n Drive.
    • \n
  • Real time collaborative documents can\'t be open outside\n StackEdit.
    • \n
  • Real time collaborative documents can\'t have multiple\n synchronized locations.
    • \n
\n
\n
\n
\n Cancel\n OK\n
\n
\n
\n
\n\n\n
\n
\n
\n\n
\n \n

Export to Dropbox

\n
\n
\n

\n This will save "" to your \n Dropbox\n account and keep it synchronized.\n

\n
\n
\n \n
\n \n File path is composed of both\n folder and filename. \n
\n
\n
\n
\n NOTE:\n
    \n
  • Dropbox file path does not depend on document title.
    • \n
  • The title of your document will not be synchronized.
    • \n
  • Destination folder must exist.
    • \n
  • Any existing file at this location will be overwritten.
    • \n
\n
\n
\n
\n Cancel\n OK\n
\n
\n
\n
\n\n\n
\n
\n
\n\n
\n \n

Synchronization

\n
\n
\n

\n "" is synchronized with the\n following location(s):\n

\n
\n
\n NOTE: Removing a synchronized location will not delete any\n file.\n
\n
\n "" is not synchronized yet.
\n
NOTE: You can add synchronized locations by\n exporting your document using \n Google Drive\n or \n Dropbox\n sub-menu.\n
\n
\n
\n Close\n
\n
\n
\n
\n\n\n
\n
\n
\n\n
\n \n

\n Publish on \n

\n
\n
\n
\n
\n \n
\n Host must be accessible publicly,\n unless you are hosting your own SSH\n proxy.\n \n
\n
\n
\n \n
\n \n
\n
\n
\n \n
\n \n
\n
\n
\n \n
\n Passwords are transmitted in clear,\n unless you are hosting your own SSH\n proxy.\n \n
\n
\n
\n \n
\n \n
\n
\n
\n \n
\n \n
\n
\n
\n \n
\n \n
\n
\n
\n \n
\n \n
\n
\n
\n \n
\n \n
\n
\n
\n \n
\n \n
\n
\n
\n \n
\n
\n \n
\n
\n
\n
\n \n
\n \n
\n
\n
\n \n
\n \n
\n
\n
\n \n
\n \n Jetpack plugin is required for\n self-hosted sites.\n \n
\n
\n \n \n
\n \n
\n
\n
\n \n
\n \n
\n
\n \n \n
\n \n
\n
\n
\n \n
\n \n
\n
\n
\n \n
\n If no file ID is supplied, a new file\n will be created in your Google Drive root folder. You can move\n the file afterwards within Google Drive.\n
\n
\n
\n \n
\n If no file name is supplied, the\n document title will be used.\n
\n
\n\n
\n \n
\n
\n \n
\n
\n \n
\n
\n \n
\n
\n
\n
\n
\n
\n
\n
\n (?)\n
\n
\n
\n
\n
\n
\n \n
\n
\n
\n
\n
\n
\n Cancel\n OK\n
\n
\n \n\n\n\n
\n
\n
\n\n
\n \n

Publication

\n
\n
\n

\n "" is published on the following\n location(s):\n

\n
\n
\n
\n "" is not published yet.

\n
\n NOTE: You can add publications using "Publish on" sub-menu.\n
\n
\n
\n Close\n
\n
\n
\n
\n\n\n
\n
\n
\n\n
\n \n

Settings

\n \n
\n
\n\n
\n
\n
\n
\n \n
\n
\n \n
\n
\n \n
\n
\n
\n
\n \n
\n Create\n your own theme...\n
\n
\n
\n \n
\n
\n \n
\n
\n
\n
\n \n
\n px\n
\n
\n
\n \n
\n px\n
\n
\n
\n \n
\n \n
\n
\n
\n
\n
\n
\n
\n \n
\n \n
\n
\n
\n \n
\n \n
\n
\n
\n \n
\n \n
\n
\n
\n
\n \n \n
\n\n
\n
\n Cancel OK\n
\n
\n
\n
\n\n\n
\n
\n
\n\n
\n

Ooops...

\n
\n
\n

StackEdit has stopped because another instance was running in\n the same browser.

\n
If you want to reopen StackEdit, click on\n "Reload".
\n
\n
\n Reload\n
\n
\n
\n
\n\n\n
\n
\n
\n\n
\n

Reset application

\n
\n
\n

This will delete all your local documents.

\n
Are you sure?
\n
\n
\n Cancel\n OK\n
\n
\n
\n
\n\n\n
\n
'; + return '
\n
\n
\n
\n \n \n \n \n \n \n \n \n
\n
\n
\n
\n
\n
\n\n
\n \n
\n
\n \n StackEdit Viewer Open from...\n
\n \n
\n\n Save as...\n
\n \n
\n
\n
SYNCHRONIZE
\n
\n Google Drive\n
\n \n
\n Dropbox\n
\n \n
\n Manage synchronization\n
\n
PUBLISH
\n
\n Publish on...\n
\n
    \n
\n
\n \n Manage publication\n
\n \n\n
\n
\n\n\n
\n \n
\n
\n \n \n
\n \n
\n
\n
\n
\n
\n
\n
\n
\n\n\n
\n
\n
\n\n
\n \n

Manage documents

\n
\n
\n
\n \n
\n

The following documents will be\n deleted locally:

\n

Please choose a destination\n folder:

\n
\n
\n
\n
\n Cancel\n OK\n Close\n
\n
\n
\n
\n\n\n
\n
\n
\n\n
\n \n

Hyperlink

\n
\n
\n

Please provide the link URL and an optional title:

\n
\n \n
\n
\n
\n Cancel\n OK\n
\n
\n
\n
\n\n\n
\n
\n
\n\n
\n \n

Image

\n
\n
\n

Please provide the image URL and an optional title:

\n
\n \n
\n
\n
\n Import\n from Google+ Cancel OK\n
\n
\n
\n
\n\n\n
\n
\n
\n\n
\n \n

Google+ image import

\n
\n
\n
\n
\n
\n \n
\n
\n
\n \n
\n \n
\n
\n
\n \n
\n px\n
\n
\n
\n
\n
\n Cancel\n OK\n
\n
\n
\n
\n\n\n
\n
\n
\n\n
\n \n

Delete

\n
\n
\n

\n Are you sure you want to delete ""?\n

\n
\n NOTE: This will not delete the file on synchronized\n locations.\n
\n
\n
\n Cancel\n Delete\n
\n
\n
\n
\n\n\n
\n
\n
\n\n
\n \n

Open from URL

\n
\n
\n

Please provide a link to a Markdown document.

\n
\n
\n \n
\n \n
\n
\n
\n
\n
\n Cancel\n OK\n
\n
\n
\n
\n\n\n
\n
\n
\n\n
\n \n

Import from hard drive

\n
\n
\n

Please select your Markdown files here:

\n

\n \n

\n

Or drag and drop your Markdown files here:

\n

Drop\n files here

\n
\n
\n Close\n
\n
\n
\n
\n\n\n
\n
\n
\n\n
\n \n

Convert HTML to Markdown

\n
\n
\n

Please select your HTML files here:

\n

\n \n

\n

Or drag and drop your HTML files here:

\n

Drop\n files here

\n

Or insert your HTML code here:

\n \n
\n
\n Close OK\n
\n
\n
\n
\n\n\n
\n
\n
\n\n
\n \n

Export to Google Drive

\n
\n
\n

\n This will save "" to your \n Google Drive\n account and keep it synchronized.\n

\n
\n
\n \n
\n
\n \n
\n \n
\n
\n If no folder ID is supplied, the\n file will be created in your root folder. \n
\n
\n
\n
\n
\n \n
\n
\n
\n \n
\n This will overwrite the existing file\n on the server. \n
\n
\n
\n
\n NOTE:\n
    \n
  • You can move or rename the file afterwards within Google\n Drive.
    • \n
  • Real time collaborative documents can\'t be open outside\n StackEdit.
    • \n
  • Real time collaborative documents can\'t have multiple\n synchronized locations.
    • \n
\n
\n
\n
\n Cancel\n OK\n
\n
\n
\n
\n\n\n
\n
\n
\n\n
\n \n

Export to Dropbox

\n
\n
\n

\n This will save "" to your \n Dropbox\n account and keep it synchronized.\n

\n
\n
\n \n
\n \n File path is composed of both\n folder and filename. \n
\n
\n
\n
\n NOTE:\n
    \n
  • Dropbox file path does not depend on document title.
    • \n
  • The title of your document will not be synchronized.
    • \n
  • Destination folder must exist.
    • \n
  • Any existing file at this location will be overwritten.
    • \n
\n
\n
\n
\n Cancel\n OK\n
\n
\n
\n
\n\n\n
\n
\n
\n\n
\n \n

Synchronization

\n
\n
\n

\n "" is synchronized with the\n following location(s):\n

\n
\n
\n NOTE: Removing a synchronized location will not delete any\n file.\n
\n
\n "" is not synchronized yet.
\n
NOTE: You can add synchronized locations by\n exporting your document using \n Google Drive\n or \n Dropbox\n sub-menu.\n
\n
\n
\n Close\n
\n
\n
\n
\n\n\n
\n
\n
\n\n
\n \n

\n Publish on \n

\n
\n
\n
\n
\n \n
\n Host must be accessible publicly,\n unless you are hosting your own SSH\n proxy.\n \n
\n
\n
\n \n
\n \n
\n
\n
\n \n
\n \n
\n
\n
\n \n
\n Passwords are transmitted in clear,\n unless you are hosting your own SSH\n proxy.\n \n
\n
\n
\n \n
\n \n
\n
\n
\n \n
\n \n
\n
\n
\n \n
\n \n
\n
\n
\n \n
\n \n
\n
\n
\n \n
\n \n
\n
\n
\n \n
\n \n
\n
\n
\n \n
\n
\n \n
\n
\n
\n
\n \n
\n \n
\n
\n
\n \n
\n \n
\n
\n
\n \n
\n \n Jetpack plugin is required for\n self-hosted sites.\n \n
\n
\n \n \n
\n \n
\n
\n
\n \n
\n \n
\n
\n \n \n
\n \n
\n
\n
\n \n
\n \n
\n
\n
\n \n
\n If no file ID is supplied, a new file\n will be created in your Google Drive root folder. You can move\n the file afterwards within Google Drive.\n
\n
\n
\n \n
\n If no file name is supplied, the\n document title will be used.\n
\n
\n\n
\n \n
\n
\n \n
\n
\n \n
\n
\n \n
\n
\n
\n
\n
\n
\n
\n
\n (?)\n
\n
\n
\n
\n
\n
\n \n
\n
\n
\n
\n
\n
\n Cancel\n OK\n
\n
\n \n\n\n\n
\n
\n
\n\n
\n \n

Publication

\n
\n
\n

\n "" is published on the following\n location(s):\n

\n
\n
\n
\n "" is not published yet.

\n
\n NOTE: You can add publications using "Publish on" sub-menu.\n
\n
\n
\n Close\n
\n
\n
\n
\n\n\n
\n
\n
\n\n
\n \n

Settings

\n \n
\n
\n\n
\n
\n
\n
\n \n
\n
\n \n
\n
\n \n
\n
\n
\n
\n \n
\n Create\n your own theme...\n
\n
\n
\n \n
\n
\n \n
\n
\n
\n
\n \n
\n px Only monospaced fonts are\n supported.\n
\n
\n
\n \n
\n px\n
\n
\n
\n \n
\n \n
\n
\n
\n
\n
\n
\n
\n \n
\n \n
\n
\n
\n \n
\n \n
\n
\n
\n \n
\n \n
\n
\n
\n
\n \n \n
\n\n
\n
\n Cancel\n OK\n
\n
\n
\n
\n\n\n
\n
\n
\n\n
\n

Ooops...

\n
\n
\n

StackEdit has stopped because another instance was running in\n the same browser.

\n
If you want to reopen StackEdit, click on\n "Reload".
\n
\n
\n Reload\n
\n
\n
\n
\n\n\n
\n
\n
\n\n
\n

Reset application

\n
\n
\n

This will delete all your local documents.

\n
Are you sure?
\n
\n
\n Cancel\n OK\n
\n
\n
\n
\n\n\n
\n
'; }), define("text!html/bodyViewer.html", [], function() { return '\n
\n
\n
\n\n \n \n \n\n
\n
\n
\n
\n
\n\n
\n \n
\n\n
\n \n
\n
\n \n \n
\n \n
\n
\n
\n
\n
\n
\n
\n
\n\n
\n
\n
\n\n
\n

Ooops...

\n
\n
\n

StackEdit has stopped because another instance was running in\n the same browser.

\n
If you want to reopen StackEdit, click on\n "Reload".
\n
\n
\n Reload\n
\n
\n
\n
\n'; }), define("text!html/settingsTemplateTooltip.html", [], function() { @@ -24044,10 +24044,12 @@ if (hljs.LANGUAGES.glsl = function(e) { u = !1; var e = new o(); r(e), s(e), e.enqueue(); - }, d.upload = function(e, t, i, l, c, u) { - var d = void 0, h = new o(); - r(h), s(h), h.onRun(function() { - var o = "-------314159265358979323846", r = "\r\n--" + o + "\r\n", s = "\r\n--" + o + "--", c = "text/x-markdown", u = { + }, d.upload = function(e, t, i, l, c, u, d) { + var h = void 0, p = new o(); + r(p), s(p), p.onRun(function() { + var o = "-------314159265358979323846", r = "\r\n--" + o + "\r\n", s = "\r\n--" + o + "--"; + c = c || "text/x-markdown"; + var u = { title: i, mimeType: c }; @@ -24055,12 +24057,12 @@ if (hljs.LANGUAGES.glsl = function(e) { kind: "drive#fileLink", id: t } ]); - var p = "/upload/drive/v2/files", f = "POST"; - e && (p += "/" + e, f = "PUT"); + var d = "/upload/drive/v2/files", f = "POST"; + e && (d += "/" + e, f = "PUT"); var g = { "Content-Type": 'multipart/mixed; boundary="' + o + '"' }, m = n.encodeBase64(l), v = [ r, "Content-Type: application/json\r\n\r\n", JSON.stringify(u), r, "Content-Type: ", c, "\r\n", "Content-Transfer-Encoding: base64\r\n", "\r\n", m, s ].join(""), b = gapi.client.request({ - path: p, + path: d, method: f, params: { uploadType: "multipart" @@ -24069,16 +24071,16 @@ if (hljs.LANGUAGES.glsl = function(e) { body: v }); b.execute(function(t) { - if (t && t.id) return d = t, d.content = l, h.chain(), void 0; + if (t && t.id) return h = t, h.content = l, p.chain(), void 0; var n = t.error; void 0 !== n && void 0 !== e && (404 === n.code ? n = 'File ID "' + e + '" not found on Google Drive.|removePublish' : 412 === n.code && (localStorage.removeItem("gdrive.lastChangeId"), - n = 'Conflict on file ID "' + e + '". Please restart the synchronization.')), a(n, h); + n = 'Conflict on file ID "' + e + '". Please restart the synchronization.')), a(n, p); }); - }), h.onSuccess(function() { - u(void 0, d); - }), h.onError(function(e) { - u(e); - }), h.enqueue(); + }), p.onSuccess(function() { + d(void 0, h); + }), p.onError(function(e) { + d(e); + }), p.enqueue(); }, d.rename = function(e, t, n) { var i = void 0, l = new o(); r(l), s(l), l.onRun(function() { @@ -24390,7 +24392,7 @@ if (hljs.LANGUAGES.glsl = function(e) { c(!0), void 0; } var p = t.getInputTextValue("#input-sync-export-gdrive-parentid"); - s.upload(u, p, n, i, void 0, function(e, t) { + s.upload(u, p, n, i, void 0, void 0, function(e, t) { if (e) return c(e), void 0; var o = l(t.id, t.etag, i, n); c(void 0, o); @@ -24403,7 +24405,7 @@ if (hljs.LANGUAGES.glsl = function(e) { o(void 0, r); }); }, d.syncUp = function(e, t, n, i, o, r) { - return t == o.contentCRC && i == o.titleCRC ? (r(void 0, !1), void 0) : (s.upload(o.id, void 0, n, e, o.etag, function(e, n) { + return t == o.contentCRC && i == o.titleCRC ? (r(void 0, !1), void 0) : (s.upload(o.id, void 0, n, e, void 0, o.etag, function(e, n) { return e ? (r(e, !0), void 0) : (o.etag = n.etag, o.contentCRC = t, o.titleCRC = i, r(void 0, !0), void 0); }), void 0); @@ -24441,7 +24443,8 @@ if (hljs.LANGUAGES.glsl = function(e) { }); }); }, d.publish = function(e, t, n, i) { - s.upload(e.id, void 0, e.fileName || t, n, void 0, function(t, n) { + var o = "markdown" != e.format ? "text/html" : void 0; + s.upload(e.id, void 0, e.fileName || t, n, o, void 0, function(t, n) { return t ? (i(t), void 0) : (e.id = n.id, i(), void 0); }); }, d.newPublishAttributes = function(e) { @@ -24528,7 +24531,7 @@ if (hljs.LANGUAGES.glsl = function(e) { d.prop("disabled", n.prop("checked")); }); var h = t.retrieveIgnoreError(u + ".state"); - if (void 0 !== h) if (localStorage.removeItem(u + ".state"), "create" == h.action) s.upload(void 0, h.folderId, GDRIVE_DEFAULT_FILE_TITLE, i.defaultContent, void 0, function(e, t) { + if (void 0 !== h) if (localStorage.removeItem(u + ".state"), "create" == h.action) s.upload(void 0, h.folderId, GDRIVE_DEFAULT_FILE_TITLE, i.defaultContent, void 0, void 0, function(e, t) { if (!e) { var n = l(t.id, t.etag, t.content, t.title), i = {}; i[n.syncIndex] = n; @@ -24539,7 +24542,7 @@ if (hljs.LANGUAGES.glsl = function(e) { var p = []; e.each(h.ids, function(e) { var t = a(e), n = r.getFileFromSyncIndex(t); - void 0 !== n ? r.selectFile(n) : p.push(e); + void 0 !== n ? n !== r.currentFile && r.selectFile(n) : p.push(e); }), c(p); } }), d; diff --git a/res-min/themes/blue-gray.css b/res-min/themes/blue-gray.css index c92e1fff..fd31b2b4 100644 --- a/res-min/themes/blue-gray.css +++ b/res-min/themes/blue-gray.css @@ -130,7 +130,7 @@ pre .keyword,pre .id,pre .phpdoc,pre .title,pre .built_in,pre .aggregate,pre .cs pre .markdown .emphasis{font-style:italic} pre .nginx .built_in{font-weight:normal} pre .coffeescript .javascript,pre .javascript .xml,pre .tex .formula,pre .xml .javascript,pre .xml .vbscript,pre .xml .css,pre .xml .cdata{opacity:0.5} -@font-face{font-family:'fontello';src:url('../font/fontello.eot?67080555');src:url('../font/fontello.eot?67080555#iefix') format('embedded-opentype'),url('../font/fontello.woff?67080555') format('woff'),url('../font/fontello.ttf?67080555') format('truetype'),url('../font/fontello.svg?67080555#fontello') format('svg');font-weight:normal;font-style:normal}[class^="icon-"]:before,[class*=" icon-"]:before{font-family:"fontello";font-style:normal;font-weight:normal;speak:none;display:inline-block;text-decoration:inherit;width:1em;margin-right:.2em;text-align:center;font-variant:normal;text-transform:none;line-height:1em;margin-left:.2em;} +@font-face{font-family:'fontello';src:url('../font/fontello.eot');src:url('../font/fontello.eot#iefix') format('embedded-opentype'),url('../font/fontello.woff') format('woff'),url('../font/fontello.ttf') format('truetype'),url('../font/fontello.svg#fontello') format('svg');font-weight:normal;font-style:normal}[class^="icon-"]:before,[class*=" icon-"]:before{font-family:"fontello";font-style:normal;font-weight:normal;speak:none;display:inline-block;text-decoration:inherit;width:1em;margin-right:.2em;text-align:center;font-variant:normal;text-transform:none;line-height:1em;margin-left:.2em;} .icon-plus:before{content:'\e81f'} .icon-minus:before{content:'\e823'} .icon-left-big:before{content:'\e88a'} @@ -1023,7 +1023,7 @@ textarea.input-group-sm>.form-control,textarea.input-group-sm>.input-group-addon .nav-tabs{border-bottom:1px solid rgba(0,0,0,0)} .nav-tabs>li{float:left;margin-bottom:-1px} .nav-tabs>li>a{margin-right:2px;line-height:1.428571429;border:1px solid transparent;border-radius:4px 4px 0 0} -.nav-tabs>li>a:hover{border-color:#f0f3f4 #f0f3f4 rgba(0,0,0,0)} +.nav-tabs>li>a:hover{border-color:rgba(0,0,0,0) rgba(0,0,0,0) rgba(0,0,0,0)} .nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus{color:#555555;background-color:#f0f3f4;border:1px solid #dddddd;border-bottom-color:transparent;cursor:default} .nav-tabs.nav-justified{width:100%;border-bottom:0} .nav-tabs.nav-justified>li{float:none} @@ -1608,6 +1608,7 @@ ul ul,ol ul,ul ol,ol ol{margin-bottom:15px} .toc ul{list-style-type:none;margin-bottom:5px} .ace_editor{color:#545454} .ace-tm{background-color:#ffffff} +.ace-tm .ace_text-input{box-sizing:initial} .ace-tm .ace_marker-layer .ace_active-line{background-color:#f0f3f4} .ace-tm .ace_print-margin{background-color:rgba(240,243,244,0.5)} .ace-tm .ace_markup.ace_heading{color:#333333;font-weight:bold} @@ -1619,7 +1620,7 @@ ul ul,ol ul,ul ol,ol ol{margin-bottom:15px} .ace-tm .ace_code_block{font-family:Menlo,Consolas,"Courier New",monospace;color:#333333} .ace-tm .ace_description{color:#666666} .ace_search{background-color:#d9dfe3;border:0} -#wmd-input{color:#545454;-webkit-box-shadow:none;box-shadow:none;resize:none;border:none !important} +#wmd-input{border-radius:4px;color:#545454;-webkit-box-shadow:none;box-shadow:none;resize:none;border:none !important} div#wmd-input{padding:0} .preview-container{overflow:auto} .wmd-prompt-background{display:none} diff --git a/res-min/themes/default.css b/res-min/themes/default.css index 92c1a993..61c72f99 100644 --- a/res-min/themes/default.css +++ b/res-min/themes/default.css @@ -130,7 +130,7 @@ pre .keyword,pre .id,pre .phpdoc,pre .title,pre .built_in,pre .aggregate,pre .cs pre .markdown .emphasis{font-style:italic} pre .nginx .built_in{font-weight:normal} pre .coffeescript .javascript,pre .javascript .xml,pre .tex .formula,pre .xml .javascript,pre .xml .vbscript,pre .xml .css,pre .xml .cdata{opacity:0.5} -@font-face{font-family:'fontello';src:url('../font/fontello.eot?67080555');src:url('../font/fontello.eot?67080555#iefix') format('embedded-opentype'),url('../font/fontello.woff?67080555') format('woff'),url('../font/fontello.ttf?67080555') format('truetype'),url('../font/fontello.svg?67080555#fontello') format('svg');font-weight:normal;font-style:normal}[class^="icon-"]:before,[class*=" icon-"]:before{font-family:"fontello";font-style:normal;font-weight:normal;speak:none;display:inline-block;text-decoration:inherit;width:1em;margin-right:.2em;text-align:center;font-variant:normal;text-transform:none;line-height:1em;margin-left:.2em;} +@font-face{font-family:'fontello';src:url('../font/fontello.eot');src:url('../font/fontello.eot#iefix') format('embedded-opentype'),url('../font/fontello.woff') format('woff'),url('../font/fontello.ttf') format('truetype'),url('../font/fontello.svg#fontello') format('svg');font-weight:normal;font-style:normal}[class^="icon-"]:before,[class*=" icon-"]:before{font-family:"fontello";font-style:normal;font-weight:normal;speak:none;display:inline-block;text-decoration:inherit;width:1em;margin-right:.2em;text-align:center;font-variant:normal;text-transform:none;line-height:1em;margin-left:.2em;} .icon-plus:before{content:'\e81f'} .icon-minus:before{content:'\e823'} .icon-left-big:before{content:'\e88a'} @@ -1023,7 +1023,7 @@ textarea.input-group-sm>.form-control,textarea.input-group-sm>.input-group-addon .nav-tabs{border-bottom:1px solid rgba(0,0,0,0)} .nav-tabs>li{float:left;margin-bottom:-1px} .nav-tabs>li>a{margin-right:2px;line-height:1.428571429;border:1px solid transparent;border-radius:4px 4px 0 0} -.nav-tabs>li>a:hover{border-color:#f1f1f1 #f1f1f1 rgba(0,0,0,0)} +.nav-tabs>li>a:hover{border-color:rgba(0,0,0,0) rgba(0,0,0,0) rgba(0,0,0,0)} .nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus{color:#555555;background-color:#f1f1f1;border:1px solid #dddddd;border-bottom-color:transparent;cursor:default} .nav-tabs.nav-justified{width:100%;border-bottom:0} .nav-tabs.nav-justified>li{float:none} @@ -1608,6 +1608,7 @@ ul ul,ol ul,ul ol,ol ol{margin-bottom:15px} .toc ul{list-style-type:none;margin-bottom:5px} .ace_editor{color:#545454} .ace-tm{background-color:#ffffff} +.ace-tm .ace_text-input{box-sizing:initial} .ace-tm .ace_marker-layer .ace_active-line{background-color:#f1f1f1} .ace-tm .ace_print-margin{background-color:rgba(241,241,241,0.5)} .ace-tm .ace_markup.ace_heading{color:#333333;font-weight:bold} @@ -1619,7 +1620,7 @@ ul ul,ol ul,ul ol,ol ol{margin-bottom:15px} .ace-tm .ace_code_block{font-family:Menlo,Consolas,"Courier New",monospace;color:#333333} .ace-tm .ace_description{color:#666666} .ace_search{background-color:#dddddd;border:0} -#wmd-input{color:#545454;-webkit-box-shadow:none;box-shadow:none;resize:none;border:none !important} +#wmd-input{border-radius:4px;color:#545454;-webkit-box-shadow:none;box-shadow:none;resize:none;border:none !important} div#wmd-input{padding:0} .preview-container{overflow:auto} .wmd-prompt-background{display:none} diff --git a/res-min/themes/night.css b/res-min/themes/night.css index 69831b76..cbbc6e55 100644 --- a/res-min/themes/night.css +++ b/res-min/themes/night.css @@ -130,7 +130,7 @@ pre .keyword,pre .id,pre .phpdoc,pre .title,pre .built_in,pre .aggregate,pre .cs pre .markdown .emphasis{font-style:italic} pre .nginx .built_in{font-weight:normal} pre .coffeescript .javascript,pre .javascript .xml,pre .tex .formula,pre .xml .javascript,pre .xml .vbscript,pre .xml .css,pre .xml .cdata{opacity:0.5} -@font-face{font-family:'fontello';src:url('../font/fontello.eot?67080555');src:url('../font/fontello.eot?67080555#iefix') format('embedded-opentype'),url('../font/fontello.woff?67080555') format('woff'),url('../font/fontello.ttf?67080555') format('truetype'),url('../font/fontello.svg?67080555#fontello') format('svg');font-weight:normal;font-style:normal}[class^="icon-"]:before,[class*=" icon-"]:before{font-family:"fontello";font-style:normal;font-weight:normal;speak:none;display:inline-block;text-decoration:inherit;width:1em;margin-right:.2em;text-align:center;font-variant:normal;text-transform:none;line-height:1em;margin-left:.2em;} +@font-face{font-family:'fontello';src:url('../font/fontello.eot');src:url('../font/fontello.eot#iefix') format('embedded-opentype'),url('../font/fontello.woff') format('woff'),url('../font/fontello.ttf') format('truetype'),url('../font/fontello.svg#fontello') format('svg');font-weight:normal;font-style:normal}[class^="icon-"]:before,[class*=" icon-"]:before{font-family:"fontello";font-style:normal;font-weight:normal;speak:none;display:inline-block;text-decoration:inherit;width:1em;margin-right:.2em;text-align:center;font-variant:normal;text-transform:none;line-height:1em;margin-left:.2em;} .icon-plus:before{content:'\e81f'} .icon-minus:before{content:'\e823'} .icon-left-big:before{content:'\e88a'} @@ -1608,6 +1608,7 @@ ul ul,ol ul,ul ol,ol ol{margin-bottom:15px} .toc ul{list-style-type:none;margin-bottom:5px} .ace_editor{color:#dedede} .ace-tm{background-color:#111111} +.ace-tm .ace_text-input{box-sizing:initial} .ace-tm .ace_marker-layer .ace_active-line{background-color:#232323} .ace-tm .ace_print-margin{background-color:rgba(35,35,35,0.5)} .ace-tm .ace_markup.ace_heading{color:#ffffff;font-weight:bold} @@ -1619,7 +1620,7 @@ ul ul,ol ul,ul ol,ol ol{margin-bottom:15px} .ace-tm .ace_code_block{font-family:Menlo,Consolas,"Courier New",monospace;color:#ffffff} .ace-tm .ace_description{color:#cccccc} .ace_search{background-color:#444444;border:0} -#wmd-input{color:#dedede;-webkit-box-shadow:none;box-shadow:none;resize:none;border:none !important} +#wmd-input{border-radius:4px;color:#dedede;-webkit-box-shadow:none;box-shadow:none;resize:none;border:none !important} div#wmd-input{padding:0} .preview-container{overflow:auto} .wmd-prompt-background{display:none} diff --git a/res-min/themes/school.css b/res-min/themes/school.css index fa50a83a..50fc0d4b 100644 --- a/res-min/themes/school.css +++ b/res-min/themes/school.css @@ -130,7 +130,7 @@ pre .keyword,pre .id,pre .phpdoc,pre .title,pre .built_in,pre .aggregate,pre .cs pre .markdown .emphasis{font-style:italic} pre .nginx .built_in{font-weight:normal} pre .coffeescript .javascript,pre .javascript .xml,pre .tex .formula,pre .xml .javascript,pre .xml .vbscript,pre .xml .css,pre .xml .cdata{opacity:0.5} -@font-face{font-family:'fontello';src:url('../font/fontello.eot?67080555');src:url('../font/fontello.eot?67080555#iefix') format('embedded-opentype'),url('../font/fontello.woff?67080555') format('woff'),url('../font/fontello.ttf?67080555') format('truetype'),url('../font/fontello.svg?67080555#fontello') format('svg');font-weight:normal;font-style:normal}[class^="icon-"]:before,[class*=" icon-"]:before{font-family:"fontello";font-style:normal;font-weight:normal;speak:none;display:inline-block;text-decoration:inherit;width:1em;margin-right:.2em;text-align:center;font-variant:normal;text-transform:none;line-height:1em;margin-left:.2em;} +@font-face{font-family:'fontello';src:url('../font/fontello.eot');src:url('../font/fontello.eot#iefix') format('embedded-opentype'),url('../font/fontello.woff') format('woff'),url('../font/fontello.ttf') format('truetype'),url('../font/fontello.svg#fontello') format('svg');font-weight:normal;font-style:normal}[class^="icon-"]:before,[class*=" icon-"]:before{font-family:"fontello";font-style:normal;font-weight:normal;speak:none;display:inline-block;text-decoration:inherit;width:1em;margin-right:.2em;text-align:center;font-variant:normal;text-transform:none;line-height:1em;margin-left:.2em;} .icon-plus:before{content:'\e81f'} .icon-minus:before{content:'\e823'} .icon-left-big:before{content:'\e88a'} @@ -1023,7 +1023,7 @@ textarea.input-group-sm>.form-control,textarea.input-group-sm>.input-group-addon .nav-tabs{border-bottom:1px solid rgba(0,0,0,0)} .nav-tabs>li{float:left;margin-bottom:-1px} .nav-tabs>li>a{margin-right:2px;line-height:1.428571429;border:1px solid transparent;border-radius:4px 4px 0 0} -.nav-tabs>li>a:hover{border-color:#ede9e6 #ede9e6 rgba(0,0,0,0)} +.nav-tabs>li>a:hover{border-color:rgba(0,0,0,0) rgba(0,0,0,0) rgba(0,0,0,0)} .nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus{color:#555555;background-color:#ede9e6;border:1px solid #dddddd;border-bottom-color:transparent;cursor:default} .nav-tabs.nav-justified{width:100%;border-bottom:0} .nav-tabs.nav-justified>li{float:none} @@ -1608,6 +1608,7 @@ ul ul,ol ul,ul ol,ol ol{margin-bottom:15px} .toc ul{list-style-type:none;margin-bottom:5px} .ace_editor{color:#3971a3} .ace-tm{background-color:#ffffff} +.ace-tm .ace_text-input{box-sizing:initial} .ace-tm .ace_marker-layer .ace_active-line{background-color:#ede9e6} .ace-tm .ace_print-margin{background-color:rgba(237,233,230,0.5)} .ace-tm .ace_markup.ace_heading{color:#284f72;font-weight:bold} @@ -1619,7 +1620,7 @@ ul ul,ol ul,ul ol,ol ol{margin-bottom:15px} .ace-tm .ace_code_block{font-family:Menlo,Consolas,"Courier New",monospace;color:#284f72} .ace-tm .ace_description{color:#4383bd} .ace_search{background-color:#dbd4ce;border:0} -#wmd-input{color:#3971a3;-webkit-box-shadow:none;box-shadow:none;resize:none;border:none !important} +#wmd-input{border-radius:4px;color:#3971a3;-webkit-box-shadow:none;box-shadow:none;resize:none;border:none !important} div#wmd-input{padding:0} .preview-container{overflow:auto} .wmd-prompt-background{display:none} diff --git a/res/config.js b/res/config.js index f66becd4..103f14cf 100644 --- a/res/config.js +++ b/res/config.js @@ -1,4 +1,4 @@ -var VERSION = "2.1.5"; +var VERSION = "2.1.6"; var MAIN_URL = "http://benweet.github.io/stackedit/"; var GOOGLE_ANALYTICS_ACCOUNT_ID = "UA-39556145-1"; diff --git a/res/styles/main.less b/res/styles/main.less index 3e2f1469..ca482de9 100644 --- a/res/styles/main.less +++ b/res/styles/main.less @@ -48,6 +48,7 @@ @nav-disabled-link-color: @disabled-color; @nav-disabled-link-hover-color: @disabled-color; @nav-tabs-border-color: @transparent; +@nav-tabs-link-hover-border-color: @transparent; @dropdown-link-color: @primary-color; @dropdown-link-hover-bg: @secondary-bg; @dropdown-link-active-color: @primary-color-inv;