@@ -253,13 +254,16 @@
-
-
+
+
+
+
+
diff --git a/prezi.js b/prezi.js
index e3f37376e..b0dbf0f9a 100644
--- a/prezi.js
+++ b/prezi.js
@@ -22,7 +22,7 @@ var Prezi = (function (my) {
VideoLayout.setLargeVideoVisible(false);
$('#presentation>iframe').fadeIn(300, function() {
$('#presentation>iframe').css({opacity:'1'});
- Toolbar.dockToolbar(true);
+ ToolbarToggler.dockToolbar(true);
});
});
}
@@ -33,7 +33,7 @@ var Prezi = (function (my) {
$('#reloadPresentation').css({display:'none'});
$('#largeVideo').fadeIn(300, function() {
VideoLayout.setLargeVideoVisible(true);
- Toolbar.dockToolbar(false);
+ ToolbarToggler.dockToolbar(false);
});
});
}
diff --git a/toolbar.js b/toolbar.js
index 6f7f8aa4b..fc419bfce 100644
--- a/toolbar.js
+++ b/toolbar.js
@@ -1,6 +1,4 @@
var Toolbar = (function (my) {
- var INITIAL_TOOLBAR_TIMEOUT = 20000;
- var TOOLBAR_TIMEOUT = INITIAL_TOOLBAR_TIMEOUT;
/**
* Opens the lock room dialog.
@@ -199,61 +197,6 @@ var Toolbar = (function (my) {
}
}
};
-
- /**
- * Shows the main toolbar.
- */
- my.showToolbar = function() {
- if (!$('#header').is(':visible')) {
- $('#header').show("slide", { direction: "up", duration: 300});
- $('#subject').animate({top: "+=40"}, 300);
-
- if (toolbarTimeout) {
- clearTimeout(toolbarTimeout);
- toolbarTimeout = null;
- }
- toolbarTimeout = setTimeout(hideToolbar, TOOLBAR_TIMEOUT);
- TOOLBAR_TIMEOUT = 4000;
- }
-
- if (focus != null)
- {
-// TODO: Enable settings functionality. Need to uncomment the settings button in index.html.
-// $('#settingsButton').css({visibility:"visible"});
- }
-
- // Show/hide desktop sharing button
- showDesktopSharingButton();
- };
-
- /**
- * Docks/undocks the toolbar.
- *
- * @param isDock indicates what operation to perform
- */
- my.dockToolbar = function(isDock) {
- if (isDock) {
- // First make sure the toolbar is shown.
- if (!$('#header').is(':visible')) {
- Toolbar.showToolbar();
- }
-
- // Then clear the time out, to dock the toolbar.
- if (toolbarTimeout) {
- clearTimeout(toolbarTimeout);
- toolbarTimeout = null;
- }
- }
- else {
- if (!$('#header').is(':visible')) {
- Toolbar.showToolbar();
- }
- else {
- toolbarTimeout = setTimeout(hideToolbar, TOOLBAR_TIMEOUT);
- }
- }
- };
-
/**
* Updates the lock button state.
*/
@@ -261,30 +204,6 @@ var Toolbar = (function (my) {
buttonClick("#lockIcon", "icon-security icon-security-locked");
};
- /**
- * Hides the toolbar.
- */
- var hideToolbar = function () {
- var isToolbarHover = false;
- $('#header').find('*').each(function () {
- var id = $(this).attr('id');
- if ($("#" + id + ":hover").length > 0) {
- isToolbarHover = true;
- }
- });
-
- clearTimeout(toolbarTimeout);
- toolbarTimeout = null;
-
- if (!isToolbarHover) {
- $('#header').hide("slide", { direction: "up", duration: 300});
- $('#subject').animate({top: "-=40"}, 300);
- }
- else {
- toolbarTimeout = setTimeout(hideToolbar, TOOLBAR_TIMEOUT);
- }
- };
-
// Shows or hides the 'recording' button.
my.showRecordingButton = function (show) {
if (!config.enableRecording) {
diff --git a/toolbar_toggler.js b/toolbar_toggler.js
new file mode 100644
index 000000000..a17bbc9a8
--- /dev/null
+++ b/toolbar_toggler.js
@@ -0,0 +1,100 @@
+var ToolbarToggler = (function(my) {
+ var INITIAL_TOOLBAR_TIMEOUT = 20000;
+ var TOOLBAR_TIMEOUT = INITIAL_TOOLBAR_TIMEOUT;
+ var toolbarTimeout;
+
+ /**
+ * Shows the main toolbar.
+ */
+ my.showToolbar = function() {
+ var header = $("#header"),
+ bottomToolbar = $("#bottomToolbar");
+ if (!header.is(':visible') || !bottomToolbar.is(":visible")) {
+ header.show("slide", { direction: "up", duration: 300});
+ $('#subject').animate({top: "+=40"}, 300);
+ if(!bottomToolbar.is(":visible")) {
+ bottomToolbar.show("slide", {direction: "right",cduration: 300});
+ }
+
+ if (toolbarTimeout) {
+ clearTimeout(toolbarTimeout);
+ toolbarTimeout = null;
+ }
+ toolbarTimeout = setTimeout(hideToolbar, TOOLBAR_TIMEOUT);
+ TOOLBAR_TIMEOUT = 4000;
+ }
+
+ if (focus != null)
+ {
+// TODO: Enable settings functionality. Need to uncomment the settings button in index.html.
+// $('#settingsButton').css({visibility:"visible"});
+ }
+
+ // Show/hide desktop sharing button
+ showDesktopSharingButton();
+ };
+
+ /**
+ * Hides the toolbar.
+ */
+ var hideToolbar = function () {
+ var header = $("#header"),
+ bottomToolbar = $("#bottomToolbar");
+ var isToolbarHover = false;
+ header.find('*').each(function () {
+ var id = $(this).attr('id');
+ if ($("#" + id + ":hover").length > 0) {
+ isToolbarHover = true;
+ }
+ });
+ if($("#bottomToolbar:hover").length > 0) {
+ isToolbarHover = true;
+ }
+
+ clearTimeout(toolbarTimeout);
+ toolbarTimeout = null;
+
+ if (!isToolbarHover) {
+ header.hide("slide", { direction: "up", duration: 300});
+ $('#subject').animate({top: "-=40"}, 300);
+ if(!$("#remoteVideos").is(":visible")) {
+ bottomToolbar.hide("slide", {direction: "right", cduration: 300});
+ }
+ }
+ else {
+ toolbarTimeout = setTimeout(hideToolbar, TOOLBAR_TIMEOUT);
+ }
+ };
+
+
+ /**
+ * Docks/undocks the toolbar.
+ *
+ * @param isDock indicates what operation to perform
+ */
+ my.dockToolbar = function(isDock) {
+ if (isDock) {
+ // First make sure the toolbar is shown.
+ if (!$('#header').is(':visible')) {
+ ToolbarToggler.showToolbar();
+ }
+
+ // Then clear the time out, to dock the toolbar.
+ if (toolbarTimeout) {
+ clearTimeout(toolbarTimeout);
+ toolbarTimeout = null;
+ }
+ }
+ else {
+ if (!$('#header').is(':visible')) {
+ ToolbarToggler.showToolbar();
+ }
+ else {
+ toolbarTimeout = setTimeout(hideToolbar, TOOLBAR_TIMEOUT);
+ }
+ }
+ };
+
+
+ return my;
+}(ToolbarToggler || {}));
\ No newline at end of file