Skip to content

Commit 1cb457a

Browse files
committed
deploy: 851cfff
1 parent 22d0c00 commit 1cb457a

23 files changed

Lines changed: 46 additions & 58 deletions

File tree

‎LiveDevelopment/LiveDevMultiBrowser.js‎

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,7 @@ define(function (require, exports, module) {
169169
*/
170170
function _closeDocument(liveDocument) {
171171
liveDocument.off(".livedev");
172+
_protocol.off(".livedev");
172173
liveDocument.close();
173174
}
174175

@@ -469,18 +470,6 @@ define(function (require, exports, module) {
469470
return new $.Deferred().resolve().promise();
470471
}
471472

472-
/**
473-
* @private
474-
* Displays an error when no HTML file can be found to preview.
475-
*/
476-
function _showWrongDocError() {
477-
Dialogs.showModalDialog(
478-
DefaultDialogs.DIALOG_ID_ERROR,
479-
Strings.LIVE_DEVELOPMENT_ERROR_TITLE,
480-
Strings.LIVE_DEV_NEED_HTML_MESSAGE
481-
);
482-
}
483-
484473
/**
485474
* @private
486475
* Displays an error when the server for live development files can't be started.
@@ -709,7 +698,7 @@ define(function (require, exports, module) {
709698
_doLaunchAfterServerReady(doc);
710699
})
711700
.fail(function () {
712-
_showWrongDocError();
701+
console.log("Live preview: no document to preview.");
713702
});
714703
});
715704
}

‎LiveDevelopment/MultiBrowserImpl/documents/LiveDocument.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,10 @@ define(function (require, exports, module) {
6464
this._onCursorActivity = this._onCursorActivity.bind(this);
6565
this._onHighlightPrefChange = this._onHighlightPrefChange.bind(this);
6666

67-
EditorManager.on("activeEditorChange", this._onActiveEditorChange);
67+
EditorManager.on(`activeEditorChange.LiveDocument-${this.doc.file.fullPath}`, this._onActiveEditorChange);
6868

6969
PreferencesManager.stateManager.getPreference("livedev.highlight")
70-
.on("change", this._onHighlightPrefChange);
70+
.on(`change.LiveDocument-${this.doc.file.fullPath}`, this._onHighlightPrefChange);
7171

7272
// Redraw highlights when window gets focus. This ensures that the highlights
7373
// will be in sync with any DOM changes that may have occurred.
@@ -88,9 +88,9 @@ define(function (require, exports, module) {
8888

8989
this._clearErrorDisplay();
9090
this._detachFromEditor();
91-
EditorManager.off("activeEditorChange", this._onActiveEditorChange);
91+
EditorManager.off(`activeEditorChange.LiveDocument-${this.doc.file.fullPath}`);
9292
PreferencesManager.stateManager.getPreference("livedev.highlight")
93-
.off("change", this._onHighlightPrefChange);
93+
.off(`change.LiveDocument-${this.doc.file.fullPath}`);
9494
};
9595

9696
/**

‎LiveDevelopment/MultiBrowserImpl/documents/LiveHTMLDocument.js‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,12 @@ define(function (require, exports, module) {
135135
*/
136136
LiveHTMLDocument.prototype.close = function () {
137137
this.doc.off("change", this._onChange);
138+
this.protocol.off("DocumentRelated", this._onRelated);
139+
this.protocol.off("StylesheetAdded", this._onStylesheetAdded);
140+
this.protocol.off("StylesheetRemoved", this._onStylesheetRemoved);
141+
this.protocol.off("ScriptAdded", this._onScriptAdded);
142+
this.protocol.off("ScriptRemoved", this._onScriptRemoved);
143+
138144
this.parentClass.close.call(this);
139145
};
140146

‎assets/default-project/en.zip‎

0 Bytes
Binary file not shown.

‎assets/sample-projects/HTML5.zip‎

0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.

‎assets/sample-projects/explore.zip‎

0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.

‎cacheManifest.json‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"assets/default-project/en.zip": "2ef0f5860a246962824bf42fa6f89ee6",
2+
"assets/default-project/en.zip": "85eb6b9577a968b3e0105f415adf0058",
33
"assets/default-project/en/Feature Highlights.markdown": "89f75b12d577829b19f2db4fbbc4b5dc",
44
"assets/default-project/en/Features.md": "05fa1291228099ed14f8d3848c1caaeb",
55
"assets/default-project/en/images/cloud1.svg": "aca7bba84a2237f1c1988caea54a67a9",
@@ -116,7 +116,7 @@
116116
"assets/phoenix-splash/no-preview.html": "e62c3e83f0dfa1abb595e8e4ad67ff92",
117117
"assets/phoenix-splash/safari.html": "dbe3e156bb436b14f4c41888b5d1f2cf",
118118
"assets/phoenix-splash/styles.css": "6779a4e26a1f27a64035c8b67f9ce729",
119-
"assets/sample-projects/bootstrap-blog.zip": "ce2556ea20b672623f6de495e2f9f6da",
119+
"assets/sample-projects/bootstrap-blog.zip": "6bba945d18aa0749fe7917b537750283",
120120
"assets/sample-projects/bootstrap-blog/assets/brand/bootstrap-logo-white.svg": "2e642df55357162ad28519305c8fd4fe",
121121
"assets/sample-projects/bootstrap-blog/assets/brand/bootstrap-logo.svg": "88eef7f3c2bcf988457a0e6d123c3f1d",
122122
"assets/sample-projects/bootstrap-blog/assets/dist/css/bootstrap.min.css": "6d9c6fda1e7087224431cc8068bb998f",
@@ -126,7 +126,7 @@
126126
"assets/sample-projects/bootstrap-blog/blog.rtl.css": "c6c275bf0b804d3dec264ec7fb3d7677",
127127
"assets/sample-projects/bootstrap-blog/index-rtl.html": "506e2d3fd1c4bb3651377144a62d5e82",
128128
"assets/sample-projects/bootstrap-blog/index.html": "dd8824ad3c9520dc0a825176d20eb694",
129-
"assets/sample-projects/dashboard.zip": "5a5f9b1d1e8a740ea7605c6a80397a3c",
129+
"assets/sample-projects/dashboard.zip": "ab729ddc7aa777db8e5a1b858efa0491",
130130
"assets/sample-projects/dashboard/assets/brand/bootstrap-logo-white.svg": "2e642df55357162ad28519305c8fd4fe",
131131
"assets/sample-projects/dashboard/assets/brand/bootstrap-logo.svg": "88eef7f3c2bcf988457a0e6d123c3f1d",
132132
"assets/sample-projects/dashboard/assets/dist/css/bootstrap.min.css": "6d9c6fda1e7087224431cc8068bb998f",
@@ -138,7 +138,7 @@
138138
"assets/sample-projects/dashboard/index.html": "ddfda6ea9dfc8e12a8dcbbf065c804de",
139139
"assets/sample-projects/dashboard/signin.css": "a71ff2b493f230e0d6585793c2115809",
140140
"assets/sample-projects/dashboard/signin.html": "b108c183dfa7e2da3d88ec79bee79509",
141-
"assets/sample-projects/explore.zip": "b652ea3b4b44a59e756d7510d1722edf",
141+
"assets/sample-projects/explore.zip": "157f5c3e1ddb565a511e5b614ecd9c55",
142142
"assets/sample-projects/explore/A-tribute-page.html": "007699e85177db3d1cd87d0d47440b36",
143143
"assets/sample-projects/explore/adjustable-fireworks.html": "706a0995d00d8ae009b5426cf7ee69be",
144144
"assets/sample-projects/explore/ant_colony.html": "d0885229e57caecc83049b50ee98560c",
@@ -228,7 +228,7 @@
228228
"assets/sample-projects/explore/watermelon-pixel.html": "6f6754e8073436bb823807a10a0446ea",
229229
"assets/sample-projects/explore/webmine.html": "9879458a48c757dc6671d408e940da4d",
230230
"assets/sample-projects/explore/whack-a-mole.html": "827f15c53657350b9c898fa27ecf15ac",
231-
"assets/sample-projects/home-pages.zip": "b0cbf20b828f8213704cb48dcd9975fa",
231+
"assets/sample-projects/home-pages.zip": "0a49fa5627854719811034028d55760d",
232232
"assets/sample-projects/home-pages/album/index.html": "df20e4a479659463ab9d3f6b4ca4dbd1",
233233
"assets/sample-projects/home-pages/assets/brand/bootstrap-logo-white.svg": "2e642df55357162ad28519305c8fd4fe",
234234
"assets/sample-projects/home-pages/assets/brand/bootstrap-logo.svg": "88eef7f3c2bcf988457a0e6d123c3f1d",
@@ -240,7 +240,7 @@
240240
"assets/sample-projects/home-pages/carousel/index.html": "fc5bf7b2d8640a2c393f465294210e7c",
241241
"assets/sample-projects/home-pages/cover/cover.css": "3738586a82dd90263617020e7f1db82e",
242242
"assets/sample-projects/home-pages/cover/index.html": "a0ae1a11224672532b3466df93ce0821",
243-
"assets/sample-projects/HTML5.zip": "72ef1b3be51b24d7d7d9d6cf82c10686",
243+
"assets/sample-projects/HTML5.zip": "f2f9477ef630e9e2d576f768c1c3832b",
244244
"assets/sample-projects/HTML5/index.html": "ca318e370d63b3e083d3bd63052b8252",
245245
"assets/sample-projects/HTML5/script.js": "47de56d88cd6d866c4f77027128c0dd7",
246246
"assets/sample-projects/HTML5/styles.css": "8c798c8b3bba7e4d49dfe99b4deccd47",
@@ -250,7 +250,7 @@
250250
"brackets.config.dist.json": "067654f0936d60f59d5fa493c6b3ed1c",
251251
"brackets.config.staging.json": "53d44a23a939eaaaea05e072c8780584",
252252
"brackets.js": "9750e9869b3d6b224dae5ff36fe5f498",
253-
"cacheManifest.json": "0016a6f007f09e8e16d9b680e15d9277",
253+
"cacheManifest.json": "c6de6af9630562adbf5ab3b12a877873",
254254
"command/CommandManager.js": "ebbc15626600575d2dfe2a97da2993a0",
255255
"command/Commands.js": "d1b78cbe3e6272c06e442d8c3441838c",
256256
"command/DefaultMenus.js": "584a9294b73f2eeb4c15c97186b0e765",
@@ -722,13 +722,13 @@
722722
"LiveDevelopment/BrowserScripts/ServiceWorkerTransportRemote.js": "1e688fc460b0d611612bf1df86120ae1",
723723
"LiveDevelopment/launch.html": "47a38a7da01bc004f4296e1a6b33cc4c",
724724
"LiveDevelopment/LiveDevelopmentUtils.js": "066a8a03706bf755b4764a9ba62f3a5c",
725-
"LiveDevelopment/LiveDevMultiBrowser.js": "48e2c07bc6bd4109b6d9bb9110806e57",
725+
"LiveDevelopment/LiveDevMultiBrowser.js": "2faea073ee0c1c731166409ce885c6a1",
726726
"LiveDevelopment/LiveDevServerManager.js": "2840cc624754b21dc6e3642d8e0ac49d",
727727
"LiveDevelopment/main.js": "6a1905ca861a6f2cf007b6eb931db527",
728728
"LiveDevelopment/main.less": "d5dfa71bbf5d96e53b060d048616a757",
729729
"LiveDevelopment/MultiBrowserImpl/documents/LiveCSSDocument.js": "c729a030f4f6d832903856937e96597f",
730-
"LiveDevelopment/MultiBrowserImpl/documents/LiveDocument.js": "3e2074c02777dd5b2c7405a60f24ed58",
731-
"LiveDevelopment/MultiBrowserImpl/documents/LiveHTMLDocument.js": "8851b2aa19a628d709f1aec73dba3707",
730+
"LiveDevelopment/MultiBrowserImpl/documents/LiveDocument.js": "6dbe82df3aed76369006be1d0eb57311",
731+
"LiveDevelopment/MultiBrowserImpl/documents/LiveHTMLDocument.js": "18d0ddec42944166e1456eca2c160e5f",
732732
"LiveDevelopment/MultiBrowserImpl/language/HTMLInstrumentation.js": "d13cd73eec4be9eb7c7edc24ef526de6",
733733
"LiveDevelopment/MultiBrowserImpl/language/HTMLSimpleDOM.js": "a95185bdc1a3dd6e891808588e39306a",
734734
"LiveDevelopment/MultiBrowserImpl/launchers/Launcher.js": "1817c9a30dd5e0ff9c3323e9601bc49d",
@@ -865,7 +865,7 @@
865865
"nls/ro/lastTranslatedLocale.json": "aa6fbf404bced506c9f938999139db30",
866866
"nls/ro/strings.js": "6f53eb7e3bc0feecc765f6acf6b8ef59",
867867
"nls/root/strings-app.js": "9c3baaf01c4d4194c39cf510bdc06bea",
868-
"nls/root/strings.js": "7e36a145e09f662254be3ff94baa3dd1",
868+
"nls/root/strings.js": "cb8b681d3871935fe891aef55d484a98",
869869
"nls/root/urls.js": "2c5e2a12c3412c1efe22c686aa78bce0",
870870
"nls/ru/expertTranslations.json": "89cf849840b48e07ca9397092df1d15e",
871871
"nls/ru/lastTranslated.json": "dfb3984748b85ed54f5d35f911c6d2ef",

0 commit comments

Comments
 (0)