Import image
Populates the "Manage publication" dialog box.
' }; - var fileMgr = undefined; - dialogManagePublication.onFileMgrCreated = function(fileMgrParameter) { - fileMgr = fileMgrParameter; + var extensionMgr = undefined; + dialogManagePublication.onExtensionMgrCreated = function(extensionMgrParameter) { + extensionMgr = extensionMgrParameter; }; var fileDesc = undefined; @@ -42,7 +42,8 @@ define([ publishDesc: publishDesc })); lineElement.append($(removeButtonTemplate).click(function() { - fileMgr.removePublish(publishAttributes); + fileDesc.removePublishLocation(publishAttributes); + extensionMgr.onPublishRemoved(publishFileDesc, publishAttributes); })); publishList.append(lineElement); }); diff --git a/js/extensions/dialogManageSynchronization.js b/js/extensions/dialogManageSynchronization.js index ee050ee1..eb1baf1a 100644 --- a/js/extensions/dialogManageSynchronization.js +++ b/js/extensions/dialogManageSynchronization.js @@ -10,9 +10,9 @@ define([ settingsBloc: 'Populates the "Manage synchronization" dialog box.
' }; - var fileMgr = undefined; - dialogManageSynchronization.onFileMgrCreated = function(fileMgrParameter) { - fileMgr = fileMgrParameter; + var extensionMgr = undefined; + dialogManageSynchronization.onExtensionMgrCreated = function(extensionMgrParameter) { + extensionMgr = extensionMgrParameter; }; var fileDesc = undefined; @@ -38,7 +38,8 @@ define([ syncDesc: syncDesc })); lineElement.append($(removeButtonTemplate).click(function() { - fileMgr.removeSync(syncAttributes); + fileDesc.removeSyncLocation(syncAttributes); + extensionMgr.onSyncRemoved(fileDesc, syncAttributes); })); syncList.append(lineElement); }); diff --git a/js/extensions/documentSelector.js b/js/extensions/documentSelector.js index e48e31ec..e696a426 100644 --- a/js/extensions/documentSelector.js +++ b/js/extensions/documentSelector.js @@ -38,6 +38,7 @@ define([ var liMap = undefined; var liArray = undefined; var sortFunction = undefined; + var selectFileDesc = undefined; var buildSelector = function() { function composeTitle(fileDesc) { @@ -68,23 +69,17 @@ define([ }); var li = $("StackEdit is a free, open-source Markdown + editor based on PageDown, the Markdown library used by Stack Overflow + and the other Stack Exchange sites.
- About:
- GitHub project / issue tracker - -
-
+ href="https://github.com/benweet/stackedit/issues">issue tracker
Chrome - app (thanks for your review!) -
- - - Follow on - Twitter - -
- - Follow - on Facebook - -
-
- (thanks for your review!)
Follow on Twitter
Follow + on Facebook
Follow - on Google+ + on Google+
- Developers:
-
Benoit
- Schweblin
+ Schweblin
Pete Eigel (contributor)
- - Pete Eigel (contributor)
- Credit: - <% _.each(libraries, function(url, name) { %>
-
- <%= name %>
+ <% _.each(libraries, function(url, name) { %> <%= name %>
<% }); %>
- <% }); %>
- Related projects: - <% _.each(projects, function(url, name) { %>
-
- <%= name %>
+ <% _.each(projects, function(url, name) { %> <%= name %>
<% }); %>
- <% }); %>
Copyright 2013 Benoit Schweblin
diff --git a/js/main.js b/js/main.js
index 027bb6e0..f5ec251f 100644
--- a/js/main.js
+++ b/js/main.js
@@ -6,6 +6,7 @@ requirejs.config({
"underscore": "libs/underscore",
"jgrowl": "libs/jgrowl",
"mousetrap": "libs/mousetrap",
+ "toMarkdown": "libs/to-markdown",
"text": "libs/text",
"libs/MathJax": '../lib/MathJax/MathJax.js?config=TeX-AMS_HTML'
},
@@ -22,6 +23,12 @@ requirejs.config({
'mousetrap': {
exports: 'Mousetrap'
},
+ 'toMarkdown': {
+ deps: [
+ 'jquery'
+ ],
+ exports: 'toMarkdown'
+ },
'libs/jquery-ui': [
'jquery'
],
diff --git a/js/providers/downloadProvider.js b/js/providers/downloadProvider.js
index 78fd3916..b9db9ccc 100644
--- a/js/providers/downloadProvider.js
+++ b/js/providers/downloadProvider.js
@@ -1,8 +1,8 @@
define([
"jquery",
"core",
- "asyncRunner"
-], function($, core, asyncRunner) {
+ "classes/AsyncTask"
+], function($, core, AsyncTask) {
var PROVIDER_DOWNLOAD = "download";
@@ -14,9 +14,9 @@ define([
};
downloadProvider.importPublic = function(importParameters, callback) {
- var task = asyncRunner.createTask();
var title = undefined;
var content = undefined;
+ var task = new AsyncTask();
task.onRun(function() {
var url = importParameters.url;
var slashUrl = url.lastIndexOf("/");
@@ -43,7 +43,7 @@ define([
task.onError(function(error) {
callback(error);
});
- asyncRunner.addTask(task);
+ task.enqueue();
};
return downloadProvider;
diff --git a/js/providers/dropboxProvider.js b/js/providers/dropboxProvider.js
index 87418b66..8bd5385d 100644
--- a/js/providers/dropboxProvider.js
+++ b/js/providers/dropboxProvider.js
@@ -39,7 +39,6 @@ define([
syncAttributes.version = versionTag;
syncAttributes.contentCRC = utils.crc32(content);
syncAttributes.syncIndex = createSyncIndex(path);
- utils.storeAttributes(syncAttributes);
return syncAttributes;
}
@@ -184,7 +183,8 @@ define([
// File deleted
if(change.wasRemoved === true) {
extensionMgr.onError('"' + localTitle + '" has been removed from Dropbox.');
- fileMgr.removeSync(syncAttributes);
+ fileDesc.removeSyncLocation(syncAttributes);
+ extensionMgr.onSyncRemoved(fileDesc, syncAttributes);
return;
}
var localContent = fileDesc.content;
@@ -201,6 +201,7 @@ define([
// If file content changed
if(fileContentChanged && remoteContentChanged === true) {
fileDesc.content = file.content;
+ extensionMgr.onContentChanged(fileDesc);
extensionMgr.onMessage('"' + localTitle + '" has been updated from Dropbox.');
if(fileMgr.isCurrentFile(fileDesc)) {
fileMgr.selectFile(); // Refresh editor
diff --git a/js/providers/gdriveProvider.js b/js/providers/gdriveProvider.js
index 1c3a0d38..e9f51bda 100644
--- a/js/providers/gdriveProvider.js
+++ b/js/providers/gdriveProvider.js
@@ -31,7 +31,6 @@ define([
syncAttributes.contentCRC = utils.crc32(content);
syncAttributes.titleCRC = utils.crc32(title);
syncAttributes.syncIndex = createSyncIndex(id);
- utils.storeAttributes(syncAttributes);
return syncAttributes;
}
@@ -179,7 +178,8 @@ define([
// File deleted
if(change.deleted === true) {
extensionMgr.onError('"' + localTitle + '" has been removed from Google Drive.');
- fileMgr.removeSync(syncAttributes);
+ fileDesc.removeSyncLocation(syncAttributes);
+ extensionMgr.onSyncRemoved(fileDesc, syncAttributes);
return;
}
var localTitleChanged = syncAttributes.titleCRC != utils.crc32(localTitle);
@@ -200,11 +200,13 @@ define([
// If file title changed
if(fileTitleChanged && remoteTitleChanged === true) {
fileDesc.title = file.title;
+ extensionMgr.onTitleChanged(fileDesc);
extensionMgr.onMessage('"' + localTitle + '" has been renamed to "' + file.title + '" on Google Drive.');
}
// If file content changed
if(fileContentChanged && remoteContentChanged === true) {
fileDesc.content = file.content;
+ extensionMgr.onContentChanged(fileDesc);
extensionMgr.onMessage('"' + file.title + '" has been updated from Google Drive.');
if(fileMgr.isCurrentFile(fileDesc)) {
fileMgr.selectFile(); // Refresh editor
diff --git a/js/publisher.js b/js/publisher.js
index c1daa72b..02f39492 100644
--- a/js/publisher.js
+++ b/js/publisher.js
@@ -54,41 +54,41 @@ define([
});
// Apply template to the current document
- publisher.applyTemplate = function(publishAttributes) {
- var fileDesc = fileMgr.getCurrentFile();
+ publisher.applyTemplate = function(fileDesc, publishAttributes, html) {
try {
return _.template(settings.template, {
documentTitle: fileDesc.title,
- documentMarkdown: $("#wmd-input").val(),
- documentHTML: $("#wmd-preview").html(),
+ documentMarkdown: fileDesc.content,
+ documentHTML: html,
publishAttributes: publishAttributes
});
}
catch(e) {
extensionMgr.onError(e);
- throw e;
+ return e.message;
}
};
// Used to get content to publish
- function getPublishContent(publishAttributes) {
+ function getPublishContent(fileDesc, publishAttributes, html) {
if(publishAttributes.format === undefined) {
publishAttributes.format = $("input:radio[name=radio-publish-format]:checked").prop("value");
}
if(publishAttributes.format == "markdown") {
- return $("#wmd-input").val();
+ return fileDesc.content;
}
else if(publishAttributes.format == "html") {
- return $("#wmd-preview").html();
+ return html;
}
else {
- return publisher.applyTemplate(publishAttributes);
+ return publisher.applyTemplate(fileDesc, publishAttributes, html);
}
}
// Recursive function to publish a file on multiple locations
var publishAttributesList = [];
- var publishTitle = undefined;
+ var publishFileDesc = undefined;
+ var publishHTML = undefined;
function publishLocation(callback, errorFlag) {
// No more publish location for this document
@@ -99,14 +99,17 @@ define([
// Dequeue a synchronized location
var publishAttributes = publishAttributesList.pop();
- var content = getPublishContent(publishAttributes);
+
+ // Format the content
+ var content = getPublishContent(publishFileDesc, publishAttributes, publishHTML);
// Call the provider
- publishAttributes.provider.publish(publishAttributes, publishTitle, content, function(error) {
+ publishAttributes.provider.publish(publishAttributes, publishFileDesc.title, content, function(error) {
if(error !== undefined) {
var errorMsg = error.toString();
if(errorMsg.indexOf("|removePublish") !== -1) {
- fileMgr.removePublish(publishAttributes);
+ publishFileDesc.removePublishLocation(publishAttributes);
+ extensionMgr.onPublishRemoved(publishFileDesc, publishAttributes);
}
if(errorMsg.indexOf("|stopPublish") !== -1) {
callback(error);
@@ -126,14 +129,14 @@ define([
publishRunning = true;
extensionMgr.onPublishRunning(true);
- var fileDesc = fileMgr.getCurrentFile();
- publishTitle = fileDesc.title;
- publishAttributesList = _.values(fileDesc.publishLocations);
+ publishFileDesc = fileMgr.getCurrentFile();
+ publishHTML = $("#wmd-preview").html();
+ publishAttributesList = _.values(publishFileDesc.publishLocations);
publishLocation(function(errorFlag) {
publishRunning = false;
extensionMgr.onPublishRunning(false);
if(errorFlag === undefined) {
- extensionMgr.onPublishSuccess(fileDesc);
+ extensionMgr.onPublishSuccess(publishFileDesc);
}
});
};
@@ -145,8 +148,8 @@ define([
publishIndex = "publish." + utils.randomString();
} while (_.has(localStorage, publishIndex));
publishAttributes.publishIndex = publishIndex;
- utils.storeAttributes(publishAttributes);
- fileMgr.addPublish(fileDesc, publishAttributes);
+ fileDesc.addPublishLocation(publishAttributes);
+ extensionMgr.onNewPublishSuccess(fileDesc, publishAttributes);
}
// Initialize the "New publication" dialog
@@ -186,9 +189,9 @@ define([
// Perform provider's publishing
var fileDesc = fileMgr.getCurrentFile();
- var title = fileDesc.title;
- var content = getPublishContent(publishAttributes);
- provider.publish(publishAttributes, title, content, function(error) {
+ var html = $("#wmd-preview").html();
+ var content = getPublishContent(fileDesc, publishAttributes, html);
+ provider.publish(publishAttributes, fileDesc.title, content, function(error) {
if(error === undefined) {
publishAttributes.provider = provider;
sharing.createLink(publishAttributes, function() {
@@ -235,9 +238,10 @@ define([
utils.saveAs(content, title + ".html");
});
$(".action-download-template").click(function() {
- var content = publisher.applyTemplate();
- var title = fileMgr.getCurrentFile().title;
- utils.saveAs(content, title + (settings.template.indexOf("documentHTML") === -1 ? ".md" : ".html"));
+ var fileDesc = fileMgr.getCurrentFile();
+ var html = $("#wmd-preview").html();
+ var content = publisher.applyTemplate(fileDesc, undefined, html);
+ utils.saveAs(content, fileDesc.title + (settings.template.indexOf("documentHTML") === -1 ? ".md" : ".html"));
});
});
diff --git a/js/sharing.js b/js/sharing.js
index 7899ebc6..e0a870db 100644
--- a/js/sharing.js
+++ b/js/sharing.js
@@ -5,10 +5,10 @@ define([
"utils",
"extensionMgr",
"fileMgr",
- "asyncRunner",
+ "classes/AsyncTask",
"providers/downloadProvider",
"providers/gistProvider"
-], function($, _, core, utils, extensionMgr, fileMgr, asyncRunner) {
+], function($, _, core, utils, extensionMgr, fileMgr, AsyncTask) {
var sharing = {};
@@ -30,7 +30,7 @@ define([
callback();
return;
}
- var task = asyncRunner.createTask();
+ var task = new AsyncTask();
var shortUrl = undefined;
task.onRun(function() {
if(core.isOffline === true) {
@@ -69,7 +69,7 @@ define([
}
task.onSuccess(onFinish);
task.onError(onFinish);
- asyncRunner.addTask(task);
+ task.enqueue();
};
core.onReady(function() {
diff --git a/js/storage.js b/js/storage.js
index 0e5da2ed..b58a77f4 100644
--- a/js/storage.js
+++ b/js/storage.js
@@ -120,6 +120,16 @@ define([
});
version = "v6";
}
+
+ // Upgrade from v6 to v7
+ if(version == "v6") {
+ var currentFileIndex = localStorage["file.current"];
+ if(currentFileIndex !== undefined) {
+ localStorage[currentFileIndex + ".selectTime"] = new Date().getTime();
+ localStorage.removeItem("file.current");
+ }
+ version = "v7";
+ }
localStorage["version"] = version;
});
\ No newline at end of file
diff --git a/js/synchronizer.js b/js/synchronizer.js
index 4431cc42..68c2b8d7 100644
--- a/js/synchronizer.js
+++ b/js/synchronizer.js
@@ -223,7 +223,8 @@ define([
if(error) {
return;
}
- fileMgr.addSync(fileDesc, syncAttributes);
+ fileDesc.addSyncLocation(syncAttributes);
+ extensionMgr.onSyncExportSuccess(fileDesc, syncAttributes);
});
// Store input values as preferences for next time we open the
@@ -241,7 +242,8 @@ define([
if(error) {
return;
}
- fileMgr.addSync(fileDesc, syncAttributes);
+ fileDesc.addSyncLocation(syncAttributes);
+ extensionMgr.onSyncExportSuccess(fileDesc, syncAttributes);
});
});
});