Bug 1224437 - Fix state check so that publish will finish normally. r=Ratty a=Ratty
authorFrank-Rainer Grahl <frgrahl@gmx.net>
Mon, 09 May 2016 23:45:47 +0200
changeset 26935 4494632520a40c89f226b44948dddd382b80d72e
parent 26934 07a4595692adc464b3ab3ccbd8f67ca9a1d581dc
child 26936 b0ddb02137a7edf140a908349cc4ee5a7c05ec51
push id1850
push userclokep@gmail.com
push dateWed, 08 Mar 2017 19:29:12 +0000
treeherdercomm-esr52@028df196b2d9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersRatty, Ratty
bugs1224437, 1101100
Bug 1224437 - Fix state check so that publish will finish normally. r=Ratty a=Ratty See Bug 1101100 for changes in nsWebBrowserPersist which broke it here.
editor/ui/composer/content/ComposerCommands.js
--- a/editor/ui/composer/content/ComposerCommands.js
+++ b/editor/ui/composer/content/ComposerCommands.js
@@ -1147,19 +1147,18 @@ var gEditorOutputProgressListener =
           gPersistObj =
           {
             result : aStatus,
             currentState : nsIWebBrowserPersist.PERSIST_STATE_FINISHED
           }
         }
       }
 
-      // STATE_IS_NETWORK signals end of publishing, as does the gPersistObj.currentState
-      if (aStateFlags & nsIWebProgressListener.STATE_IS_NETWORK
-          && gPersistObj.currentState == nsIWebBrowserPersist.PERSIST_STATE_FINISHED)
+      // STATE_IS_NETWORK signals end of publishing
+      if (aStateFlags & nsIWebProgressListener.STATE_IS_NETWORK)
       {
         if (GetScheme(gPublishData.publishUrl) == "file")
         {
           //XXX "file://" hack: We don't get notified about the HTML file, so end progress for it
           // (This covers both "Case 1 and 2" described above)
           gProgressDialog.SetProgressFinished(gPublishData.filename, gPersistObj.result);
         }