diff --git a/css/default.css b/css/default.css index 56882856..2ca71459 100644 --- a/css/default.css +++ b/css/default.css @@ -124,7 +124,7 @@ input::-webkit-input-placeholder,textarea::-webkit-input-placeholder { color: #333333; background-color: #ddd; opacity: 0.3; - filter: alpha(opacity = 30); + filter: alpha(opacity = 30); } .dropdown-menu>li>a:hover,.dropdown-menu>li>a:focus,.dropdown-submenu:hover>a,.dropdown-submenu:focus>a,.dropdown-menu>.active>a,.dropdown-menu>.active>a:hover,.dropdown-menu>.active>a:focus @@ -619,9 +619,9 @@ blockquote p { } input[type="file"] { - line-height: inherit; - height: inherit; - border: none !important; + line-height: inherit; + height: inherit; + border: none !important; } .drop-zone { @@ -635,6 +635,12 @@ input[type="file"] { color: #bbb; } +#modal-import-harddrive-html textarea { + width: 500px; + max-width: 500px; + height: 100px; +} + #md-section-helper { position: absolute; top: -100px; diff --git a/index.html b/index.html index 7e88f5f2..2a4e280c 100644 --- a/index.html +++ b/index.html @@ -71,11 +71,12 @@ class="icon-hdd"> Open from...
  • Save as... @@ -244,10 +245,12 @@

    Import from hard drive

    -

    Please select the Markdown files to import:

    -

    -

    Or drag and drop the Markdown files here:

    -
    Drop zone
    +

    Please select your Markdown files here:

    +

    +

    Or drag and drop your Markdown files here:

    +

    Drop + files here

    Close @@ -258,16 +261,21 @@
    -

    Import from hard drive

    +

    Convert HTML to Markdown

    -

    Please select the HTML files to import:

    -

    -

    Or drag and drop the HTML files here:

    -
    Drop zone
    +

    Please select your HTML files here:

    +

    +

    Or drag and drop your HTML files here:

    +

    Drop + files here

    +

    Or insert your HTML code here:

    - Close + Close OK
    diff --git a/js/classes/AsyncTask.js b/js/classes/AsyncTask.js index 5fb3e7d7..6704058e 100644 --- a/js/classes/AsyncTask.js +++ b/js/classes/AsyncTask.js @@ -13,7 +13,6 @@ define([ this.finished = false; this.timeout = ASYNC_TASK_DEFAULT_TIMEOUT; this.retryCounter = 0; - this.callPath = []; this.runCallbacks = []; this.successCallbacks = []; this.errorCallbacks = []; @@ -50,7 +49,7 @@ define([ * onRun callback during execution, bypassing the onRun queue. */ AsyncTask.prototype.chain = function(callback) { - this.callPath.unshift(printStackTrace()[5]); + utils.logStackTrace(); if(this.finished === true) { return; } @@ -80,11 +79,11 @@ define([ * ends the task by throwing an exception. */ AsyncTask.prototype.error = function(error) { - this.callPath.unshift(printStackTrace()[5]); + utils.logStackTrace(); if(this.finished === true) { return; } - error = error || new Error("Unknown error|\n" + this.callPath.join("\n")); + error = error || new Error("Unknown error"); if(error.message) { extensionMgr.onError(error); } @@ -110,7 +109,6 @@ define([ var delay = Math.pow(2, this.retryCounter++) * 1000; currentTaskStartTime = utils.currentTime + delay; currentTaskRunning = false; - this.callPath = []; runTask(); }; @@ -136,7 +134,7 @@ define([ if(currentTaskRunning === true) { // If the current task takes too long if(currentTaskStartTime + currentTask.timeout < utils.currentTime) { - currentTask.error(new Error("A timeout occurred.|\n" + currentTask.callPath.join("\n"))); + currentTask.error(new Error("A timeout occurred.")); } return; } @@ -163,7 +161,8 @@ define([ } }); } - // Run runTask function periodically + + // Call runTask function periodically core.addPeriodicCallback(runTask); function runSafe(task, callbacks, param) { diff --git a/js/extensions/dialogAbout.js b/js/extensions/dialogAbout.js index 0a375aa4..18330c3b 100644 --- a/js/extensions/dialogAbout.js +++ b/js/extensions/dialogAbout.js @@ -27,6 +27,7 @@ define([ "Prettify": "https://code.google.com/p/google-code-prettify/", "RequireJS": "http://requirejs.org/", "stacktrace.js": "http://stacktracejs.com/", + "to-markdown": "https://github.com/domchristie/to-markdown", "UI Layout": "http://layout.jquery-dev.net/", "Underscore.js": "http://underscorejs.org/", "waitForImages": "https://github.com/alexanderdickson/waitForImages" diff --git a/js/extensions/dialogManagePublication.js b/js/extensions/dialogManagePublication.js index bc19fafb..cc6fe1c4 100644 --- a/js/extensions/dialogManagePublication.js +++ b/js/extensions/dialogManagePublication.js @@ -43,7 +43,7 @@ define([ })); lineElement.append($(removeButtonTemplate).click(function() { fileDesc.removePublishLocation(publishAttributes); - extensionMgr.onPublishRemoved(publishFileDesc, publishAttributes); + extensionMgr.onPublishRemoved(fileDesc, publishAttributes); })); publishList.append(lineElement); }); diff --git a/js/extensions/dialogOpenHarddrive.js b/js/extensions/dialogOpenHarddrive.js index 8a3e3b54..a4338d7a 100644 --- a/js/extensions/dialogOpenHarddrive.js +++ b/js/extensions/dialogOpenHarddrive.js @@ -1,14 +1,15 @@ define([ "jquery", "underscore", + "utils", "toMarkdown", "config", -], function($, _, toMarkdown) { +], function($, _, utils, toMarkdown) { var dialogOpenHarddrive = { extensionId: "dialogOpenHarddrive", extensionName: 'Dialog "Open from"', - settingsBloc: '

    Handles the "Open from hard drive" and the "Convert HTML to Markdown" dialog boxes.

    ' + settingsBloc: '

    Handles the "Import from hard drive" and the "Convert HTML to Markdown" dialog boxes.

    ' }; var fileMgr = undefined; @@ -87,6 +88,19 @@ define([ this.addEventListener('dragover', handleDragOver, false); this.addEventListener('drop', handleHtmlImport, false); }); + $(".action-convert-html").click(function(e) { + var content = utils.getInputTextValue("#input-convert-html", e); + if(content === undefined) { + return; + } + content = converter.makeMd(content); + if(content === undefined) { + extensionMgr.onError(importedFile.name + " is not a valid HTML file."); + return; + } + var fileDesc = fileMgr.createFile(undefined, content); + fileMgr.selectFile(fileDesc); + }); }; return dialogOpenHarddrive; diff --git a/js/extensions/googleAnalytics.js b/js/extensions/googleAnalytics.js index 64c55294..52cbdea3 100644 --- a/js/extensions/googleAnalytics.js +++ b/js/extensions/googleAnalytics.js @@ -1,9 +1,10 @@ define([ "jquery", "underscore", + "utils", "settings", "config", -], function($, _, settings) { +], function($, _, utils, settings) { var googleAnalytics = { extensionId: "googleAnalytics", @@ -31,6 +32,19 @@ define([ } }; + var lastPageView = 0; + function trackPageView() { + if(utils.currentTime - lastPageView > 180000) { + _gaq.push([ + '_trackPageview' + ]); + lastPageView = utils.currentTime; + } + } + googleAnalytics.onPeriodicRun = function() { + trackPageView(); + }; + googleAnalytics.onReady = function() { // First configure GA @@ -38,9 +52,7 @@ define([ '_setAccount', GOOGLE_ANALYTICS_ACCOUNT_ID ]); - _gaq.push([ - '_trackPageview' - ]); + trackPageView(); // Collect informations about user settings _gaq.push([ @@ -96,8 +108,8 @@ define([ _gaq.push([ "_trackEvent", "Error", - url, - message + " (" + line + ")" + message, + url + ":" + line + utils.formatEventList() ]); }; @@ -195,7 +207,7 @@ define([ '_trackEvent', "Error", "message", - error.message + error.message + utils.formatEventList() ]); }; diff --git a/js/html/dialogAbout.html b/js/html/dialogAbout.html index c73ae847..9c445d5f 100644 --- a/js/html/dialogAbout.html +++ b/js/html/dialogAbout.html @@ -1,6 +1,6 @@ -
    StackEdit is a free, open-source Markdown - editor based on PageDown, the Markdown library used by Stack Overflow - and the other Stack Exchange sites.
    +

    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:
    diff --git a/js/synchronizer.js b/js/synchronizer.js index 68c2b8d7..ce3af4ea 100644 --- a/js/synchronizer.js +++ b/js/synchronizer.js @@ -61,6 +61,8 @@ define([ // Dequeue a synchronized location var syncAttributes = uploadSyncAttributesList.pop(); + utils.logValue(syncAttributes.syncIndex + localStorage[syncAttributes.syncIndex]); + // Use the specified provider to perform the upload syncAttributes.provider.syncUp(uploadContent, uploadContentCRC, uploadTitle, uploadTitleCRC, syncAttributes, function(error, uploadFlag) { if(uploadFlag === true) { diff --git a/js/utils.js b/js/utils.js index 2901403d..02fa9c57 100644 --- a/js/utils.js +++ b/js/utils.js @@ -1,7 +1,8 @@ define([ "jquery", "underscore", - "libs/FileSaver" + "libs/FileSaver", + "libs/stacktrace", ], function($, _) { var utils = {}; @@ -118,7 +119,7 @@ define([ // Reset input control in all modals utils.resetModalInputs = function() { - $(".modal input[type=text]:not([disabled]), .modal input[type=password]").val(""); + $(".modal input[type=text]:not([disabled]), .modal input[type=password], .modal textarea").val(""); }; // Basic trim function @@ -237,6 +238,34 @@ define([ } }; + var eventList = []; + utils.logValue = function(value) { + eventList.unshift(value); + if(eventList.length > 5) { + eventList.pop(); + } + }; + utils.logStackTrace = function() { + eventList.unshift(printStackTrace()); + if(eventList.length > 5) { + eventList.pop(); + } + }; + utils.formatEventList = function() { + var result = []; + _.each(eventList, function(event) { + result.push("\n"); + if(_.isString(event)) { + result.push(event); + } + else if(_.isArray(event)) { + result.push(event[5] || ""); + result.push(event[6] || ""); + } + }); + return result.join(""); + }; + // Base64 conversion utils.encodeBase64 = function(str) { if(str.length === 0) {