From 67aeaf5c1e94b5f26a82bb24b7532c1e28f21cd5 Mon Sep 17 00:00:00 2001 From: benweet Date: Sat, 16 Nov 2013 18:20:01 +0000 Subject: [PATCH] Implemented css working indicator --- public/cache.manifest | 10 +---- public/res-min/main.js | 60 +++++++++++++++-------------- public/res-min/themes/blue-gray.css | 10 ++--- public/res-min/themes/default.css | 8 ++-- public/res-min/themes/night.css | 11 +++--- public/res-min/themes/school.css | 10 ++--- 6 files changed, 54 insertions(+), 55 deletions(-) diff --git a/public/cache.manifest b/public/cache.manifest index b28f399d..4149061c 100644 --- a/public/cache.manifest +++ b/public/cache.manifest @@ -1,5 +1,5 @@ CACHE MANIFEST -#Date Thu Nov 07 2013 23:09:02 +#Date Sat Nov 16 2013 18:10:31 CACHE: res/worker.js @@ -24,14 +24,6 @@ res-min/img/glyphicons-halflings-white.png res-min/img/glyphicons-halflings.png res-min/img/icons.png res-min/img/icons2x.png -res-min/img/loader-blue-gray.gif -res-min/img/loader-blue-gray2x.gif -res-min/img/loader-default.gif -res-min/img/loader-default2x.gif -res-min/img/loader-night.gif -res-min/img/loader-night2x.gif -res-min/img/loader-school.gif -res-min/img/loader-school2x.gif res-min/img/school-line.png res-min/img/stackedit-32.ico res-min/img/stackedit-64.png diff --git a/public/res-min/main.js b/public/res-min/main.js index deac93a7..63246969 100644 --- a/public/res-min/main.js +++ b/public/res-min/main.js @@ -11520,7 +11520,7 @@ function printStackTrace(e) { return e; }), define("constants", [], function() { var e = {}; - e.VERSION = "2.2.4", e.MAIN_URL = "https://stackedit.io/", e.GOOGLE_ANALYTICS_ACCOUNT_ID = "UA-39556145-1", + return e.VERSION = "2.2.4", e.MAIN_URL = "https://stackedit.io/", e.GOOGLE_ANALYTICS_ACCOUNT_ID = "UA-39556145-1", e.GOOGLE_API_KEY = "AIzaSyAeCU8CGcSkn0z9js6iocHuPBX4f_mMWkw", e.GOOGLE_DRIVE_APP_ID = "241271498917", e.DROPBOX_APP_KEY = "lq6mwopab8wskas", e.DROPBOX_APP_SECRET = "851fgnucpezy84t", e.BITLY_ACCESS_TOKEN = "317e033bfd48cf31155a68a536b1860013b09c4c", e.DEFAULT_FILE_TITLE = "Title", @@ -11551,7 +11551,7 @@ function printStackTrace(e) { "blue-gray": "Blue-Gray", night: "Night", school: "School" - }; + }, e; }), define("storage", [ "underscore" ], function(e) { function t(t) { try { @@ -15834,13 +15834,20 @@ var saveAs = saveAs || "undefined" != typeof navigator && navigator.msSaveOrOpen e(v.querySelectorAll(".document-list")).removeClass("hide"), e(v.querySelectorAll(".confirm-delete, .choose-folder, .selected-document-list, .select-folder-list")).addClass("hide"); }); }, f; -}), define("extensions/workingIndicator", [ "jquery", "underscore", "classes/Extension" ], function(e, t, n) { - var i, o, r = new n("workingIndicator", "Working Indicator"); - return r.onAsyncRunning = function(e) { - i.toggleClass("working", e), o.toggleClass("show", e); - }, r.onReady = function() { - i = e(document.body), o = e(".working-indicator"); - }, r; +}), define("extensions/workingIndicator", [ "jquery", "underscore", "classes/Extension", "crel" ], function(e, t, n, i) { + function o() { + c[u].className = "", u = (u + 1) % 3, c[u].className = "highlighted"; + } + var r, s, a, l = new n("workingIndicator", "Working Indicator"); + l.onAsyncRunning = function(e) { + r.toggleClass("working", e), s.toggleClass("show", e), e ? (o(), a = setInterval(o, 200)) : clearInterval(a); + }; + var c = [], u = 0; + return l.onReady = function() { + r = e(document.body), s = e(".working-indicator"); + for (var t = 0; 3 > t; t++) c.push(i("div")); + s.append(c); + }, l; }), function(e) { var t = function() { return !1 === e.support.boxModel && e.support.objectAll && $support.leadingWhitespace; @@ -20473,7 +20480,7 @@ function() { s.highlightBlock(e); }); }); - } else "prettify" == a.config.highlighter && (i.highlighter = "prettify", e.hooks.chain("onPreviewRefresh", r)); + } else "prettify" == a.config.highlighter && (i.highlighter = "prettify", e.hooks.chain("onPreviewRefresh", r.prettyPrint)); Markdown.Extra.init(n, i), l.onExtraExtensions(a.config.extensions); }, a; }), define("text!html/buttonToc.html", [], function() { @@ -22206,8 +22213,15 @@ function() { }; var y = c("onReady"); return d.onReady = function() { - if (g = document.getElementById("preview-contents"), m = e(g), window.viewerMode === !1) { - var i = t.chain(h).sortBy(function(e) { + g = document.getElementById("preview-contents"), m = e(g); + var i = function(e) { + var i = n("div", { + "class": "btn-group" + }), o = e(); + return t.isString(o) ? i.innerHTML = o : t.isElement(o) && i.appendChild(o), i; + }; + if (window.viewerMode === !1) { + var r = t.chain(h).sortBy(function(e) { return e.extensionName.toLowerCase(); }).reduce(function(e, n) { return e + (n.settingsBlock ? t.template(a, { @@ -22217,21 +22231,14 @@ function() { settingsBlock: n.settingsBlock }) : ""); }, "").value(); - document.querySelector(".accordion-extensions").innerHTML = i; - var r = function(e) { - var i = n("div", { - "class": "btn-group" - }), o = e(); - return t.isString(o) ? i.innerHTML = o : t.isElement(o) && i.appendChild(o), i; - }; - o.log("onCreateButton"); + document.querySelector(".accordion-extensions").innerHTML = r, o.log("onCreateButton"); var s = l("onCreateButton"), c = document.createDocumentFragment(); t.each(s, function(e) { - c.appendChild(r(e)); + c.appendChild(i(e)); }), document.getElementById("extension-buttons").appendChild(c), o.log("onCreateEditorButton"); var u = l("onCreateEditorButton"), d = document.createDocumentFragment(); t.each(u, function(e) { - d.appendChild(r(e)); + d.appendChild(i(e)); }); var p = document.querySelector(".extension-editor-buttons"); p.appendChild(d); @@ -22239,7 +22246,7 @@ function() { o.log("onCreatePreviewButton"); var f = l("onCreatePreviewButton"), v = document.createDocumentFragment(); t.each(f, function(e) { - v.appendChild(r(e)); + v.appendChild(i(e)); }); var b = document.querySelector(".extension-preview-buttons"); b.appendChild(v); @@ -22527,9 +22534,9 @@ function() { }); }, r; }), 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\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\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\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\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'; + return '\n\n
\n
\n
\n\n\n\n
\n \n \n
\n
\n
\n
\n
\n\n\n'; }), define("text!html/settingsTemplateTooltip.html", [], function() { return 'Available variables:\n
\n\nExamples:\n
<title><%= documentTitle %></title>\n
<div><%- documentHTML %></div>\n
<%\n
if(publishAttributes.provider.providerId == "github") print(documentMarkdown);\n%>\n
\n
\nMore\n info\n
\n
\n\n Careful! Template is subject to malicious code. Don\'t copy/paste untrusted\n content.'; }), define("text!html/settingsUserCustomExtensionTooltip.html", [], function() { @@ -28852,9 +28859,6 @@ function() { highlightjs: { exports: "hljs" }, - "google-code-prettify": { - exports: "prettyPrint" - }, "bootstrap-tour": { deps: [ "bootstrap" ], exports: "Tour" diff --git a/public/res-min/themes/blue-gray.css b/public/res-min/themes/blue-gray.css index 9fdbdce6..78b0380a 100644 --- a/public/res-min/themes/blue-gray.css +++ b/public/res-min/themes/blue-gray.css @@ -1480,9 +1480,11 @@ a{-webkit-transition:background-color ease-in-out .15s,color ease-in-out .15s,bo .navbar .btn-group>.btn.disabled *,.navbar .btn-group>.btn.blocked *,.navbar .btn-group>.btn[disabled] *{color:rgba(84,84,84,0.3)} .navbar .file-title-navbar{display:block;padding:4px 15px;font-size:20px;font-weight:200;color:#545454;max-width:280px;overflow:hidden;white-space:nowrap} .navbar .input-file-title{margin-right:10px} -.navbar .working-indicator{width:50px;height:17px;background-position:0 0;margin-top:12px} -.navbar .working-indicator.show{background-image:url("../img/loader-default.gif")} -@media only screen and (-webkit-min-device-pixel-ratio:2),only screen and (min--moz-device-pixel-ratio:2),only screen and (-o-min-device-pixel-ratio:2/1),only screen and (min-device-pixel-ratio:2),only screen and (min-resolution:192dpi),only screen and (min-resolution:2dppx){.navbar .working-indicator.show{background-image:url("../img/loader-default2x.gif");background-size:50px 17px}}@media only screen and (-webkit-min-device-pixel-ratio:2),only screen and (min--moz-device-pixel-ratio:2),only screen and (-o-min-device-pixel-ratio:2/1),only screen and (min-device-pixel-ratio:2),only screen and (min-resolution:192dpi),only screen and (min-resolution:2dppx){.navbar .working-indicator.show{background-image:url("../img/loader-default2x.gif");background-size:50px 17px}}.menu-panel,.document-panel{display:block;position:absolute;top:0;height:100%;z-index:10;overflow:initial} +.navbar .working-indicator{margin:12px -2px 0} +.navbar .working-indicator div{display:inline-block;visibility:hidden;width:14px;height:14px;border-radius:6px;margin:0 2px;background-color:rgba(84,84,84,0.25);-webkit-transition:background-color linear .15s;transition:background-color linear .15s} +.navbar .working-indicator div.highlighted{background-color:rgba(84,84,84,0.75)} +.navbar .working-indicator.show div{visibility:visible} +.menu-panel,.document-panel{display:block;position:absolute;top:0;height:100%;z-index:10;overflow:initial} .menu-panel .collapse-button i,.document-panel .collapse-button i{color:#666666;font-size:14px} .menu-panel.in .collapse-button,.document-panel.in .collapse-button{background-color:#f0f3f4} .menu-panel .panel-content,.document-panel .panel-content{-webkit-box-shadow:0 6px 12px rgba(0,0,0,0.175);box-shadow:0 6px 12px rgba(0,0,0,0.175);overflow:auto;padding-bottom:30px;height:100%} @@ -1688,5 +1690,3 @@ div.jGrowl div.jGrowl-notification{min-height:80px} body.pdf{font-family:"DejaVu Sans";background-color:transparent} body.pdf code,body.pdf pre{font-family:"DejaVu Sans Mono"} body.pdf blockquote{border-left:10px solid #eee} -.navbar .working-indicator.show{background-image:url("../img/loader-blue-gray.gif")} -@media only screen and (-webkit-min-device-pixel-ratio:2),only screen and (min--moz-device-pixel-ratio:2),only screen and (-o-min-device-pixel-ratio:2/1),only screen and (min-device-pixel-ratio:2),only screen and (min-resolution:192dpi),only screen and (min-resolution:2dppx){.navbar .working-indicator.show{background-image:url("../img/loader-blue-gray2x.gif");background-size:50px 17px}}@media only screen and (-webkit-min-device-pixel-ratio:2),only screen and (min--moz-device-pixel-ratio:2),only screen and (-o-min-device-pixel-ratio:2/1),only screen and (min-device-pixel-ratio:2),only screen and (min-resolution:192dpi),only screen and (min-resolution:2dppx){.navbar .working-indicator.show{background-image:url("../img/loader-blue-gray2x.gif");background-size:50px 17px}} diff --git a/public/res-min/themes/default.css b/public/res-min/themes/default.css index 604cc42f..b20df580 100644 --- a/public/res-min/themes/default.css +++ b/public/res-min/themes/default.css @@ -1480,9 +1480,11 @@ a{-webkit-transition:background-color ease-in-out .15s,color ease-in-out .15s,bo .navbar .btn-group>.btn.disabled *,.navbar .btn-group>.btn.blocked *,.navbar .btn-group>.btn[disabled] *{color:rgba(84,84,84,0.3)} .navbar .file-title-navbar{display:block;padding:4px 15px;font-size:20px;font-weight:200;color:#545454;max-width:280px;overflow:hidden;white-space:nowrap} .navbar .input-file-title{margin-right:10px} -.navbar .working-indicator{width:50px;height:17px;background-position:0 0;margin-top:12px} -.navbar .working-indicator.show{background-image:url("../img/loader-default.gif")} -@media only screen and (-webkit-min-device-pixel-ratio:2),only screen and (min--moz-device-pixel-ratio:2),only screen and (-o-min-device-pixel-ratio:2/1),only screen and (min-device-pixel-ratio:2),only screen and (min-resolution:192dpi),only screen and (min-resolution:2dppx){.navbar .working-indicator.show{background-image:url("../img/loader-default2x.gif");background-size:50px 17px}}@media only screen and (-webkit-min-device-pixel-ratio:2),only screen and (min--moz-device-pixel-ratio:2),only screen and (-o-min-device-pixel-ratio:2/1),only screen and (min-device-pixel-ratio:2),only screen and (min-resolution:192dpi),only screen and (min-resolution:2dppx){.navbar .working-indicator.show{background-image:url("../img/loader-default2x.gif");background-size:50px 17px}}.menu-panel,.document-panel{display:block;position:absolute;top:0;height:100%;z-index:10;overflow:initial} +.navbar .working-indicator{margin:12px -2px 0} +.navbar .working-indicator div{display:inline-block;visibility:hidden;width:14px;height:14px;border-radius:6px;margin:0 2px;background-color:rgba(84,84,84,0.25);-webkit-transition:background-color linear .15s;transition:background-color linear .15s} +.navbar .working-indicator div.highlighted{background-color:rgba(84,84,84,0.75)} +.navbar .working-indicator.show div{visibility:visible} +.menu-panel,.document-panel{display:block;position:absolute;top:0;height:100%;z-index:10;overflow:initial} .menu-panel .collapse-button i,.document-panel .collapse-button i{color:#666666;font-size:14px} .menu-panel.in .collapse-button,.document-panel.in .collapse-button{background-color:#f1f1f1} .menu-panel .panel-content,.document-panel .panel-content{-webkit-box-shadow:0 6px 12px rgba(0,0,0,0.175);box-shadow:0 6px 12px rgba(0,0,0,0.175);overflow:auto;padding-bottom:30px;height:100%} diff --git a/public/res-min/themes/night.css b/public/res-min/themes/night.css index 17134416..0a59ed85 100644 --- a/public/res-min/themes/night.css +++ b/public/res-min/themes/night.css @@ -1480,9 +1480,11 @@ a{-webkit-transition:background-color ease-in-out .15s,color ease-in-out .15s,bo .navbar .btn-group>.btn.disabled *,.navbar .btn-group>.btn.blocked *,.navbar .btn-group>.btn[disabled] *{color:rgba(222,222,222,0.3)} .navbar .file-title-navbar{display:block;padding:4px 15px;font-size:20px;font-weight:200;color:#dedede;max-width:280px;overflow:hidden;white-space:nowrap} .navbar .input-file-title{margin-right:10px} -.navbar .working-indicator{width:50px;height:17px;background-position:0 0;margin-top:12px} -.navbar .working-indicator.show{background-image:url("../img/loader-default.gif")} -@media only screen and (-webkit-min-device-pixel-ratio:2),only screen and (min--moz-device-pixel-ratio:2),only screen and (-o-min-device-pixel-ratio:2/1),only screen and (min-device-pixel-ratio:2),only screen and (min-resolution:192dpi),only screen and (min-resolution:2dppx){.navbar .working-indicator.show{background-image:url("../img/loader-default2x.gif");background-size:50px 17px}}@media only screen and (-webkit-min-device-pixel-ratio:2),only screen and (min--moz-device-pixel-ratio:2),only screen and (-o-min-device-pixel-ratio:2/1),only screen and (min-device-pixel-ratio:2),only screen and (min-resolution:192dpi),only screen and (min-resolution:2dppx){.navbar .working-indicator.show{background-image:url("../img/loader-default2x.gif");background-size:50px 17px}}.menu-panel,.document-panel{display:block;position:absolute;top:0;height:100%;z-index:10;overflow:initial} +.navbar .working-indicator{margin:12px -2px 0} +.navbar .working-indicator div{display:inline-block;visibility:hidden;width:14px;height:14px;border-radius:6px;margin:0 2px;background-color:rgba(222,222,222,0.25);-webkit-transition:background-color linear .15s;transition:background-color linear .15s} +.navbar .working-indicator div.highlighted{background-color:rgba(222,222,222,0.75)} +.navbar .working-indicator.show div{visibility:visible} +.menu-panel,.document-panel{display:block;position:absolute;top:0;height:100%;z-index:10;overflow:initial} .menu-panel .collapse-button i,.document-panel .collapse-button i{color:#777777;font-size:14px} .menu-panel.in .collapse-button,.document-panel.in .collapse-button{background-color:#565656} .menu-panel .panel-content,.document-panel .panel-content{-webkit-box-shadow:0 6px 12px rgba(0,0,0,0.175);box-shadow:0 6px 12px rgba(0,0,0,0.175);overflow:auto;padding-bottom:30px;height:100%} @@ -1689,6 +1691,5 @@ body.pdf{font-family:"DejaVu Sans";background-color:transparent} body.pdf code,body.pdf pre{font-family:"DejaVu Sans Mono"} body.pdf blockquote{border-left:10px solid #eee} .form-control:focus{-webkit-box-shadow:inset 0 1px 1px rgba(255,255,255,0),0 0 8px rgba(255,255,255,0.75);box-shadow:inset 0 1px 1px rgba(255,255,255,0),0 0 8px rgba(255,255,255,0.75)} -.navbar .working-indicator.show{background-image:url("../img/loader-night.gif")} -@media only screen and (-webkit-min-device-pixel-ratio:2),only screen and (min--moz-device-pixel-ratio:2),only screen and (-o-min-device-pixel-ratio:2/1),only screen and (min-device-pixel-ratio:2),only screen and (min-resolution:192dpi),only screen and (min-resolution:2dppx){.navbar .working-indicator.show{background-image:url("../img/loader-night2x.gif");background-size:50px 17px}}@media only screen and (-webkit-min-device-pixel-ratio:2),only screen and (min--moz-device-pixel-ratio:2),only screen and (-o-min-device-pixel-ratio:2/1),only screen and (min-device-pixel-ratio:2),only screen and (min-resolution:192dpi),only screen and (min-resolution:2dppx){.navbar .working-indicator.show{background-image:url("../img/loader-night2x.gif");background-size:50px 17px}}.ace-tm .ace_cursor{border-left-color:#fff} +.ace-tm .ace_cursor{border-left-color:#fff} .ace-tm .ace_print-margin{background-color:#232323} diff --git a/public/res-min/themes/school.css b/public/res-min/themes/school.css index 468f0e58..61872e72 100644 --- a/public/res-min/themes/school.css +++ b/public/res-min/themes/school.css @@ -1480,9 +1480,11 @@ a{-webkit-transition:background-color ease-in-out .15s,color ease-in-out .15s,bo .navbar .btn-group>.btn.disabled *,.navbar .btn-group>.btn.blocked *,.navbar .btn-group>.btn[disabled] *{color:rgba(238,238,238,0.3)} .navbar .file-title-navbar{display:block;padding:4px 15px;font-size:20px;font-weight:200;color:#eeeeee;max-width:280px;overflow:hidden;white-space:nowrap} .navbar .input-file-title{margin-right:10px} -.navbar .working-indicator{width:50px;height:17px;background-position:0 0;margin-top:12px} -.navbar .working-indicator.show{background-image:url("../img/loader-default.gif")} -@media only screen and (-webkit-min-device-pixel-ratio:2),only screen and (min--moz-device-pixel-ratio:2),only screen and (-o-min-device-pixel-ratio:2/1),only screen and (min-device-pixel-ratio:2),only screen and (min-resolution:192dpi),only screen and (min-resolution:2dppx){.navbar .working-indicator.show{background-image:url("../img/loader-default2x.gif");background-size:50px 17px}}@media only screen and (-webkit-min-device-pixel-ratio:2),only screen and (min--moz-device-pixel-ratio:2),only screen and (-o-min-device-pixel-ratio:2/1),only screen and (min-device-pixel-ratio:2),only screen and (min-resolution:192dpi),only screen and (min-resolution:2dppx){.navbar .working-indicator.show{background-image:url("../img/loader-default2x.gif");background-size:50px 17px}}.menu-panel,.document-panel{display:block;position:absolute;top:0;height:100%;z-index:10;overflow:initial} +.navbar .working-indicator{margin:12px -2px 0} +.navbar .working-indicator div{display:inline-block;visibility:hidden;width:14px;height:14px;border-radius:6px;margin:0 2px;background-color:rgba(238,238,238,0.25);-webkit-transition:background-color linear .15s;transition:background-color linear .15s} +.navbar .working-indicator div.highlighted{background-color:rgba(238,238,238,0.75)} +.navbar .working-indicator.show div{visibility:visible} +.menu-panel,.document-panel{display:block;position:absolute;top:0;height:100%;z-index:10;overflow:initial} .menu-panel .collapse-button i,.document-panel .collapse-button i{color:#666666;font-size:14px} .menu-panel.in .collapse-button,.document-panel.in .collapse-button{background-color:#406b5b} .menu-panel .panel-content,.document-panel .panel-content{-webkit-box-shadow:0 6px 12px rgba(0,0,0,0.175);box-shadow:0 6px 12px rgba(0,0,0,0.175);overflow:auto;padding-bottom:30px;height:100%} @@ -1700,5 +1702,3 @@ body.pdf blockquote{border-left:10px solid #eee} .ace-tm .ace_code_block{color:#6c9c7f} h1,h2,h3,h4,h5,h6{font-family:'cursive_standardregular'} .file-title-navbar{font-family:'cursive_standardregular';line-height:34px} -.navbar .working-indicator.show{background-image:url("../img/loader-school.gif")} -@media only screen and (-webkit-min-device-pixel-ratio:2),only screen and (min--moz-device-pixel-ratio:2),only screen and (-o-min-device-pixel-ratio:2/1),only screen and (min-device-pixel-ratio:2),only screen and (min-resolution:192dpi),only screen and (min-resolution:2dppx){.navbar .working-indicator.show{background-image:url("../img/loader-school2x.gif");background-size:50px 17px}}@media only screen and (-webkit-min-device-pixel-ratio:2),only screen and (min--moz-device-pixel-ratio:2),only screen and (-o-min-device-pixel-ratio:2/1),only screen and (min-device-pixel-ratio:2),only screen and (min-resolution:192dpi),only screen and (min-resolution:2dppx){.navbar .working-indicator.show{background-image:url("../img/loader-school2x.gif");background-size:50px 17px}}