deploy: 851cfff

Author: phoenixide

LiveDevelopment/LiveDevMultiBrowser.js

@@ -526,11 +526,11 @@ define(function (require, exports, module) {
                 // Launch the URL in the browser. If it's the first one to connect back to us,
                 // our status will transition to ACTIVE once it does so.
                 if (exports.status < STATUS_ACTIVE) {
-                    _launch(_server.pathToUrl(doc.file.fullPath), doc.file.fullPath);
+                    _launch(_resolveUrl(doc.file.fullPath), doc.file.fullPath);
                 }
                 if (exports.status === STATUS_RESTARTING) {
                     // change page in browser
-                    _protocol.navigate(_server.pathToUrl(doc.file.fullPath));
+                    _protocol.navigate(_resolveUrl(doc.file.fullPath));
                 }
 
                 _protocol
@@ -539,9 +539,7 @@ define(function (require, exports, module) {
                         // check for the first connection
                         if (_protocol.getConnectionIds().length === 1) {
                             // check the page that connection comes from matches the current live document session
-                            const urlWithoutQueryParams = msg.url.split("?")[0].split("#")[0];
-                            if (_liveDocument &&
-                                (urlWithoutQueryParams === _resolveUrl(_liveDocument.doc.file.fullPath))) {
+                            if (_liveDocument &&  msg.url === _resolveUrl(_liveDocument.doc.file.fullPath)) {
                                 _setStatus(STATUS_ACTIVE);
                             }
                         }
@@ -656,13 +654,13 @@ define(function (require, exports, module) {
      * When switching documents, close the current preview and open a new one.
      */
     function _onFileChange() {
-        var doc = DocumentManager.getCurrentDocument();
+        let doc = DocumentManager.getCurrentDocument();
         if (!isActive() || !doc || livePreviewUrlPinned) {
             return;
         }
 
         // close the current session and begin a new session
-        var docUrl = _server && _server.pathToUrl(doc.file.fullPath),
+        let docUrl = _resolveUrl(doc.file.fullPath),
             isViewable = _server && _server.canServe(doc.file.fullPath);
 
         if (_liveDocument.doc.url !== docUrl && isViewable) {

assets/default-project/en.zip

@@ -49,6 +49,7 @@ define(function (require, exports, module) {
     require("widgets/bootstrap-modal");
     require("widgets/bootstrap-twipsy-mod");
     require("thirdparty/jquery.knob.modified");
+    require('thirdparty/marked.min');
 
     // Load CodeMirror add-ons--these attach themselves to the CodeMirror module
     require("thirdparty/CodeMirror/addon/comment/continuecomment");

assets/sample-projects/HTML5.zip

@@ -1,5 +1,5 @@
 {
-  "assets/default-project/en.zip": "cc12875025b61ee2a25a42dd57521763",
+  "assets/default-project/en.zip": "5fc3139a82ce6b1d3daa01c00554bd36",
   "assets/default-project/en/Feature Highlights.markdown": "89f75b12d577829b19f2db4fbbc4b5dc",
   "assets/default-project/en/Features.md": "05fa1291228099ed14f8d3848c1caaeb",
   "assets/default-project/en/images/cloud1.svg": "aca7bba84a2237f1c1988caea54a67a9",
@@ -116,7 +116,7 @@
   "assets/phoenix-splash/no-preview.html": "e62c3e83f0dfa1abb595e8e4ad67ff92",
   "assets/phoenix-splash/safari.html": "dbe3e156bb436b14f4c41888b5d1f2cf",
   "assets/phoenix-splash/styles.css": "6779a4e26a1f27a64035c8b67f9ce729",
-  "assets/sample-projects/bootstrap-blog.zip": "f81b986f89f51931f827b62c721f1f74",
+  "assets/sample-projects/bootstrap-blog.zip": "28966441a6ae72acafe9a8a841c807d5",
   "assets/sample-projects/bootstrap-blog/assets/brand/bootstrap-logo-white.svg": "2e642df55357162ad28519305c8fd4fe",
   "assets/sample-projects/bootstrap-blog/assets/brand/bootstrap-logo.svg": "88eef7f3c2bcf988457a0e6d123c3f1d",
   "assets/sample-projects/bootstrap-blog/assets/dist/css/bootstrap.min.css": "6d9c6fda1e7087224431cc8068bb998f",
@@ -126,7 +126,7 @@
   "assets/sample-projects/bootstrap-blog/blog.rtl.css": "c6c275bf0b804d3dec264ec7fb3d7677",
   "assets/sample-projects/bootstrap-blog/index-rtl.html": "506e2d3fd1c4bb3651377144a62d5e82",
   "assets/sample-projects/bootstrap-blog/index.html": "dd8824ad3c9520dc0a825176d20eb694",
-  "assets/sample-projects/dashboard.zip": "6544971219d2ace3c2f5f409823ab97f",
+  "assets/sample-projects/dashboard.zip": "800f5ac0cf006f6827ba47b05faabacc",
   "assets/sample-projects/dashboard/assets/brand/bootstrap-logo-white.svg": "2e642df55357162ad28519305c8fd4fe",
   "assets/sample-projects/dashboard/assets/brand/bootstrap-logo.svg": "88eef7f3c2bcf988457a0e6d123c3f1d",
   "assets/sample-projects/dashboard/assets/dist/css/bootstrap.min.css": "6d9c6fda1e7087224431cc8068bb998f",
@@ -138,7 +138,7 @@
   "assets/sample-projects/dashboard/index.html": "ddfda6ea9dfc8e12a8dcbbf065c804de",
   "assets/sample-projects/dashboard/signin.css": "a71ff2b493f230e0d6585793c2115809",
   "assets/sample-projects/dashboard/signin.html": "b108c183dfa7e2da3d88ec79bee79509",
-  "assets/sample-projects/explore.zip": "fa1ea0c1135196def87906e7ebc23091",
+  "assets/sample-projects/explore.zip": "98fa4f7e5467a36e0c879abd2119ea61",
   "assets/sample-projects/explore/A-tribute-page.html": "007699e85177db3d1cd87d0d47440b36",
   "assets/sample-projects/explore/adjustable-fireworks.html": "706a0995d00d8ae009b5426cf7ee69be",
   "assets/sample-projects/explore/ant_colony.html": "d0885229e57caecc83049b50ee98560c",
@@ -228,7 +228,7 @@
   "assets/sample-projects/explore/watermelon-pixel.html": "6f6754e8073436bb823807a10a0446ea",
   "assets/sample-projects/explore/webmine.html": "9879458a48c757dc6671d408e940da4d",
   "assets/sample-projects/explore/whack-a-mole.html": "827f15c53657350b9c898fa27ecf15ac",
-  "assets/sample-projects/home-pages.zip": "8bf1771e6a7505ee33fd0de154d4db11",
+  "assets/sample-projects/home-pages.zip": "3cbaad00bb834f194a18c267c26a7448",
   "assets/sample-projects/home-pages/album/index.html": "df20e4a479659463ab9d3f6b4ca4dbd1",
   "assets/sample-projects/home-pages/assets/brand/bootstrap-logo-white.svg": "2e642df55357162ad28519305c8fd4fe",
   "assets/sample-projects/home-pages/assets/brand/bootstrap-logo.svg": "88eef7f3c2bcf988457a0e6d123c3f1d",
@@ -240,7 +240,7 @@
   "assets/sample-projects/home-pages/carousel/index.html": "fc5bf7b2d8640a2c393f465294210e7c",
   "assets/sample-projects/home-pages/cover/cover.css": "3738586a82dd90263617020e7f1db82e",
   "assets/sample-projects/home-pages/cover/index.html": "a0ae1a11224672532b3466df93ce0821",
-  "assets/sample-projects/HTML5.zip": "bcaaf16ecd043ce8ab265c81df1a74cf",
+  "assets/sample-projects/HTML5.zip": "7cf7aff04d98196fe63f4a4b656d29df",
   "assets/sample-projects/HTML5/index.html": "ca318e370d63b3e083d3bd63052b8252",
   "assets/sample-projects/HTML5/script.js": "47de56d88cd6d866c4f77027128c0dd7",
   "assets/sample-projects/HTML5/styles.css": "8c798c8b3bba7e4d49dfe99b4deccd47",
@@ -249,8 +249,8 @@
   "base-config/keyboard.json": "bb76969c73dcce398fadcb76b5ea45dc",
   "brackets.config.dist.json": "067654f0936d60f59d5fa493c6b3ed1c",
   "brackets.config.staging.json": "53d44a23a939eaaaea05e072c8780584",
-  "brackets.js": "d5cc16d7b2ec892057f1fe8458b3cf6a",
-  "cacheManifest.json": "b1b82f640534d6fe6e29d81b33694cd4",
+  "brackets.js": "a469fdfa079dd273d32b0992c0be39d7",
+  "cacheManifest.json": "83b8484423b3082c9ec21574aa4ba88a",
   "command/CommandManager.js": "ebbc15626600575d2dfe2a97da2993a0",
   "command/Commands.js": "d1b78cbe3e6272c06e442d8c3441838c",
   "command/DefaultMenus.js": "082f4dc2fb1cfc6212195e651bd58d0e",
@@ -470,13 +470,11 @@
   "extensions/default/Phoenix-extension-store/requirejs-config.json": "d41d8cd98f00b204e9800998ecf8427e",
   "extensions/default/Phoenix-live-preview/images/sprites.svg": "e3611098ae5abdc7d78d3c2432108730",
   "extensions/default/Phoenix-live-preview/live-preview.css": "501db9ec3d71d6192e648febf565da17",
-  "extensions/default/Phoenix-live-preview/main.js": "6868dc011443be87953c5f8750870946",
-  "extensions/default/Phoenix-live-preview/markdown.html": "a7f3c921201aac41a186d224d98aadda",
+  "extensions/default/Phoenix-live-preview/main.js": "816ee84cdf8027a6b9bc0bd56edff41d",
   "extensions/default/Phoenix-live-preview/package.json": "5fb85ec2a35a65b0b4252ad4b763b615",
   "extensions/default/Phoenix-live-preview/panel.html": "458c80a1ca96f211a2c5bdcc22df9957",
   "extensions/default/Phoenix-live-preview/requirejs-config.json": "d41d8cd98f00b204e9800998ecf8427e",
-  "extensions/default/Phoenix-live-preview/thirdparty/marked.min.js": "499cf98556e00a523c5c40f02e7e0fbf",
-  "extensions/default/Phoenix-live-preview/utils.js": "7c22ab925bea458508a013531704ce44",
+  "extensions/default/Phoenix-live-preview/utils.js": "c1e1a89fdc33644678fad1c1c9063a7d",
   "extensions/default/Phoenix-Markdown/dialogs.js": "7a821281226f89be47fa78aa553bac73",
   "extensions/default/Phoenix-Markdown/handler.js": "3699ac79c80cd08ec8ab86e4c5a7edbe",
   "extensions/default/Phoenix-Markdown/keyboard.json": "afb9a06042c3ad88ae1764cf548c0e6c",
@@ -592,9 +590,10 @@
   "extensions/default/RemoteFileAdapter/styles.css": "60febf656513b5b34c429d9c1e276f9a",
   "extensions/default/RemoteFileAdapter/unittests.js": "284f3aad3db693e3f83fa99bc0e7fe7f",
   "extensions/default/StaticServer/main.js": "1d8eaea383ca0857a934dc83be979ad0",
+  "extensions/default/StaticServer/markdown.html": "a7f3c921201aac41a186d224d98aadda",
   "extensions/default/StaticServer/package.json": "04284298961fc06b9f33d78d9bc77955",
   "extensions/default/StaticServer/requirejs-config.json": "d41d8cd98f00b204e9800998ecf8427e",
-  "extensions/default/StaticServer/StaticServer.js": "2da5c607f5cfe86b4803669a83f6fd26",
+  "extensions/default/StaticServer/StaticServer.js": "52ab005c9e807b9f8245102cb9adf014",
   "extensions/default/SVGCodeHints/main.js": "768555034bc1c517b13296dd0cf51e19",
   "extensions/default/SVGCodeHints/package.json": "568ae3ad848a2ca0460ef6516a308a7a",
   "extensions/default/SVGCodeHints/requirejs-config.json": "d41d8cd98f00b204e9800998ecf8427e",
@@ -723,7 +722,7 @@
   "LiveDevelopment/BrowserScripts/ServiceWorkerTransportRemote.js": "c117c0509838513416abdd1d083b2a45",
   "LiveDevelopment/launch.html": "47a38a7da01bc004f4296e1a6b33cc4c",
   "LiveDevelopment/LiveDevelopmentUtils.js": "066a8a03706bf755b4764a9ba62f3a5c",
-  "LiveDevelopment/LiveDevMultiBrowser.js": "172802d092d13403d35c192699a6e4ae",
+  "LiveDevelopment/LiveDevMultiBrowser.js": "f8f391daaf3c3e4651bd38b2e1c77001",
   "LiveDevelopment/LiveDevServerManager.js": "2840cc624754b21dc6e3642d8e0ac49d",
   "LiveDevelopment/main.js": "6bc9e80af71a0e11d9e3cfbac0f46956",
   "LiveDevelopment/main.less": "d5dfa71bbf5d96e53b060d048616a757",
@@ -926,7 +925,7 @@
   "phoenix/virtualServer/json-formatter.js": "6232f714dad9d256ebeaef375b1ea8d6",
   "phoenix/virtualServer/mime-db.js": "d0a7f1c2d5d2f3411caeaa13963c251b",
   "phoenix/virtualServer/mime-types.js": "080b5f393ecaf560d0c43ff85b1366f4",
-  "phoenix/virtualServer/webserver.js": "f37f0b7c5aadf1e01e0e9f9dabe569f8",
+  "phoenix/virtualServer/webserver.js": "90e2abb8b947d5af13a033e9e404e947",
   "preferences/PreferencesBase.js": "6ecf52d058f8127a987aa4dc7d64081a",
   "preferences/PreferencesDialogs.js": "b27242049c74747d193209e37d897eb8",
   "preferences/PreferencesImpl.js": "e4abe82c3c3adbd53ae0f5ddb3fabe92",
@@ -1653,6 +1652,7 @@
   "thirdparty/licences/tinycolor2.markdown": "70173b8ef16bc4265f72540378795d85",
   "thirdparty/licences/underscore.markdown": "fc5c665cb051dce9ddf8d8b9a26dca5f",
   "thirdparty/lodash.js": "62c57c75444143c78ae3ed4aab0dcd3a",
+  "thirdparty/marked.min.js": "499cf98556e00a523c5c40f02e7e0fbf",
   "thirdparty/mime-db.json": "052e457b88d815c1792e1f8ce8509fc3",
   "thirdparty/murmurhash3_gc.js": "adaa2617ceebe03afe3653f9c4b2c15a",
   "thirdparty/mustache/mustache.js": "1cc4fbd7393a16895e66a08ceb953f9e",
@@ -1922,7 +1922,7 @@
   "view/ViewCommandHandlers.js": "3b91d3fc69b987d3c921ddcc200c85c9",
   "view/ViewStateManager.js": "695f3f492456e78e7ddf143e1c051b08",
   "view/WorkspaceManager.js": "2f9dd80ee6a4528056a49903e009929f",
-  "virtual-server-main.js": "4568564fd6b4ede17c8244fe9f5c9fe8",
+  "virtual-server-main.js": "56d65dd3c79215d959ac476ae34bf713",
   "widgets/bootstrap-alerts.js": "1a0048304bc7f9938b8235e8f5ce1ecb",
   "widgets/bootstrap-button.js": "1441d0ebe0d5862ad9f0e05049548bdf",
   "widgets/bootstrap-dropdown.js": "858806dca6c8f91e9d837c31a28e227f",

assets/sample-projects/bootstrap-blog.zip

@@ -49,40 +49,19 @@ define(function (require, exports, module) {
         AppInit            = brackets.getModule("utils/AppInit"),
         ProjectManager     = brackets.getModule("project/ProjectManager"),
         MainViewManager    = brackets.getModule("view/MainViewManager"),
-        DocumentManager    = brackets.getModule("document/DocumentManager"),
         Strings            = brackets.getModule("strings"),
         Mustache           = brackets.getModule("thirdparty/mustache/mustache"),
         Metrics            = brackets.getModule("utils/Metrics"),
         FileViewController = brackets.getModule("project/FileViewController"),
         NotificationUI = brackets.getModule("widgets/NotificationUI"),
         LiveDevelopment = brackets.getModule("LiveDevelopment/main"),
-        marked = require('thirdparty/marked.min'),
         utils = require('utils');
 
     const LIVE_PREVIEW_PANEL_ID = "live-preview-panel";
 
-    // TODO markdown advanced rendering options https://marked.js.org/using_advanced
-    marked.setOptions({
-        renderer: new marked.Renderer(),
-        // highlight: function(code, lang) {
-        //     const hljs = require('highlight.js');
-        //     const language = hljs.getLanguage(lang) ? lang : 'plaintext';
-        //     return hljs.highlight(code, { language }).value;
-        // },
-        // langPrefix: 'hljs language-', // highlight.js css expects a top-level 'hljs' class.
-        pedantic: false,
-        gfm: true,
-        breaks: false,
-        sanitize: false,
-        smartLists: true,
-        smartypants: false,
-        xhtml: false
-    });
-
 
     // Templates
-    let panelHTML       = require("text!panel.html"),
-        markdownHTMLTemplate = require("text!markdown.html");
+    let panelHTML       = require("text!panel.html");
     ExtensionUtils.loadStyleSheet(module, "live-preview.css");
 
     // jQuery objects
@@ -213,42 +192,33 @@ define(function (require, exports, module) {
         });
     }
 
-    function _renderMarkdown(fullPath) {
-        DocumentManager.getDocumentForPath(fullPath)
-            .done(function (doc) {
-                let text = doc.getText();
-                let markdownHtml = marked.parse(text);
-                let templateVars = {
-                    markdownContent: markdownHtml,
-                    BOOTSTRAP_LIB_CSS: `${window.parent.Phoenix.baseURL}thirdparty/bootstrap/bootstrap.min.css`,
-                    HIGHLIGHT_JS_CSS: `${window.parent.Phoenix.baseURL}thirdparty/highlight.js/styles/github.min.css`,
-                    HIGHLIGHT_JS: `${window.parent.Phoenix.baseURL}thirdparty/highlight.js/highlight.min.js`,
-                    GFM_CSS: `${window.parent.Phoenix.baseURL}thirdparty/gfm.min.css`
-                };
-                let html = Mustache.render(markdownHTMLTemplate, templateVars);
-                $iframe.attr('srcdoc', html);
-                if(tab && !tab.closed){
-                    tab.location = "about:blank";
-                    setTimeout(()=>{
-                        tab.window.document.write(html);
-                    }, 10); // timer hack, location and content cannot be set in a row,
-                    // we should move to iframe embedded controls
-                }
-            })
-            .fail(function (err) {
-                console.error(`Markdown rendering failed for ${fullPath}: `, err);
-            });
+    function _renderMarkdown(fullPath, newSrc) {
+        console.log(`Markdown Static server _updateInstrumentedURLSInWorker: `, [fullPath], newSrc);
+        window.messageSW({
+            type: 'setInstrumentedURLs',
+            root: "",
+            paths: [fullPath]
+        }).then((status)=>{
+            console.log(`Markdown server received msg from Service worker: setInstrumentedURLs done: `, status);
+            $iframe.attr('srcdoc', null);
+            $iframe.attr('src', newSrc);
+            if(tab && !tab.closed){
+                tab.location = newSrc;
+            }
+        }).catch(err=>{
+            console.error(`Markdown error while from sw rendering failed for ${fullPath}: `, err);
+        });
     }
 
     function _renderPreview(previewDetails, newSrc) {
         let fullPath = previewDetails.fullPath;
         if(previewDetails.isMarkdownFile){
-            $iframe.attr('src', 'about:blank');
-            _renderMarkdown(fullPath);
+            _renderMarkdown(fullPath, newSrc);
             Metrics.countEvent(Metrics.EVENT_TYPE.LIVE_PREVIEW, "render", "markdown");
         } else {
             $iframe.attr('srcdoc', null);
             $iframe.attr('src', newSrc);
+            $iframe[0].src = newSrc;
             if(tab && !tab.closed){
                 tab.location = newSrc;
             }