diff --git a/public/res-min/img/logo-ipad-retina.png b/public/res-min/img/logo-ipad-retina.png deleted file mode 100644 index 2eb386f7..00000000 Binary files a/public/res-min/img/logo-ipad-retina.png and /dev/null differ diff --git a/public/res/extensions/buttonHtmlCode.js b/public/res/extensions/buttonHtmlCode.js index 0e18b464..157e87a7 100644 --- a/public/res/extensions/buttonHtmlCode.js +++ b/public/res/extensions/buttonHtmlCode.js @@ -7,7 +7,7 @@ define([ "text!html/buttonHtmlCodeSettingsBlock.html" ], function($, _, utils, Extension, buttonHtmlCodeHTML, buttonHtmlCodeSettingsBlockHTML) { - var buttonHtmlCode = new Extension("buttonHtmlCode", 'Button "HTML code"', true, true); + var buttonHtmlCode = new Extension("buttonHtmlCode", 'Button "HTML code"', true); buttonHtmlCode.settingsBlock = buttonHtmlCodeSettingsBlockHTML; buttonHtmlCode.defaultConfig = { template: "<%= documentHTML %>" diff --git a/public/res/extensions/buttonStat.js b/public/res/extensions/buttonStat.js index ba3cb9e0..5a09d3c5 100644 --- a/public/res/extensions/buttonStat.js +++ b/public/res/extensions/buttonStat.js @@ -7,7 +7,7 @@ define([ "text!html/buttonStatSettingsBlock.html" ], function($, _, utils, Extension, buttonStatHTML, buttonStatSettingsBlockHTML) { - var buttonStat = new Extension("buttonStat", 'Button "Statistics"', true, true); + var buttonStat = new Extension("buttonStat", 'Button "Statistics"', true); buttonStat.settingsBlock = buttonStatSettingsBlockHTML; buttonStat.defaultConfig = { name1: "Characters", diff --git a/public/res/extensions/dialogManageSharing.js b/public/res/extensions/dialogManageSharing.js index 96dddeee..917cb612 100644 --- a/public/res/extensions/dialogManageSharing.js +++ b/public/res/extensions/dialogManageSharing.js @@ -18,29 +18,40 @@ define([ }; var fileDesc; - var shareListElt; - var $msgShareListElt; - var $msgNoShareElt; + var shareEditorListElt; + var shareViewerListElt; + var $msgNoShareEditorElt; + var $msgNoShareViewerElt; var refreshDocumentSharing = function(fileDescParameter) { if(fileDescParameter !== undefined && fileDescParameter !== fileDesc) { return; } - var linkListHtml = _.reduce(fileDesc.publishLocations, function(result, attributes) { - var params = sharing.getViewerParams(attributes); + var editorLinkListHtml = _.reduce(fileDesc.syncLocations, function(result, attributes) { + var params = sharing.getEditorParams(attributes); if(params) { - var link = constants.MAIN_URL + 'viewer?' + $.param(params); + var link = constants.MAIN_URL + 'editor#!' + $.param(params); result += _.template(dialogManageSharingLocationHTML, { - link: link, - title: fileDesc.title + link: link }); } return result; }, ''); - shareListElt.innerHTML = linkListHtml; + shareEditorListElt.innerHTML = editorLinkListHtml; + $msgNoShareEditorElt.toggleClass('hide', editorLinkListHtml.length !== 0); - $msgShareListElt.toggleClass('hide', linkListHtml.length === 0); - $msgNoShareElt.toggleClass('hide', linkListHtml.length !== 0); + var viewerLinkListHtml = _.reduce(fileDesc.publishLocations, function(result, attributes) { + var params = sharing.getViewerParams(attributes); + if(params) { + var link = constants.MAIN_URL + 'viewer#!' + $.param(params); + result += _.template(dialogManageSharingLocationHTML, { + link: link + }); + } + return result; + }, ''); + shareViewerListElt.innerHTML = viewerLinkListHtml; + $msgNoShareViewerElt.toggleClass('hide', viewerLinkListHtml.length !== 0); }; dialogManageSharing.onFileSelected = function(fileDescParameter) { @@ -48,21 +59,22 @@ define([ refreshDocumentSharing(fileDescParameter); }; - dialogManageSharing.onNewPublishSuccess = function(fileDescParameter, publishAttributes) { - refreshDocumentSharing(fileDescParameter); - if(sharing.getViewerParams(publishAttributes)) { - $('.modal').modal('hide'); - $('.modal-manage-sharing').modal('show'); - } - }; - + dialogManageSharing.onSyncExportSuccess = refreshDocumentSharing; + dialogManageSharing.onSyncRemoved = refreshDocumentSharing; + dialogManageSharing.onNewPublishSuccess = refreshDocumentSharing; dialogManageSharing.onPublishRemoved = refreshDocumentSharing; dialogManageSharing.onReady = function() { var modalElt = document.querySelector('.modal-manage-sharing'); - shareListElt = modalElt.querySelector('.share-list'); - $msgShareListElt = $(modalElt.querySelectorAll('.msg-share-list')); - $msgNoShareElt = $(modalElt.querySelectorAll('.msg-no-share')); + shareEditorListElt = modalElt.querySelector('.share-editor-list'); + shareViewerListElt = modalElt.querySelector('.share-viewer-list'); + $msgNoShareEditorElt = $(modalElt.querySelectorAll('.msg-no-share-editor')); + $msgNoShareViewerElt = $(modalElt.querySelectorAll('.msg-no-share-viewer')); + $(modalElt).on('show.bs.modal', function() { + $(modalElt.querySelector('input')).each(function() { + this.value = $(this).data('value'); + }); + }); }; return dialogManageSharing; diff --git a/public/res/extensions/userCustom.js b/public/res/extensions/userCustom.js index 71570aba..c0e36b31 100644 --- a/public/res/extensions/userCustom.js +++ b/public/res/extensions/userCustom.js @@ -33,6 +33,9 @@ define([ var eventMgr; userCustom.onEventMgrCreated = function(eventMgrParameter) { eventMgr = eventMgrParameter; + eventMgr.addListener('onReady', function() { + utils.createTooltip(".tooltip-usercustom-extension", tooltipUserCustomExtensionHTML); + }); }; userCustom.onLoadSettings = function() { @@ -62,9 +65,5 @@ define([ } }; - userCustom.onReady = function() { - utils.createTooltip(".tooltip-usercustom-extension", tooltipUserCustomExtensionHTML); - }; - return userCustom; }); \ No newline at end of file diff --git a/public/res/helpers/googleHelper.js b/public/res/helpers/googleHelper.js index 79241441..0641c22b 100644 --- a/public/res/helpers/googleHelper.js +++ b/public/res/helpers/googleHelper.js @@ -49,6 +49,14 @@ define([ this.getUserId = function() { return userId; }; + var authUser = parseInt(storage[accountId + '.authUser'] || 0); + this.setAuthUser = function(value) { + authUser = value; + storage[accountId + '.authUser'] = authUser; + }; + this.getAuthUser = function() { + return authUser; + }; } var googleHelper = {}; @@ -190,7 +198,7 @@ define([ } else { // Success but we need to check the user id - authorizationMgr.authuser = authuser; + authorizationMgr.setAuthUser(authuser); immediate === true && authuser++; task.chain(getTokenInfo); } diff --git a/public/res/html/bodyEditor.html b/public/res/html/bodyEditor.html index d5c619bd..038d3e7c 100644 --- a/public/res/html/bodyEditor.html +++ b/public/res/html/bodyEditor.html @@ -382,7 +382,7 @@ Are you sure you want to delete ""?

- Note: It won't delete the file on synchronized locations. +

Note: It won't delete the file on synchronized locations.

@@ -656,10 +656,10 @@ This will save "" to CouchDB and keep it synchronized.

- Tip: You can use a +

Tip: You can use a YAML front matter to specify tags for your document. - Alternatively, you can place comma separated tags in squared brackets at the beginning of the document title. + target="_blank">YAML front matter to specify tags for your document.

+

Alternatively, you can place comma separated tags in squared brackets at the beginning of the document title.

@@ -688,8 +688,8 @@

- Note: Removing a synchronized location will not delete any - file. +

Note: Removing a synchronized location will not delete any + file.

@@ -962,7 +962,7 @@

- Note: Removing a publish location will not delete the actual publication. +

Note: Removing a publish location will not delete the actual publication.

@@ -983,23 +983,28 @@

Sharing

-

- "" can be shared using the following link(s): -

-
-

No sharing link yet! -

-

To collaborate on this document, use Google Drive - or Dropbox synchronization from the menu. -

-

To share a frozen version of this document within StackEdit, just publish it as a Gist in - Markdown format from the menu. +

Collaborate on "" using the following link(s):

+

No sharing link yet!

+
- Tip: You can open any URL within StackEdit using Note: To collaborate on this document, just save it on CouchDB. + To collaborate via Google Drive or Dropbox, you have to share the file manually from Google Drive/Dropbox websites.

+
+

Share a read-only version of "" using the following link(s):

+

No sharing link yet! +

+
+
+

Note: To share a read-only version of this document, just publish it as a Gist in + Markdown format.

+
+
+

Tip: You can open any markdown URL within StackEdit Viewer using viewer#!url=. + title="Sharing example">viewer#!url=.

@@ -1334,8 +1339,10 @@

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

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

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

+

-
Please click OK to proceed.
+
+

Please click OK to proceed.

+
Cancel @@ -1417,7 +1426,7 @@

To perform this request, you need to configure another Google Drive account in StackEdit.

-
Do you want to proceed?
+
Do you want to proceed?
This feature is restricted to sponsor users as it's a web service hosted on Amazon EC2. Note that sponsoring StackEdit would cost you only $5/year.

To see how a PDF looks click here.

-
Tip: PDFs are fully customizable via Settings>Advanced>PDF template/options.
+
+

Tip: PDFs are fully customizable via Settings>Advanced>PDF template/options.

+

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

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

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

+
- Note: Removing a local document will not delete the linked file on Google - Drive. +

Note: Removing a local document will not delete the linked file on Google + Drive.

diff --git a/public/res/html/dialogExportGdrive.html b/public/res/html/dialogExportGdrive.html index 02c1ba5d..29db9ace 100644 --- a/public/res/html/dialogExportGdrive.html +++ b/public/res/html/dialogExportGdrive.html @@ -48,8 +48,8 @@

- Tip: You can move or rename the file afterwards within Google - Drive. +

Tip: You can move or rename the file afterwards within Google + Drive.

diff --git a/public/res/html/dialogManageSharingLocation.html b/public/res/html/dialogManageSharingLocation.html index 16237f68..7d713539 100644 --- a/public/res/html/dialogManageSharingLocation.html +++ b/public/res/html/dialogManageSharingLocation.html @@ -1,5 +1,7 @@ -
- -
+
+
+ +
+
\ No newline at end of file diff --git a/public/res/html/partialRenderingSettingsBlock.html b/public/res/html/partialRenderingSettingsBlock.html index 83b59a81..aeb60747 100644 --- a/public/res/html/partialRenderingSettingsBlock.html +++ b/public/res/html/partialRenderingSettingsBlock.html @@ -1,5 +1,5 @@

Renders modified sections only.

- Note: Document sections are based on title elements (h1, h2...). Therefore if - your document does not contain any title, performance will not be increased. +

Note: Document sections are based on title elements (h1, h2...). Therefore if + your document does not contain any title, performance will not be increased.

\ No newline at end of file diff --git a/public/res/html/scrollSyncSettingsBlock.html b/public/res/html/scrollSyncSettingsBlock.html index 47d3623c..4ca4936f 100644 --- a/public/res/html/scrollSyncSettingsBlock.html +++ b/public/res/html/scrollSyncSettingsBlock.html @@ -1,7 +1,7 @@

Binds together editor and preview scrollbars.

- Note: The mapping between Markdown and HTML is based on the +

Note: The mapping between Markdown and HTML is based on the position of the title elements (h1, h2...) in the page. Therefore if your document does not contain any title, the mapping will be linear and - consequently less accurate. + consequently less accurate.

\ No newline at end of file diff --git a/public/res/html/umlDiagramsSettingsBlock.html b/public/res/html/umlDiagramsSettingsBlock.html index 54b5d714..ad19ff1d 100644 --- a/public/res/html/umlDiagramsSettingsBlock.html +++ b/public/res/html/umlDiagramsSettingsBlock.html @@ -19,6 +19,6 @@ cond(no)->op ```
- Note: Markdown Extra extension has to be enabled with GFM fenced code blocks option. +

Note: Markdown Extra extension has to be enabled with GFM fenced code blocks option.

diff --git a/public/res/img/logo-highres.png b/public/res/img/logo-highres.png new file mode 100644 index 00000000..8fe2898c Binary files /dev/null and b/public/res/img/logo-highres.png differ diff --git a/public/res/img/logo-ipad-retina.png b/public/res/img/logo-ipad-retina.png new file mode 100644 index 00000000..6c39c8e0 Binary files /dev/null and b/public/res/img/logo-ipad-retina.png differ diff --git a/public/res/providers/couchdbProvider.js b/public/res/providers/couchdbProvider.js index 23b975d1..55131cdc 100644 --- a/public/res/providers/couchdbProvider.js +++ b/public/res/providers/couchdbProvider.js @@ -22,6 +22,9 @@ define([ couchdbProvider.importPreferencesInputIds = [ PROVIDER_COUCHDB + "-tag" ]; + couchdbProvider.editorSharingAttributes = [ + "id" + ]; couchdbProvider.getSyncLocationLink = function(attributes) { return [ @@ -57,14 +60,26 @@ define([ return syncAttributes; } - function importFilesFromIds(ids) { - couchdbHelper.downloadContent(ids.map(function(id) { + function importFilesFromIds(ids, cb) { + var importIds = []; + _.each(ids, function(id) { + var syncIndex = createSyncIndex(id); + var fileDesc = fileMgr.getFileFromSyncIndex(syncIndex); + if(fileDesc !== undefined) { + return eventMgr.onError('"' + fileDesc.title + '" is already in your local documents.'); + } + importIds.push(id); + }); + if(ids.length === 0) { + return cb && cb(); + } + couchdbHelper.downloadContent(importIds.map(function(id) { return { _id: id }; }), function(error, result) { if(error) { - return; + return cb && cb(error); } var fileDescList = []; var fileDesc; @@ -82,6 +97,7 @@ define([ eventMgr.onSyncImportSuccess(fileDescList, couchdbProvider); fileMgr.selectFile(fileDesc); } + cb && cb(); }); } @@ -93,16 +109,7 @@ define([ .compact() .unique() .value(); - var importIds = []; - _.each(ids, function(id) { - var syncIndex = createSyncIndex(id); - var fileDesc = fileMgr.getFileFromSyncIndex(syncIndex); - if(fileDesc !== undefined) { - return eventMgr.onError('"' + fileDesc.title + '" is already in your local documents.'); - } - importIds.push(id); - }); - importFilesFromIds(importIds); + importFilesFromIds(ids); } }; @@ -228,6 +235,10 @@ define([ }); }; + couchdbProvider.importPrivate = function(importParameters, callback) { + importFilesFromIds([importParameters.id], callback); + }; + eventMgr.addListener("onReady", function() { if(constants.COUCHDB_URL == settings.couchdbUrl) { $('.msg-default-couchdb').removeClass('hide'); diff --git a/public/res/providers/gdriveProviderBuilder.js b/public/res/providers/gdriveProviderBuilder.js index 5c63eff3..ffe88b38 100644 --- a/public/res/providers/gdriveProviderBuilder.js +++ b/public/res/providers/gdriveProviderBuilder.js @@ -25,7 +25,7 @@ define([ ]; gdriveProvider.getSyncLocationLink = gdriveProvider.getPublishLocationLink = function(attributes) { - var authuser = googleHelper.getAuthorizationMgr(accountId).authuser; + var authuser = googleHelper.getAuthorizationMgr(accountId).getAuthUser(); return [ 'https://docs.google.com/file/d/', attributes.id, @@ -59,14 +59,14 @@ define([ return syncAttributes; } - function importFilesFromIds(ids) { + function importFilesFromIds(ids, cb) { googleHelper.downloadMetadata(ids, accountId, function(error, result) { if(error) { - return; + return cb && cb(error); } googleHelper.downloadContent(result, accountId, function(error, result) { if(error) { - return; + return cb && cb(error); } var fileDescList = []; var fileDesc; @@ -88,6 +88,7 @@ define([ eventMgr.onSyncImportSuccess(fileDescList, gdriveProvider); fileMgr.selectFile(fileDesc); } + cb && cb(); }); }); } @@ -369,8 +370,7 @@ define([ storage.removeItem('gdrive.state'); if(state.action == "create") { - eventMgr.onMessage('Please wait while creating your document on ' + providerName); - googleHelper.upload(undefined, state.folderId, constants.GDRIVE_DEFAULT_FILE_TITLE, settings.defaultContent, undefined, undefined, accountId, function(error, file) { + googleHelper.upload(undefined, state.folderId, constants.GDRIVE_DEFAULT_FILE_TITLE, settings.defaultContent, undefined, undefined, accountId, utils.lockUI(function(error, file) { if(error) { return; } @@ -380,7 +380,7 @@ define([ var fileDesc = fileMgr.createFile(file.title, file.content, undefined, syncLocations); fileMgr.selectFile(fileDesc); eventMgr.onMessage('"' + file.title + '" created successfully on ' + providerName + '.'); - }); + })); } else if(state.action == "open") { var importIds = []; @@ -394,8 +394,7 @@ define([ importIds.push(id); } }); - eventMgr.onMessage('Please wait while loading your document from ' + providerName); - importFilesFromIds(importIds); + importFilesFromIds(importIds, utils.lockUI()); } }); diff --git a/public/res/sharing.js b/public/res/sharing.js index dc28454f..c3dcb993 100644 --- a/public/res/sharing.js +++ b/public/res/sharing.js @@ -7,6 +7,7 @@ define([ "fileMgr", "classes/AsyncTask", "classes/Provider", + "providers/couchdbProvider", "providers/downloadProvider", "providers/gistProvider" ], function($, _, constants, utils, eventMgr, fileMgr, AsyncTask, Provider) { @@ -61,36 +62,49 @@ define([ eventMgr.addListener("onReady", function() { // Check parameters to see if we have to download a shared document - var providerId = utils.getURLParameter("provider"); + var importParameters, provider, providerId = utils.getURLParameter("provider"); if(window.viewerMode) { if(providerId === undefined) { providerId = "download"; } - var provider = providerMap[providerId]; + provider = providerMap[providerId]; if(provider === undefined) { return; } - var importParameters = {}; - _.each(provider.viewerSharingAttributes, function(attributeName) { + importParameters = {}; + if(_.some(provider.viewerSharingAttributes, function(attributeName) { var parameter = utils.getURLParameter(attributeName); if(!parameter) { - importParameters = undefined; - return; + return 1; } importParameters[attributeName] = parameter; - }); - if(importParameters === undefined) { + })) { return; } - $("#preview-contents, .navbar .file-title-navbar").hide(); - provider.importPublic(importParameters, function(error, title, content) { - $("#preview-contents, .navbar .file-title-navbar").show(); + provider.importPublic(importParameters, utils.lockUI(function(error, title, content) { if(error) { return; } var fileDesc = fileMgr.createFile(title, content, undefined, undefined, true); fileMgr.selectFile(fileDesc); - }); + })); + } + else if(providerId) { + provider = providerMap[providerId]; + if(provider === undefined) { + return; + } + importParameters = {}; + if(_.some(provider.editorSharingAttributes, function(attributeName) { + var parameter = utils.getURLParameter(attributeName); + if(!parameter) { + return 1; + } + importParameters[attributeName] = parameter; + })) { + return; + } + provider.importPrivate(importParameters, utils.lockUI()); } }); diff --git a/public/res/styles/main.less b/public/res/styles/main.less index 73437a78..01386951 100644 --- a/public/res/styles/main.less +++ b/public/res/styles/main.less @@ -1014,17 +1014,14 @@ a { .modal-manage-sync .sync-list, .modal-manage-publish .publish-list, -.modal-manage-sharing .share-list { +.modal-manage-sharing .share-editor-list, +.modal-manage-sharing .share-viewer-list { margin-bottom: 20px; .entry { margin-bottom: 10px; } } -.share-list .form-control { - width: 280px -} - .publish-custom-template-collapse { margin-bottom: 0; textarea { diff --git a/public/res/utils.js b/public/res/utils.js index cda04587..9c41d2b2 100644 --- a/public/res/utils.js +++ b/public/res/utils.js @@ -418,6 +418,21 @@ define([ }); }; + utils.lockUI = function(cb) { + var eltsToHide = $([ + '#wmd-input', + '#preview-contents', + '.navbar .file-title-navbar', + '.navbar .left-buttons', + '.navbar .right-buttons', + '.navbar .buttons-dropdown' + ].join(',')).hide(); + return function() { + eltsToHide.show(); + cb && cb.apply(null, arguments); + }; + }; + var entityMap = { "&": "&", "<": "<", diff --git a/views/editor.html b/views/editor.html index ca8f4c9c..6a5ff322 100644 --- a/views/editor.html +++ b/views/editor.html @@ -5,16 +5,17 @@ StackEdit – Editor + - + + + + - - -