Merge branch 'jb35447' into 'nemo_embedlite_38'

Jb35447 Contains three commits: one cleaning up / fixing orientation listener removal (copy-paste error), moving last known orientation to "member" variable so that scopes work correct, and drop "embed:domcontentloaded" message. We can use "chrome:contentloaded" instead of "embed:domcontentloaded" is needed and yes will be needed. See merge request !17
sailfishos · Jun 30, 2016 · 9beee6e · 9beee6e
2 parents a72513c + da8edb9
commit 9beee6e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 16 deletions.
diff --git a/jscomps/EmbedLiteOrientationChangeHandler.js b/jscomps/EmbedLiteOrientationChangeHandler.js
@@ -53,7 +53,10 @@ EmbedLiteOrientationChangeHandler.prototype = {
   },
 
   onWindowClosed: function(aWindow) {
-    Services.embedlite.chromeEventHandler(aWindow).addEventListener("DOMContentLoaded", this._orientationListeners[aWindow], false);
+    let chromeEventHandler = Services.embedlite.chromeEventHandler(aWindow);
+    if (chromeEventHandler) {
+      chromeEventHandler.removeEventListener("DOMContentLoaded", this._orientationListeners[aWindow], false);
+    }
     delete this._orientationListeners[aWindow];
   },
 

diff --git a/jsscripts/OrientationChangeHandler.jsm b/jsscripts/OrientationChangeHandler.jsm
@@ -28,25 +28,26 @@ OrientationChangeHandler.prototype = {
 
   lastOrientation: "portrait-primary",
   isRegistered: false,
+  orientationChangeSent: false,
 
   handleOrientationChange: function(evt) {
     let that = this;
     let newOrientation = that._targetWindow.screen.mozOrientation;
     let fullSwitch = (newOrientation.split("-")[0] ==
                       that.lastOrientation.split("-")[0]);
-    let changeSent = false;
+    that.orientationChangeSent = false;
     that.lastOrientation = newOrientation;
 
     function sendOrientationChanged() {
-      if (changeSent) {
+      if (that.orientationChangeSent) {
         return;
       }
       try {
         Services.embedlite.sendAsyncMessage(that._winID, "embed:contentOrientationChanged",
                                             JSON.stringify({
-                                                             "orientation": newOrientation
+                                                             "orientation": that.lastOrientation
                                                            }));
-        changeSent = true;
+        that.orientationChangeSent = true;
       } catch (e) {
         dump("EmbedLiteOrientationChangeHandler: Failed to report orientation change " + e + "\n")
       }

diff --git a/jsscripts/embedhelper.js b/jsscripts/embedhelper.js
@@ -536,7 +536,6 @@ EmbedHelper.prototype = {
         if (LoginManagerContent.onContentLoaded) {
           LoginManagerContent.onContentLoaded(aEvent);
         }
-        this._handleDomContentLoaded(aEvent);
         break;
       }
       case "DOMFormHasPassword": {
@@ -572,16 +571,6 @@ EmbedHelper.prototype = {
     return this.contentDocumentIsDisplayed;
   },
 
-  _handleDomContentLoaded: function(aEvent) {
-    let window = aEvent.target.defaultView;
-    if (window) {
-      let winid = Services.embedlite.getIDByWindow(window);
-      try {
-        Services.embedlite.sendAsyncMessage(winid, "embed:domcontentloaded", JSON.stringify({ "rootFrame": window.parent === window }));
-      } catch (e) {}
-    }
-  },
-
   _handleFullScreenChanged: function(aEvent) {
         let window = aEvent.target.defaultView;
         let winid = Services.embedlite.getIDByWindow(window);