From c2461c3af002f0f54cfb1747ea0a62ab534d6a92 Mon Sep 17 00:00:00 2001 From: Benoit Schweblin Date: Thu, 11 Apr 2013 00:13:31 +0100 Subject: [PATCH] Publish support --- cache.manifest | 2 +- img/icons.png | Bin 4648 -> 4468 bytes index.html | 47 +++++--- js/core.js | 128 +++++++++++++++----- js/file-manager.js | 49 +++++++- js/github-helper.js | 283 ++++++++++++++++++++++++++++++++++++++++++++ js/github.js | 10 -- js/google-helper.js | 78 ++++++++++++ js/publisher.js | 53 ++++----- js/synchronizer.js | 39 +++--- 10 files changed, 584 insertions(+), 105 deletions(-) create mode 100644 js/github-helper.js delete mode 100644 js/github.js diff --git a/cache.manifest b/cache.manifest index 873c54bb..167f7135 100644 --- a/cache.manifest +++ b/cache.manifest @@ -1 +1 @@ -CACHE MANIFEST # v33 CACHE: index.html css/bootstrap.css css/jgrowl.css css/main.css js/async-runner.js js/bootstrap.js js/config.js js/custo.github.js js/dropbox-helper.js js/github.js js/google-helper.js js/jgrowl.js js/jquery.js js/jquery-ui.js js/layout.js js/main.js js/Markdown.Converter.js js/Markdown.Editor.js js/Markdown.Sanitizer.js js/publisher.js js/require.js js/synchronizer.js js/underscore-min.js img/ajax-loader.gif img/glyphicons-halflings.png img/glyphicons-halflings-white.png img/icons.png img/stackedit-32.ico img/stackedit-promo.png NETWORK: * +CACHE MANIFEST # v33 CACHE: index.html css/bootstrap.css css/jgrowl.css css/main.css js/async-runner.js js/bootstrap.js js/config.js js/custo.github.js js/dropbox-helper.js js/github-helper.js js/google-helper.js js/jgrowl.js js/jquery.js js/jquery-ui.js js/layout.js js/main.js js/Markdown.Converter.js js/Markdown.Editor.js js/Markdown.Sanitizer.js js/publisher.js js/require.js js/synchronizer.js js/underscore-min.js img/ajax-loader.gif img/glyphicons-halflings.png img/glyphicons-halflings-white.png img/icons.png img/stackedit-32.ico img/stackedit-promo.png NETWORK: * diff --git a/img/icons.png b/img/icons.png index b13b1b8734580f2f8275934e1704c163b711f97b..b6c44e2638f5fcbb7ef1cda68e4f2c9b1f1ea9d5 100644 GIT binary patch delta 4426 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 QL;wH)07*qoM6N<$f{p@-YybcN delta 4607 zcmVU&XfQE5w%G~K~#9!?VD+MRn@u2fA2bDPKJ{Z0trbV zfrLPSFa!`$1_xxYRZx2s6$@BYTI+bx7O|D;m3#H}s@FOoiesfzK(ty^N&!K@Kne!J zlt2auB!MI+b571Vd)*KFB%Fk_a-Tl;(>?#^+0RQYyKf_sfKlZdVC}=)S@5mb!q)WOMrEKI{Sx~!1s?C#K@5&$6G9xp8(TD zBpE)$k1OjjF|8abtXag;Z?jK;xK?wpPLVvIVB8UhOEX_+hqk8SG8#MHbe=u7Xa1SsA7!|yC0N4(^;j67YcKWR+ z2_uY)w`mBBr3nD~QaY+<&q?=t;5FdF!MK%YAgRM zOafv2LjnM>y)hTVuc;Y+3Wr6Zlm(PR1kf7$Wm|h3X!;*K42y-A%NJw#HOeaFq@->2 zR@6@YRqt}Feaf?;$B zI)7MfpsZ%Sb80Oj>Vd%<<6l-bJHT?o*Zw5RBC1p4D{h`Sg=d!B!_S|1o-KO|Q6gv& zlqiC1pb^V&num>jD&(ixflrcRBL}WtI75AR@@&Sgqve!T)#CLB7?jwHYe!}Ou(FKQ2O`!G6S?Wjb&J%5j;bAJTS2GauAb8%zis>#y6_gX{*+t|$j zOnBErABQF(Li0++{V1hS4j7))e=0Clx$LYcba8E8AJMih#>IT!-fP~Sba?%?J`PQ_ z7m7Wadatl{{iiqE?Y0+&4;`91X2?Kd9E!oIy|4=R?J6u!H_&bUlap^8F=QycTz|rl z{t2Y^b}#%QuW(w+)F&Tq-}vbInwlEogOr~bG-x~%$wF{PA+ zlInU^ZO&)fs6mbxAzttZn3 zVo|2AY8YSyu#Nqya{#B(SVf}|lrnu+tu?^g02Y^nMxXFriIblVzQ{s-Ys3Pub{BGMsD7?w_RYfI{m zgC+A_F4uaG$3wq<{l*8){yBcXKO!b3#shquo}T_CFbEK>^+^$#=yW>g8ip|gxEuI* z)O)or9k|n-*P+dWI^7iTJAYn>xKuFR1M~5aYvA)|plok<8%s;4Zy#g@G1t@Q_p{-R z6{Mx~yD*7dFw26%Z?36yk^d1ErS95r|BY2|ZT&7fBdIsl4XupNOvb9rcdBh_b(W&OIE#A^8BL1;jJG=CjrF1cNbm_dDVGcVt)XEZ{cVUoen-f zgb_=Q3c$8`aZG%_j!kV3A{IewA-hk?LqHmUa@YX)-SHj?VASRzw>&lF=(?u{N5k<( zVQ@5TTY2I}eJ?9Z%S-RR{;Dgb^i(CiBW?Wl_R*yGjil8F=bPGjWpgpx_8n&Apd>bK z+hb^0U9s}Sy;)gK0Dpo3zx@RT1sk)ov&Wm{#!bQNf<{+M>+-gK zFI=$@;?qnr(1y8OqQDgkqi4gJ0`Pf5T>%{!7+MqX!3$3<=_G*1 zo_>)n`;MT3gh5vVxO-Mk`hKfLu6}UlSoRcEu;)Z28pR{mkAFi%_~qIiD65rYm38E# zCeYaGO`VmK{?|VpIB|E_3J9aqS_JUi^&U!KV!z9{GWl|uoIFvkN|+!M-4kT^w81iT z+7QXUE=#hf4U!>O^_Q$E$zo;&CIPT(UK~omVo_u#B*y~3?!q!L5dhnQS9d(PeaJ0o zMGbIGij|@Ucz<&1zZz**{BRLkFR7?J%iUAbS-mKic8qc3#sN$-3}b`e??)+h{Uxl&5Bz>VhGA>~rd{j<1)$$> zvwp4^-v0@_IveuVnD_b)hNuLvMTCS{xWV%21%K@Pc3)?^g2H2L-?fkJyZ2F7 z-_Y5PU}hi$Gv-Yk>V9?0K>%D%2R;;gPFC^l2{Ygt8ySJcYU88469DWlKhM00L*2lP z@U{=5Q#KbaTx4qfZE*YWQ_?*P&}KNrDyFv6hJn`RwQ%7ge!2?1aN!WvOl=iWfe|_Hyq1902-x}2uk8&-*0(FAXlQ7_;cz4aMGl7prPOWTAGDXb z4u|9CB2pwG$tY!-{2c~*s1}Y(h3l4pzYXI0n}7GB`@r?TGUEY%c>yBaV6`J1!8|~M z7J!K2k!N4W<#h13&)-68She<3w&x!~M6g<|W&k$Ww%flYePn8%rsp;tq`anyAxUw> zM7n5fZD&`}SuPvYm#ec=*nOgkQ=Vo3b{1E&WX8yW9i$&d7+qoj05|tb!h(oGp|nsv zcYl@XPwt$FMGUMefX!l{jle|%wYU2ikvJd?c&Pg`=YWJ4cjcTaZS>mNo_FTOm`LkG ziM{P4#@mUBv;xdtpMLYy*(cU*JKqN7d0$OWjn8}_EhA$V@dMdk*TiG%j&VayJPWT( zMmZGg@~inI|1=S%Yt9X)jD5V^Uzh=>sr69W+OeT$*B zcKZE(M8pj5d(J?>XR30G%{2Qve!I;HN!b?rX1@*!v=+f( zvthH_F${BPi^YoFW-|poBv5E}?JBpe?S8S^>})xDhWQgSnLId&&kvN47ViRJ^nZW^ zqAZ%;(Jso)H&RkvheZj1CA{s!=#c=PJ<#4I2EZ@w0AS5$7ux)2YN5Csx|`t85#@fn zhdDgJa^Z`Bv+H0?6iAV+2#b#;`6owzX26!9I#x-TI^<`-Bn9AK5 z15@vZgn=eW1ORUf_}eUTF8S z)^qZ2WhC`(#j2c~t!-rY!4njpuFm)Cz>5H>si^>)l~QwN&YbzovSrIw0M`PxzoY#P z;OSYjX0dYR$~ju=%@_u#U~JwnOrdVAzYq^-YlOCtvrIZ@9eA5UTz_^!RA(A6c%~x6 zw^zy}089%&DM2IV4JDmvLFvl5U%bETNcMF(S$wdsoc*UgWz#yP=ueke9quYaC}zblrjfM%aZk$L3}pPu-7{mwI|OYThw7|(kBpqp#Bc~Ukb z5^eNyCD5j#I8t1~p@5h3)m4;Lp8Idz-n6`Z<1cCf8XFsNyWMYEt=2`kxw&)l^YcF* zHEPtA7K`Np5xE*j3JU%?V5^9{zHi^Yt+~0mb3|lJAP`vG<9}*>`yq^*YijyCSN8l% z_I%KFWkW0gQ=_ZSfS}eILxb0+x$TDQ`R2PK65?aIb=Eb!{K1A`8j$Wmz&AD>EZO?x z4=+FdbxG~uU8S|;rpEEJX`@;C?&qAWZK1BYm0|t+^3Cxx#JOX*E_dj$Qi)PI79B}%1XkBG)@vtqYeP!@&XXW$L^Y4`fT@9(ZXJ2c#jz=J@n_6Jaf z<1SVBOQ&03d1ssLJ|;vP)U;Wcdi^c6U#|K6%jYSZm*R>ZI%!N6Dbc28G&Cf~I*1vP z#J6w`^J9-a#&gd-N3hIGOH2DuM1NL|88hbCfddEffIG*I9h=`l z06=qoe*UchqehJyX0=-11U@`4@o*mgZf|J=@;`%3D`4Dh;E3${+}jNMH^8?anQe8a z4R9gds4rv#1fi*=m8$cNxTB)T8aR+IR=)%YXDTa^(5wMQ=u8Lw0b|V_Z+tfK_xIh< z^xLh+qkmd`0T9L6RQ`e&Shp1Rt%aDx5Z_#&u?k8KbX(QnaXxbhjffUe(&6vh?GEmE0sjfCUcE|et8OLz;IovBSjw>2MDRKQ>L(e`*w2Q^Drz>%$_F85#@FS|1USp>%u;x8NUv})GOcK=iTVh}Op9(<@8%!E)nL$NRp|fe%bL zn1`~0;ipRpQ5gO;7{(7SdBrrK)Oc4Y>n*wGe%{#L+&~BkOfY3#Ivj+cTVOIs@HBQu zmOxu0qV}9mN$dO)u;lqgE+7i?3`Jb@h%0lVb0*EU#wO(W8*5VltkJzr`#t9h8Vh!8 pY&^KLAQ)=(08Kzkc -
  • Export to Google Drive
    • + data-target="#modal-upload-gdrive" class="action-reset-input">Export + to Google Drive
  • Dropbox @@ -66,11 +67,12 @@
  • Import from Dropbox
  • Export to Dropbox
    • + data-target="#modal-upload-dropbox" class="action-reset-input">Export + to Dropbox
  • - Manage synchronization
    • + data-target="#modal-manage-sync" class="action-reset-input"> Manage synchronization
  • Publish on @@ -79,17 +81,15 @@ class="icon-github"> GitHub
  • Blogger
    • -
  • WordPress
    • -
  • Tumblr
  • - Manage publication
    • + data-target="#modal-manage-publication" + class="action-reset-input"> Manage + publishing
  • Settings
  • @@ -226,7 +226,7 @@

    "" - is synchronized with these locations: + is synchronized with the following location(s):

    NOTE: Removing a @@ -267,14 +267,16 @@

    - +
    - +
    @@ -294,9 +296,8 @@
    - Cancel - OK + Cancel OK
    @@ -320,6 +321,14 @@
    +
    + +
    + px +
    +
    @@ -407,7 +416,7 @@

    Stopped...

    -

    StackEdit has stopped because another instance was running on +

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

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

    diff --git a/js/core.js b/js/core.js index be9261f2..8214c377 100644 --- a/js/core.js +++ b/js/core.js @@ -1,9 +1,9 @@ define( [ "jquery", "file-manager", "google-helper", "dropbox-helper", - "synchronizer", "publisher", "async-runner", "bootstrap", "jgrowl", - "layout", "Markdown.Editor", "config", "custo" ], - function($, fileManager, googleHelper, dropboxHelper, synchronizer, - publisher, asyncTaskRunner) { + "github-helper", "synchronizer", "publisher", "async-runner", + "bootstrap", "jgrowl", "layout", "Markdown.Editor", "config", "custo" ], + function($, fileManager, googleHelper, dropboxHelper, githubHelper, + synchronizer, publisher, asyncTaskRunner) { var core = {}; @@ -47,6 +47,7 @@ define( var frontWindowId = localStorage["frontWindowId"]; if(frontWindowId != windowId) { windowUnique = false; + $(".modal").modal("hide"); $('#modal-non-unique').modal({ backdrop: "static", keyboard: false @@ -54,23 +55,45 @@ define( } }; - // Useful function - core.getInputValue = function(element, event) { - var value = element.val(); - if (value !== undefined) { - value = value.replace(/^\s+|\s+$/g, ''); - element.val(undefined); + // Useful function for input control + function inputError(element, event) { + element.stop(true, true).addClass("error").delay(400).switchClass("error"); + if(event !== undefined) { + event.stopPropagation(); } - if (value === undefined || value.length === 0) { - element.stop(true, true).addClass("error").delay(400) - .switchClass("error"); - if(event !== undefined) { - event.stopPropagation(); - } + } + core.getInputValue = function(element, event, validationRegex) { + var value = element.val(); + if (value === undefined) { + inputError(element, event); + return undefined; + } + // trim + value = value.replace(/^\s+|\s+$/g, ''); + if((value.length === 0) + || (validationRegex !== undefined && !value.match(validationRegex))) { + inputError(element, event); return undefined; } return value; }; + core.getInputIntValue = function(element, event, min, max) { + var value = core.getInputValue(element, event); + if(value === undefined) { + return undefined; + } + value = parseInt(value); + if((value === NaN) + || (min !== undefined && value < min) + || (max !== undefined && value > max)) { + inputError(element, event); + return undefined; + } + return value; + }; + core.resetModalInputs = function() { + $(".modal input[type=text]:not([disabled])").val(""); + }; // Used by asyncTaskRunner core.showWorkingIndicator = function(show) { @@ -143,7 +166,11 @@ define( } // Setting management - var settings = { layoutOrientation : "horizontal" }; + var settings = { + layoutOrientation : "horizontal", + editorFontSize : 14 + }; + core.loadSettings = function() { if (localStorage.settings) { $.extend(settings, JSON.parse(localStorage.settings)); @@ -152,15 +179,25 @@ define( // Layout orientation $("input:radio[name=radio-layout-orientation][value=" + settings.layoutOrientation + "]").prop("checked", true); + + // Editor font size + $("#input-editor-font-size").val(settings.editorFontSize); }; - core.saveSettings = function() { - + core.saveSettings = function(event) { + var newSettings = {}; + // Layout orientation - settings.layoutOrientation = $( + newSettings.layoutOrientation = $( "input:radio[name=radio-layout-orientation]:checked").prop("value"); + + // Editor font size + newSettings.editorFontSize = core.getInputIntValue($("#input-editor-font-size"), event, 1, 99); - localStorage.settings = JSON.stringify(settings); + if(!event.isPropagationStopped()) { + settings = newSettings; + localStorage.settings = JSON.stringify(newSettings); + } }; // Create the layout @@ -225,12 +262,14 @@ define( var editor = new Markdown.Editor(converter); editor.hooks.set("insertLinkDialog", function (callback) { insertLinkCallback = callback; - $("#modal-insert-link").modal('show'); + core.resetModalInputs(); + $("#modal-insert-link").modal(); return true; }); editor.hooks.set("insertImageDialog", function (callback) { insertLinkCallback = callback; - $("#modal-insert-image").modal('show'); + core.resetModalInputs(); + $("#modal-insert-image").modal(); return true; }); @@ -412,6 +451,24 @@ define( } localStorage["version"] = version; } + + + core.popupWindow = function(url, title, w, h) { + var left = (screen.width / 2) - (w / 2); + var top = (screen.height / 2) - (h / 2); + return window + .open( + url, + title, + 'toolbar=no, location=no, directories=no, status=no, menubar=no, scrollbars=no, resizable=no, copyhistory=no, width=' + + w + + ', height=' + + h + + ', top=' + + top + + ', left=' + + left); + }; core.init = function() { setupLocalStorage(); @@ -458,14 +515,26 @@ define( $("#menu-bar, .ui-layout-center, .ui-layout-east, .ui-layout-south").removeClass("hide"); this.loadSettings(); this.createLayout(); + + // Apply editor font size + $("#wmd-input").css({ + "font-size": settings.editorFontSize + "px", + "line-height": Math.round(settings.editorFontSize * (20/14)) + "px" + }); $(".action-load-settings").click(function() { core.loadSettings(); }); - $(".action-apply-settings").click(function() { - core.saveSettings(); - window.location.reload(); + $(".action-apply-settings").click(function(e) { + core.saveSettings(e); + if(!e.isPropagationStopped()) { + window.location.reload(); + } + }); + + $(".action-reset-input").click(function() { + core.resetModalInputs(); }); // Init asyncTaskRunner @@ -474,13 +543,16 @@ define( // Init helpers googleHelper.init(core, fileManager); dropboxHelper.init(core, fileManager); + githubHelper.init(core, fileManager); + + // Init synchronizer + synchronizer.init(core, fileManager); // Init publisher publisher.init(core, fileManager); - // Init synchronizer - synchronizer.init(core, fileManager); offlineListeners.push(synchronizer.updateSyncButton); + offlineListeners.push(publisher.updatePublishButton); // Init file manager fileManager.init(core); diff --git a/js/file-manager.js b/js/file-manager.js index 4fe9307c..9768c058 100644 --- a/js/file-manager.js +++ b/js/file-manager.js @@ -21,8 +21,9 @@ define(["jquery", "google-helper", "dropbox-helper", "synchronizer", "publisher" } // Update the file titles - this.updateFileTitles(); + fileManager.updateFileTitles(); refreshManageSync(); + publisher.notifyCurrentFile(localStorage["file.current"]); // Recreate the editor fileIndex = localStorage["file.current"]; @@ -347,6 +348,37 @@ define(["jquery", "google-helper", "dropbox-helper", "synchronizer", "publisher" })(fileSyncIndex); } } + + + // Initialize the "New publication" dialog + var newPublishProvider = undefined; + function initNewPublish(provider, defaultPublishFormat) { + defaultPublishFormat = defaultPublishFormat || "markdown"; + newPublishProvider = provider; + + // Show/hide controls depending on provider + $('div[class*=" control-publish-"]').hide().filter(".control-publish-" + provider).show(); + + // Reset fields + core.resetModalInputs(); + $("input:radio[name=radio-publish-format][value=" + defaultPublishFormat + "]").prop("checked", true); + + // Open dialog box + $("#modal-publish").modal(); + } + + // Create a new publication + function newPublishBlogger(event) { + var blogUrl = core.getInputValue($("#input-publish-blogger-url"), event); + if(event.isPropagationStopped()) { + return; + } + + googleHelper.getBlogByUrl(blogUrl, function(blog) { + console.log(blog); + }); + + } fileManager.init = function(coreModule) { core = coreModule; @@ -393,6 +425,8 @@ define(["jquery", "google-helper", "dropbox-helper", "synchronizer", "publisher" + core.encodeBase64(content); window.open(uriContent, 'file'); }); + + // Synchronize actions $(".action-upload-gdrive-root").click(function() { uploadGdrive(); }); @@ -423,6 +457,19 @@ define(["jquery", "google-helper", "dropbox-helper", "synchronizer", "publisher" var path = core.getInputValue($("#manual-dropbox-path"), event); manualDropbox(path); }); + + // Publish actions + $(".action-publish-github").click(function() { + initNewPublish("github"); + }); + $(".action-publish-blogger").click(function() { + initNewPublish("blogger", "html"); + }); + $(".action-process-publish").click(function(e) { + if(newPublishProvider == "blogger") { + newPublishBlogger(e); + } + }); }; return fileManager; diff --git a/js/github-helper.js b/js/github-helper.js new file mode 100644 index 00000000..6c0a4586 --- /dev/null +++ b/js/github-helper.js @@ -0,0 +1,283 @@ +define(["jquery", "async-runner"], function($, asyncTaskRunner) { + + // Dependencies + var core = undefined; + var fileManager = undefined; + + var connected = undefined; + var client = undefined; + + var githubHelper = {}; + + // Try to connect github by downloading js file + function connect(callback) { + callback = callback || core.doNothing; + var asyncTask = {}; + asyncTask.run = function() { + if(core.isOffline === true) { + connected = false; + core.showMessage("Operation not available in offline mode."); + asyncTask.error(); + return; + } + if (connected === true) { + asyncTask.success(); + return; + } + $.ajax({ + url : "lib/github.js", + dataType : "script", timeout : AJAX_TIMEOUT + }).done(function() { + connected = true; + asyncTask.success(); + }).fail(function() { + asyncTask.error(); + }); + }; + asyncTask.onSuccess = function() { + callback(); + }; + asyncTask.onError = function() { + core.setOffline(); + callback(); + }; + asyncTaskRunner.addTask(asyncTask); + } + + // Try to authenticate with Oauth + function authenticate(callback, immediate) { + callback = callback || core.doNothing; + if (immediate === undefined) { + immediate = true; + } + connect(function() { + if (connected === false) { + callback(); + return; + } + + var asyncTask = {}; + asyncTask.run = function() { + if (client !== undefined) { + asyncTask.success(); + return; + } + if (immediate !== false) { + } + core.showMessage("Please make sure the Github authorization popup is not blocked by your browser."); + myWindow=core.popupWindow('github-oauth-client.html?client_id=test','stackedit-github-oauth',500,400); + myWindow.focus(); + }; + asyncTask.onSuccess = function() { + callback(); + }; + asyncTask.onError = function() { + // If immediate did not work retry without immediate flag + if (connected === true && immediate === true) { + authenticate(callback, false); + return; + } + callback(); + }; + asyncTaskRunner.addTask(asyncTask); + }); + } + + githubHelper.upload = function(path, content, callback) { + callback = callback || core.doNothing; + authenticate(function() { + if (client === undefined) { + callback(); + return; + } + + var fileSyncIndex = undefined; + var asyncTask = {}; + asyncTask.run = function() { + client.writeFile(path, content, function(error, stat) { + if (!error) { + fileSyncIndex = SYNC_PROVIDER_GITHUB + encodeURIComponent(stat.path.toLowerCase()); + localStorage[fileSyncIndex + ".version"] = stat.versionTag; + asyncTask.success(); + return; + } + // Handle error + if(error.status === Github.ApiError.INVALID_PARAM) { + error = 'Could not upload document into path "' + path + '".'; + } + handleError(error, asyncTask, callback); + }); + }; + asyncTask.onSuccess = function() { + callback(fileSyncIndex); + }; + asyncTaskRunner.addTask(asyncTask); + }); + }; + + githubHelper.checkUpdates = function(lastChangeId, callback) { + callback = callback || core.doNothing; + authenticate(function() { + if (client === undefined) { + callback(); + return; + } + + var changes = []; + var newChangeId = lastChangeId || 0; + function retrievePageOfChanges(changeId) { + var shouldPullAgain = false; + var asyncTask = {}; + asyncTask.run = function() { + client.pullChanges(changeId, function(error, pullChanges) { + if (pullChanges && pullChanges.cursorTag) { + // Retrieve success + newChangeId = pullChanges.cursor(); + shouldPullAgain = pullChanges.shouldPullAgain; + if(pullChanges.changes !== undefined) { + for(var i=0; i