Moves some functions from app.js

app.js

@@ -480,10 +480,6 @@ $(document).bind('iceconnectionstatechange.jingle', function (event, sid, sessio
     }
 });
 
-$(document).bind('joined.muc', function (event, jid, info) {
-
-});
-
 $(document).bind('presence.muc', function (event, jid, info, pres) {
 
     //check if the video bridge is available
@@ -750,84 +746,6 @@ function isAudioMuted()
     return true;
 }
 
-/**
- * Returns an array of the video horizontal and vertical indents,
- * so that if fits its parent.
- *
- * @return an array with 2 elements, the horizontal indent and the vertical
- * indent
- */
-function getCameraVideoPosition(videoWidth,
-                                videoHeight,
-                                videoSpaceWidth,
-                                videoSpaceHeight) {
-    // Parent height isn't completely calculated when we position the video in
-    // full screen mode and this is why we use the screen height in this case.
-    // Need to think it further at some point and implement it properly.
-    var isFullScreen = document.fullScreen ||
-            document.mozFullScreen ||
-            document.webkitIsFullScreen;
-    if (isFullScreen)
-        videoSpaceHeight = window.innerHeight;
-
-    var horizontalIndent = (videoSpaceWidth - videoWidth) / 2;
-    var verticalIndent = (videoSpaceHeight - videoHeight) / 2;
-
-    return [horizontalIndent, verticalIndent];
-}
-
-/**
- * Returns an array of the video horizontal and vertical indents.
- * Centers horizontally and top aligns vertically.
- *
- * @return an array with 2 elements, the horizontal indent and the vertical
- * indent
- */
-function getDesktopVideoPosition(videoWidth,
-                                 videoHeight,
-                                 videoSpaceWidth,
-                                 videoSpaceHeight) {
-
-    var horizontalIndent = (videoSpaceWidth - videoWidth) / 2;
-
-    var verticalIndent = 0;// Top aligned
-
-    return [horizontalIndent, verticalIndent];
-}
-
-/**
- * Returns an array of the video dimensions, so that it covers the screen.
- * It leaves no empty areas, but some parts of the video might not be visible.
- *
- * @return an array with 2 elements, the video width and the video height
- */
-function getCameraVideoSize(videoWidth,
-                           videoHeight,
-                           videoSpaceWidth,
-                           videoSpaceHeight) {
-    if (!videoWidth)
-        videoWidth = currentVideoWidth;
-    if (!videoHeight)
-        videoHeight = currentVideoHeight;
-
-    var aspectRatio = videoWidth / videoHeight;
-
-    var availableWidth = Math.max(videoWidth, videoSpaceWidth);
-    var availableHeight = Math.max(videoHeight, videoSpaceHeight);
-
-    if (availableWidth / aspectRatio < videoSpaceHeight) {
-        availableHeight = videoSpaceHeight;
-        availableWidth = availableHeight * aspectRatio;
-    }
-
-    if (availableHeight * aspectRatio < videoSpaceWidth) {
-        availableWidth = videoSpaceWidth;
-        availableHeight = availableWidth / aspectRatio;
-    }
-
-    return [availableWidth, availableHeight];
-}
-
 $(document).ready(function () {
 
     if(APIConnector.isEnabled())
@@ -844,10 +762,6 @@ $(document).ready(function () {
     if (config.chromeExtensionId) {
         initInlineInstalls();
     }
-
-    // By default we use camera
-    getVideoSize = getCameraVideoSize;
-    getVideoPosition = getCameraVideoPosition;
 });
 
 $(window).bind('beforeunload', function () {
@@ -940,62 +854,3 @@ function populateData() {
 function buttonClick(id, classname) {
     $(id).toggleClass(classname); // add the class to the clicked element
 }
-
-
-/**
- * Warning to the user that the conference window is about to be closed.
- */
-function closePageWarning() {
-    /*
-    FIXME: do we need a warning when the focus is a server-side one now ?
-    if (focus !== null)
-        return "You are the owner of this conference call and"
-                + " you are about to end it.";
-    else*/
-    return "You are about to leave this conversation.";
-}
-
-
-$(document).bind('error.jingle',
-    function (event, session, error)
-    {
-        console.error("Jingle error", error);
-    }
-);
-
-$(document).bind('fatalError.jingle',
-    function (event, session, error)
-    {
-        sessionTerminated = true;
-        connection.emuc.doLeave();
-        UI.messageHandler.showError(  "Sorry",
-            "Internal application error[setRemoteDescription]");
-    }
-);
-
-function hangup() {
-    disposeConference();
-    sessionTerminated = true;
-    connection.emuc.doLeave();
-    if(config.enableWelcomePage)
-    {
-        setTimeout(function()
-        {
-            window.localStorage.welcomePageDisabled = false;
-            window.location.pathname = "/";
-        }, 10000);
-
-    }
-
-    UI.messageHandler.openDialog(
-        "Session Terminated",
-        "You hung up the call",
-        true,
-        { "Join again": true },
-        function(event, value, message, formVals)
-        {
-            window.location.reload();
-            return false;
-        }
-    );
-}

libs/modules/UI.bundle.js

@@ -2982,6 +2982,33 @@ var buttonHandlers =
     }
 };
 
+function hangup() {
+    disposeConference();
+    sessionTerminated = true;
+    connection.emuc.doLeave();
+    if(config.enableWelcomePage)
+    {
+        setTimeout(function()
+        {
+            window.localStorage.welcomePageDisabled = false;
+            window.location.pathname = "/";
+        }, 10000);
+
+    }
+
+    UI.messageHandler.openDialog(
+        "Session Terminated",
+        "You hung up the call",
+        true,
+        { "Join again": true },
+        function(event, value, message, formVals)
+        {
+            window.location.reload();
+            return false;
+        }
+    );
+}
+
 /**
  * Starts or stops the recording for the conference.
  */
@@ -4153,8 +4180,91 @@ var largeVideoState = {
     newSrc: ''
 };
 
+// By default we use camera
+var getVideoSize = getCameraVideoSize;
+var getVideoPosition = getCameraVideoPosition;
+
 var defaultLocalDisplayName = "Me";
 
+/**
+ * Returns an array of the video horizontal and vertical indents,
+ * so that if fits its parent.
+ *
+ * @return an array with 2 elements, the horizontal indent and the vertical
+ * indent
+ */
+function getCameraVideoPosition(videoWidth,
+                                videoHeight,
+                                videoSpaceWidth,
+                                videoSpaceHeight) {
+    // Parent height isn't completely calculated when we position the video in
+    // full screen mode and this is why we use the screen height in this case.
+    // Need to think it further at some point and implement it properly.
+    var isFullScreen = document.fullScreen ||
+        document.mozFullScreen ||
+        document.webkitIsFullScreen;
+    if (isFullScreen)
+        videoSpaceHeight = window.innerHeight;
+
+    var horizontalIndent = (videoSpaceWidth - videoWidth) / 2;
+    var verticalIndent = (videoSpaceHeight - videoHeight) / 2;
+
+    return [horizontalIndent, verticalIndent];
+}
+
+/**
+ * Returns an array of the video horizontal and vertical indents.
+ * Centers horizontally and top aligns vertically.
+ *
+ * @return an array with 2 elements, the horizontal indent and the vertical
+ * indent
+ */
+function getDesktopVideoPosition(videoWidth,
+                                 videoHeight,
+                                 videoSpaceWidth,
+                                 videoSpaceHeight) {
+
+    var horizontalIndent = (videoSpaceWidth - videoWidth) / 2;
+
+    var verticalIndent = 0;// Top aligned
+
+    return [horizontalIndent, verticalIndent];
+}
+
+
+/**
+ * Returns an array of the video dimensions, so that it covers the screen.
+ * It leaves no empty areas, but some parts of the video might not be visible.
+ *
+ * @return an array with 2 elements, the video width and the video height
+ */
+function getCameraVideoSize(videoWidth,
+                            videoHeight,
+                            videoSpaceWidth,
+                            videoSpaceHeight) {
+    if (!videoWidth)
+        videoWidth = currentVideoWidth;
+    if (!videoHeight)
+        videoHeight = currentVideoHeight;
+
+    var aspectRatio = videoWidth / videoHeight;
+
+    var availableWidth = Math.max(videoWidth, videoSpaceWidth);
+    var availableHeight = Math.max(videoHeight, videoSpaceHeight);
+
+    if (availableWidth / aspectRatio < videoSpaceHeight) {
+        availableHeight = videoSpaceHeight;
+        availableWidth = availableHeight * aspectRatio;
+    }
+
+    if (availableHeight * aspectRatio < videoSpaceWidth) {
+        availableWidth = videoSpaceWidth;
+        availableHeight = availableWidth / aspectRatio;
+    }
+
+    return [availableWidth, availableHeight];
+}
+
 /**
  * Sets the display name for the given video span id.
  */

libs/strophe/strophe.jingle.session.js

@@ -163,7 +163,7 @@ JingleSession.prototype.accept = function () {
                         reason: $(stanza).find('error :first')[0].tagName
                     }:{};
                     error.source = 'answer';
-                    $(document).trigger('error.jingle', [self.sid, error]);
+                    JingleSession.onJingleError(self.sid, error);
                 },
                 10000);
         },
@@ -252,7 +252,7 @@ JingleSession.prototype.sendIceCandidate = function (candidate) {
                             reason: $(stanza).find('error :first')[0].tagName,
                         }:{};
                         error.source = 'offer';
-                        $(document).trigger('error.jingle', [self.sid, error]);
+                        JingleSession.onJingleError(self.sid, error);
                     },
                     10000);
             }
@@ -317,7 +317,7 @@ JingleSession.prototype.sendIceCandidates = function (candidates) {
                 reason: $(stanza).find('error :first')[0].tagName,
             }:{};
             error.source = 'transportinfo';
-            $(document).trigger('error.jingle', [this.sid, error]);
+            JingleSession.onJingleError(this.sid, error);
         },
         10000);
 };
@@ -363,7 +363,7 @@ JingleSession.prototype.createdOffer = function (sdp) {
                     reason: $(stanza).find('error :first')[0].tagName,
                 }:{};
                 error.source = 'offer';
-                $(document).trigger('error.jingle', [self.sid, error]);
+                JingleSession.onJingleError(self.sid, error);
             },
             10000);
     }
@@ -433,7 +433,7 @@ JingleSession.prototype.setRemoteDescription = function (elem, desctype) {
         },
         function (e) {
             console.error('setRemoteDescription error', e);
-            $(document).trigger('fatalError.jingle', [self, e]);
+            JingleSession.onJingleFatalError(self, e);
         }
     );
 };
@@ -600,7 +600,7 @@ JingleSession.prototype.createdAnswer = function (sdp, provisional) {
                             reason: $(stanza).find('error :first')[0].tagName,
                         }:{};
                         error.source = 'answer';
-                        $(document).trigger('error.jingle', [self.sid, error]);
+                        JingleSession.onJingleError(self.sid, error);
                     },
                     10000);
     }
@@ -1180,3 +1180,15 @@ JingleSession.prototype.getStats = function (interval) {
     return this.statsinterval;
 };
 
+JingleSession.onJingleError = function (session, error)
+{
+    console.error("Jingle error", error);
+}
+
+JingleSession.onJingleFatalError = function (session, error)
+{
+    sessionTerminated = true;
+    connection.emuc.doLeave();
+    UI.messageHandler.showError(  "Sorry",
+        "Internal application error[setRemoteDescription]");
+}

modules/UI/toolbars/Toolbar.js

@@ -58,6 +58,33 @@ var buttonHandlers =
     }
 };
 
+function hangup() {
+    disposeConference();
+    sessionTerminated = true;
+    connection.emuc.doLeave();
+    if(config.enableWelcomePage)
+    {
+        setTimeout(function()
+        {
+            window.localStorage.welcomePageDisabled = false;
+            window.location.pathname = "/";
+        }, 10000);
+
+    }
+
+    UI.messageHandler.openDialog(
+        "Session Terminated",
+        "You hung up the call",
+        true,
+        { "Join again": true },
+        function(event, value, message, formVals)
+        {
+            window.location.reload();
+            return false;
+        }
+    );
+}
+
 /**
  * Starts or stops the recording for the conference.
  */

modules/UI/videolayout/VideoLayout.js

@@ -16,8 +16,91 @@ var largeVideoState = {
     newSrc: ''
 };
 
+// By default we use camera
+var getVideoSize = getCameraVideoSize;
+var getVideoPosition = getCameraVideoPosition;
+
 var defaultLocalDisplayName = "Me";
 
+/**
+ * Returns an array of the video horizontal and vertical indents,
+ * so that if fits its parent.
+ *
+ * @return an array with 2 elements, the horizontal indent and the vertical
+ * indent
+ */
+function getCameraVideoPosition(videoWidth,
+                                videoHeight,
+                                videoSpaceWidth,
+                                videoSpaceHeight) {
+    // Parent height isn't completely calculated when we position the video in
+    // full screen mode and this is why we use the screen height in this case.
+    // Need to think it further at some point and implement it properly.
+    var isFullScreen = document.fullScreen ||
+        document.mozFullScreen ||
+        document.webkitIsFullScreen;
+    if (isFullScreen)
+        videoSpaceHeight = window.innerHeight;
+
+    var horizontalIndent = (videoSpaceWidth - videoWidth) / 2;
+    var verticalIndent = (videoSpaceHeight - videoHeight) / 2;
+
+    return [horizontalIndent, verticalIndent];
+}
+
+/**
+ * Returns an array of the video horizontal and vertical indents.
+ * Centers horizontally and top aligns vertically.
+ *
+ * @return an array with 2 elements, the horizontal indent and the vertical
+ * indent
+ */
+function getDesktopVideoPosition(videoWidth,
+                                 videoHeight,
+                                 videoSpaceWidth,
+                                 videoSpaceHeight) {
+
+    var horizontalIndent = (videoSpaceWidth - videoWidth) / 2;
+
+    var verticalIndent = 0;// Top aligned
+
+    return [horizontalIndent, verticalIndent];
+}
+
+
+/**
+ * Returns an array of the video dimensions, so that it covers the screen.
+ * It leaves no empty areas, but some parts of the video might not be visible.
+ *
+ * @return an array with 2 elements, the video width and the video height
+ */
+function getCameraVideoSize(videoWidth,
+                            videoHeight,
+                            videoSpaceWidth,
+                            videoSpaceHeight) {
+    if (!videoWidth)
+        videoWidth = currentVideoWidth;
+    if (!videoHeight)
+        videoHeight = currentVideoHeight;
+
+    var aspectRatio = videoWidth / videoHeight;
+
+    var availableWidth = Math.max(videoWidth, videoSpaceWidth);
+    var availableHeight = Math.max(videoHeight, videoSpaceHeight);
+
+    if (availableWidth / aspectRatio < videoSpaceHeight) {
+        availableHeight = videoSpaceHeight;
+        availableWidth = availableHeight * aspectRatio;
+    }
+
+    if (availableHeight * aspectRatio < videoSpaceWidth) {
+        availableWidth = videoSpaceWidth;
+        availableHeight = availableWidth / aspectRatio;
+    }
+
+    return [availableWidth, availableHeight];
+}
+
 /**
  * Sets the display name for the given video span id.
  */