From 3716535194b5b8e7212d2097b6807d4d8f37c9ec Mon Sep 17 00:00:00 2001 From: benweet Date: Tue, 3 Sep 2013 12:29:19 +0100 Subject: [PATCH] Upgrade to Bootstrap 3 --- cache.manifest | 2 +- res-min/main.js | 10 +++++----- res-min/themes/blue-gray.css | 2 +- res-min/themes/default.css | 2 +- res-min/themes/night.css | 2 +- res/html/bodyIndex.html | 2 +- res/main.js | 11 ++++++----- res/styles/main.less | 3 ++- 8 files changed, 18 insertions(+), 16 deletions(-) diff --git a/cache.manifest b/cache.manifest index 1c0f9cc4..ebbef8ec 100644 --- a/cache.manifest +++ b/cache.manifest @@ -1,5 +1,5 @@ CACHE MANIFEST -#Date Tue Sep 03 2013 11:36:31 +#Date Tue Sep 03 2013 12:27:48 CACHE: index.html diff --git a/res-min/main.js b/res-min/main.js index 2724db18..3de7ff86 100644 --- a/res-min/main.js +++ b/res-min/main.js @@ -11308,7 +11308,7 @@ function(e) { b(); }, 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
\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 \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
\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
\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 \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
\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
\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\n StackEdit, click on "Reload".
\n
\n
\n Reload\n
\n
\n
\n
\n'; }), define("text!html/settingsTemplateTooltip.html", [], function() { @@ -17709,11 +17709,11 @@ location.search.match(/(\?|&)console/) && (logger = console); var viewerMode = /(^| )viewer($| )/.test(document.body.className), theme = localStorage.theme || "default", themeModule = "less!themes/" + theme; --1 !== baseDir.indexOf("-min") && (themeModule = "css!themes/" + theme), require([ "jquery", "core", "synchronizer", "publisher", "mediaImporter", "css", themeModule ], function(e, t) { +-1 !== baseDir.indexOf("-min") && (themeModule = "css!themes/" + theme), require([ "jquery", "core", "eventMgr", "synchronizer", "publisher", "mediaImporter", "css", themeModule ], function(e, t, n) { e(function() { - window.applicationCache && window.applicationCache.addEventListener("updateready", function() { + t.onReady(), window.applicationCache && window.applicationCache.addEventListener("updateready", function() { window.applicationCache.status === window.applicationCache.UPDATEREADY && (window.applicationCache.swapCache(), - window.location.reload()); - }, !1), t.onReady(); + n.onMessage("New version available! Please refresh the page to upgrade.")); + }, !1); }); }), define("main", function() {}); \ No newline at end of file diff --git a/res-min/themes/blue-gray.css b/res-min/themes/blue-gray.css index 83391e27..5c360ce4 100644 --- a/res-min/themes/blue-gray.css +++ b/res-min/themes/blue-gray.css @@ -1351,7 +1351,7 @@ body{tab-size:4} .navbar{position:static;padding:0;border:0;border-radius:0} .navbar .left-space{width:30px;height:38px} .navbar .right-space{width:20px;height:38px} -.navbar .nav{float:left;margin:6px 10px 0} +.navbar .nav{float:left;margin:6px 10px;height:38px} .navbar .nav>li{display:inline-block} .navbar .nav.pull-right{float:right} .navbar .nav.pull-right>li>.dropdown-menu{right:0;left:auto} diff --git a/res-min/themes/default.css b/res-min/themes/default.css index bdbf7059..28685cce 100644 --- a/res-min/themes/default.css +++ b/res-min/themes/default.css @@ -1351,7 +1351,7 @@ body{tab-size:4} .navbar{position:static;padding:0;border:0;border-radius:0} .navbar .left-space{width:30px;height:38px} .navbar .right-space{width:20px;height:38px} -.navbar .nav{float:left;margin:6px 10px 0} +.navbar .nav{float:left;margin:6px 10px;height:38px} .navbar .nav>li{display:inline-block} .navbar .nav.pull-right{float:right} .navbar .nav.pull-right>li>.dropdown-menu{right:0;left:auto} diff --git a/res-min/themes/night.css b/res-min/themes/night.css index 12aa85a7..6a63a0b2 100644 --- a/res-min/themes/night.css +++ b/res-min/themes/night.css @@ -1351,7 +1351,7 @@ body{tab-size:4} .navbar{position:static;padding:0;border:0;border-radius:0} .navbar .left-space{width:30px;height:38px} .navbar .right-space{width:20px;height:38px} -.navbar .nav{float:left;margin:6px 10px 0} +.navbar .nav{float:left;margin:6px 10px;height:38px} .navbar .nav>li{display:inline-block} .navbar .nav.pull-right{float:right} .navbar .nav.pull-right>li>.dropdown-menu{right:0;left:auto} diff --git a/res/html/bodyIndex.html b/res/html/bodyIndex.html index f60e0279..54e8ef12 100644 --- a/res/html/bodyIndex.html +++ b/res/html/bodyIndex.html @@ -299,7 +299,7 @@
-
+
px
diff --git a/res/main.js b/res/main.js index 0676b43a..a8871bf1 100644 --- a/res/main.js +++ b/res/main.js @@ -134,27 +134,28 @@ if(baseDir.indexOf('-min') !== -1) { require([ "jquery", "core", + "eventMgr", "synchronizer", "publisher", "mediaImporter", "css", themeModule, -], function($, core) { +], function($, core, eventMgr) { $(function() { + // Here, all the modules are loaded and the DOM is ready + core.onReady(); + // If browser has detected a new application cache. if(window.applicationCache) { window.applicationCache.addEventListener('updateready', function(e) { if(window.applicationCache.status === window.applicationCache.UPDATEREADY) { window.applicationCache.swapCache(); - window.location.reload(); + eventMgr.onMessage('New version available! Please refresh the page to upgrade.'); } }, false); } - - // Here, all the modules are loaded and the DOM is ready - core.onReady(); }); }); diff --git a/res/styles/main.less b/res/styles/main.less index c104adb7..63a9f463 100644 --- a/res/styles/main.less +++ b/res/styles/main.less @@ -276,7 +276,8 @@ body { } .nav { float: left; - margin: 6px 10px 0; + margin: 6px 10px; + height: @input-height-base; & > li { display: inline-block; }