deploy: 851cfff

Author: phoenixide

LiveDevelopment/LiveDevMultiBrowser.js

@@ -539,7 +539,9 @@ 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
-                            if (_liveDocument && (msg.url === _resolveUrl(_liveDocument.doc.file.fullPath))) {
+                            const urlWithoutQueryParams = msg.url.split("?")[0].split("#")[0];
+                            if (_liveDocument &&
+                                (urlWithoutQueryParams === _resolveUrl(_liveDocument.doc.file.fullPath))) {
                                 _setStatus(STATUS_ACTIVE);
                             }
                         }

assets/default-project/en.zip

@@ -1,5 +1,5 @@
 {
-  "assets/default-project/en.zip": "cc4448095267d97c8e55c6b026a065bb",
+  "assets/default-project/en.zip": "8b61fc0a375306c6c8ba10f49ba21536",
   "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": "0cd885914a08cd4ffa66bb4509dec93c",
+  "assets/sample-projects/bootstrap-blog.zip": "9dae6b25a25423df06674673f4c8b644",
   "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": "2134aeee93da6053cafcff919bbdad06",
+  "assets/sample-projects/dashboard.zip": "57a9e99bb94e7336852e4be192e6927c",
   "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": "a3c53b469e56fff6abb9877541076fc3",
+  "assets/sample-projects/explore.zip": "92e9ddd0b9b80759a5267d96061208bd",
   "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": "7c8e5e744ba0d51c943c2ac9f5a2e1a4",
+  "assets/sample-projects/home-pages.zip": "ec756ea4a4ec4c6b4d746a43015cd007",
   "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": "6d2cdad03218231a560823fe362930de",
+  "assets/sample-projects/HTML5.zip": "5c820a3432936acea68a5c7df5c548ba",
   "assets/sample-projects/HTML5/index.html": "ca318e370d63b3e083d3bd63052b8252",
   "assets/sample-projects/HTML5/script.js": "47de56d88cd6d866c4f77027128c0dd7",
   "assets/sample-projects/HTML5/styles.css": "8c798c8b3bba7e4d49dfe99b4deccd47",
@@ -250,7 +250,7 @@
   "brackets.config.dist.json": "067654f0936d60f59d5fa493c6b3ed1c",
   "brackets.config.staging.json": "53d44a23a939eaaaea05e072c8780584",
   "brackets.js": "bb2687b34745876749beff06fc1bd2b4",
-  "cacheManifest.json": "729a1f9d2fd2caf1703bb0c560a5b8fd",
+  "cacheManifest.json": "650776aca72995900f05dc46ef4a88f9",
   "command/CommandManager.js": "ebbc15626600575d2dfe2a97da2993a0",
   "command/Commands.js": "d1b78cbe3e6272c06e442d8c3441838c",
   "command/DefaultMenus.js": "584a9294b73f2eeb4c15c97186b0e765",
@@ -475,7 +475,7 @@
   "extensions/default/Phoenix-live-preview/panel.html": "5ecc71e9a2a0fc54142bdcabd43e1dec",
   "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": "5635944be46433b90de18baec67b31af",
+  "extensions/default/Phoenix-live-preview/utils.js": "7c22ab925bea458508a013531704ce44",
   "extensions/default/Phoenix-Markdown/dialogs.js": "7a821281226f89be47fa78aa553bac73",
   "extensions/default/Phoenix-Markdown/handler.js": "3699ac79c80cd08ec8ab86e4c5a7edbe",
   "extensions/default/Phoenix-Markdown/keyboard.json": "afb9a06042c3ad88ae1764cf548c0e6c",
@@ -549,7 +549,7 @@
   "extensions/default/Phoenix/requirejs-config.json": "d41d8cd98f00b204e9800998ecf8427e",
   "extensions/default/Phoenix/serverSync.js": "0827393832dea63a739bdbfa6e822f66",
   "extensions/default/Phoenix/styles.css": "78e701432c3614eb845d22147790f7e1",
-  "extensions/default/Phoenix/survey.js": "14a6d96f812288cf7663646461449a1c",
+  "extensions/default/Phoenix/survey.js": "770e331e60020f2abca74d78aa49ca2f",
   "extensions/default/Phoenix/utils.js": "3e7b250b2164622612195164dbc70e50",
   "extensions/default/PrefsCodeHints/main.js": "5fdc2ad4cb8fdfa75d15e3516d321c7d",
   "extensions/default/PrefsCodeHints/package.json": "6cc153632f155df7eef619be4204adaf",
@@ -592,7 +592,7 @@
   "extensions/default/StaticServer/main.js": "1d8eaea383ca0857a934dc83be979ad0",
   "extensions/default/StaticServer/package.json": "04284298961fc06b9f33d78d9bc77955",
   "extensions/default/StaticServer/requirejs-config.json": "d41d8cd98f00b204e9800998ecf8427e",
-  "extensions/default/StaticServer/StaticServer.js": "4176d476a8d282a12d0dcb01f090cdfd",
+  "extensions/default/StaticServer/StaticServer.js": "2da5c607f5cfe86b4803669a83f6fd26",
   "extensions/default/SVGCodeHints/main.js": "768555034bc1c517b13296dd0cf51e19",
   "extensions/default/SVGCodeHints/package.json": "568ae3ad848a2ca0460ef6516a308a7a",
   "extensions/default/SVGCodeHints/requirejs-config.json": "d41d8cd98f00b204e9800998ecf8427e",
@@ -721,7 +721,7 @@
   "LiveDevelopment/BrowserScripts/ServiceWorkerTransportRemote.js": "1e688fc460b0d611612bf1df86120ae1",
   "LiveDevelopment/launch.html": "47a38a7da01bc004f4296e1a6b33cc4c",
   "LiveDevelopment/LiveDevelopmentUtils.js": "066a8a03706bf755b4764a9ba62f3a5c",
-  "LiveDevelopment/LiveDevMultiBrowser.js": "fdfd6c90d7b225cd19bd5f81e78d83a6",
+  "LiveDevelopment/LiveDevMultiBrowser.js": "172802d092d13403d35c192699a6e4ae",
   "LiveDevelopment/LiveDevServerManager.js": "2840cc624754b21dc6e3642d8e0ac49d",
   "LiveDevelopment/main.js": "cc487329685dd9a2982719061bb6ad3a",
   "LiveDevelopment/main.less": "d5dfa71bbf5d96e53b060d048616a757",
@@ -926,7 +926,7 @@
   "phoenix/virtualServer/json-formatter.js": "6232f714dad9d256ebeaef375b1ea8d6",
   "phoenix/virtualServer/mime-db.js": "d0a7f1c2d5d2f3411caeaa13963c251b",
   "phoenix/virtualServer/mime-types.js": "080b5f393ecaf560d0c43ff85b1366f4",
-  "phoenix/virtualServer/webserver.js": "90f730a5223789379707c0fa89011fae",
+  "phoenix/virtualServer/webserver.js": "f37f0b7c5aadf1e01e0e9f9dabe569f8",
   "preferences/PreferencesBase.js": "6ecf52d058f8127a987aa4dc7d64081a",
   "preferences/PreferencesDialogs.js": "b27242049c74747d193209e37d897eb8",
   "preferences/PreferencesImpl.js": "e4abe82c3c3adbd53ae0f5ddb3fabe92",
@@ -1918,7 +1918,7 @@
   "view/ViewCommandHandlers.js": "3b91d3fc69b987d3c921ddcc200c85c9",
   "view/ViewStateManager.js": "695f3f492456e78e7ddf143e1c051b08",
   "view/WorkspaceManager.js": "2f9dd80ee6a4528056a49903e009929f",
-  "virtual-server-main.js": "4ec867a71217b73ea9640fdf59c879fc",
+  "virtual-server-main.js": "4568564fd6b4ede17c8244fe9f5c9fe8",
   "widgets/bootstrap-alerts.js": "1a0048304bc7f9938b8235e8f5ce1ecb",
   "widgets/bootstrap-button.js": "1441d0ebe0d5862ad9f0e05049548bdf",
   "widgets/bootstrap-dropdown.js": "858806dca6c8f91e9d837c31a28e227f",

assets/sample-projects/HTML5.zip

@@ -82,7 +82,7 @@ define(function (require, exports, module) {
                     if(await file.existsAsync()){
                         const relativePath = path.relative(projectRoot, file.fullPath);
                         resolve({
-                            URL: `${projectRootUrl}${relativePath}`,
+                            URL: `${projectRootUrl}${relativePath}?PHOENIX_INSTANCE_ID=${Phoenix.PHOENIX_INSTANCE_ID}`,
                             filePath: relativePath,
                             fullPath: file.fullPath,
                             isHTMLFile: _isHTMLFile(file.fullPath)
@@ -118,8 +118,12 @@ define(function (require, exports, module) {
                     }
                     if(_isPreviewableFile(fullPath)){
                         const filePath = httpFilePath || path.relative(projectRoot, fullPath);
+                        let URL = httpFilePath || `${projectRootUrl}${filePath}`;
+                        if(_isHTMLFile(fullPath)){
+                            URL = URL + `?PHOENIX_INSTANCE_ID=${Phoenix.PHOENIX_INSTANCE_ID}`;
+                        }
                         resolve({
-                            URL: httpFilePath || `${projectRootUrl}${filePath}`,
+                            URL,
                             filePath: filePath,
                             fullPath: fullPath,
                             isMarkdownFile: _isMarkdownFile(fullPath),

assets/sample-projects/bootstrap-blog.zip

@@ -21,7 +21,7 @@
 define(function (require, exports, module) {
 
     const TIME_TO_WAIT_BEFORE_SURVEY_SHOW_SEC = 300,
-        SHOWN_VERSION='v3'; // If you like to show the same survey again, just increase the version number to v4...
+        SHOWN_VERSION='v4'; // If you like to show the same survey again, just increase the version number to v5...
     let Dialogs     = brackets.getModule("widgets/Dialogs"),
         Mustache           = brackets.getModule("thirdparty/mustache/mustache"),
         SurveyTemplate     = require("text!html/survey-template.html"),