Browse Source

Changed capitalisation in require statements.

master
fo 10 years ago
parent
commit
d2453b1f1f
2 changed files with 133 additions and 135 deletions
  1. 131
    133
      libs/modules/UI.bundle.js
  2. 2
    2
      modules/UI/UI.js

+ 131
- 133
libs/modules/UI.bundle.js View File

6
 var Prezi = require("./prezi/Prezi.js");
6
 var Prezi = require("./prezi/Prezi.js");
7
 var Etherpad = require("./etherpad/Etherpad.js");
7
 var Etherpad = require("./etherpad/Etherpad.js");
8
 var Chat = require("./side_pannels/chat/Chat.js");
8
 var Chat = require("./side_pannels/chat/Chat.js");
9
-var Toolbar = require("./toolbars/toolbar");
10
-var ToolbarToggler = require("./toolbars/toolbartoggler");
9
+var Toolbar = require("./toolbars/Toolbar");
10
+var ToolbarToggler = require("./toolbars/ToolbarToggler");
11
 var BottomToolbar = require("./toolbars/BottomToolbar");
11
 var BottomToolbar = require("./toolbars/BottomToolbar");
12
 var ContactList = require("./side_pannels/contactlist/ContactList");
12
 var ContactList = require("./side_pannels/contactlist/ContactList");
13
 var Avatar = require("./avatar/Avatar");
13
 var Avatar = require("./avatar/Avatar");
688
 module.exports = UI;
688
 module.exports = UI;
689
 
689
 
690
 
690
 
691
-},{"./audio_levels/AudioLevels.js":2,"./authentication/Authentication":4,"./avatar/Avatar":5,"./etherpad/Etherpad.js":6,"./prezi/Prezi.js":7,"./side_pannels/SidePanelToggler":8,"./side_pannels/chat/Chat.js":9,"./side_pannels/contactlist/ContactList":13,"./side_pannels/settings/Settings":14,"./side_pannels/settings/SettingsMenu":15,"./toolbars/BottomToolbar":16,"./toolbars/toolbar":18,"./toolbars/toolbartoggler":19,"./util/MessageHandler":21,"./util/UIUtil":22,"./videolayout/VideoLayout.js":24,"./welcome_page/RoomnameGenerator":25,"./welcome_page/WelcomePage":26}],2:[function(require,module,exports){
691
+},{"./audio_levels/AudioLevels.js":2,"./authentication/Authentication":4,"./avatar/Avatar":5,"./etherpad/Etherpad.js":6,"./prezi/Prezi.js":7,"./side_pannels/SidePanelToggler":8,"./side_pannels/chat/Chat.js":9,"./side_pannels/contactlist/ContactList":13,"./side_pannels/settings/Settings":14,"./side_pannels/settings/SettingsMenu":15,"./toolbars/BottomToolbar":16,"./toolbars/Toolbar":17,"./toolbars/ToolbarToggler":18,"./util/MessageHandler":20,"./util/UIUtil":21,"./videolayout/VideoLayout.js":23,"./welcome_page/RoomnameGenerator":24,"./welcome_page/WelcomePage":25}],2:[function(require,module,exports){
692
 var CanvasUtil = require("./CanvasUtils");
692
 var CanvasUtil = require("./CanvasUtils");
693
 
693
 
694
 /**
694
 /**
1305
 
1305
 
1306
 
1306
 
1307
 module.exports = Avatar;
1307
 module.exports = Avatar;
1308
-},{"../side_pannels/settings/Settings":14,"../videolayout/VideoLayout":24}],6:[function(require,module,exports){
1308
+},{"../side_pannels/settings/Settings":14,"../videolayout/VideoLayout":23}],6:[function(require,module,exports){
1309
 /* global $, config, dockToolbar,
1309
 /* global $, config, dockToolbar,
1310
    setLargeVideoVisible, Util */
1310
    setLargeVideoVisible, Util */
1311
 
1311
 
1501
 
1501
 
1502
 module.exports = Etherpad;
1502
 module.exports = Etherpad;
1503
 
1503
 
1504
-},{"../prezi/Prezi":7,"../util/UIUtil":22,"../videolayout/VideoLayout":24}],7:[function(require,module,exports){
1504
+},{"../prezi/Prezi":7,"../util/UIUtil":21,"../videolayout/VideoLayout":23}],7:[function(require,module,exports){
1505
 var ToolbarToggler = require("../toolbars/ToolbarToggler");
1505
 var ToolbarToggler = require("../toolbars/ToolbarToggler");
1506
 var UIUtil = require("../util/UIUtil");
1506
 var UIUtil = require("../util/UIUtil");
1507
 var VideoLayout = require("../videolayout/VideoLayout");
1507
 var VideoLayout = require("../videolayout/VideoLayout");
1853
 
1853
 
1854
 module.exports = Prezi;
1854
 module.exports = Prezi;
1855
 
1855
 
1856
-},{"../toolbars/ToolbarToggler":17,"../util/MessageHandler":21,"../util/UIUtil":22,"../videolayout/VideoLayout":24}],8:[function(require,module,exports){
1856
+},{"../toolbars/ToolbarToggler":18,"../util/MessageHandler":20,"../util/UIUtil":21,"../videolayout/VideoLayout":23}],8:[function(require,module,exports){
1857
 var Chat = require("./chat/Chat");
1857
 var Chat = require("./chat/Chat");
1858
 var ContactList = require("./contactlist/ContactList");
1858
 var ContactList = require("./contactlist/ContactList");
1859
 var Settings = require("./settings/Settings");
1859
 var Settings = require("./settings/Settings");
2110
 }(PanelToggler || {}));
2110
 }(PanelToggler || {}));
2111
 
2111
 
2112
 module.exports = PanelToggler;
2112
 module.exports = PanelToggler;
2113
-},{"../toolbars/ToolbarToggler":17,"../util/UIUtil":22,"../videolayout/VideoLayout":24,"./chat/Chat":9,"./contactlist/ContactList":13,"./settings/Settings":14,"./settings/SettingsMenu":15}],9:[function(require,module,exports){
2113
+},{"../toolbars/ToolbarToggler":18,"../util/UIUtil":21,"../videolayout/VideoLayout":23,"./chat/Chat":9,"./contactlist/ContactList":13,"./settings/Settings":14,"./settings/SettingsMenu":15}],9:[function(require,module,exports){
2114
 /* global $, Util, nickname:true, showToolbar */
2114
 /* global $, Util, nickname:true, showToolbar */
2115
 var Replacement = require("./Replacement");
2115
 var Replacement = require("./Replacement");
2116
 var CommandsProcessor = require("./Commands");
2116
 var CommandsProcessor = require("./Commands");
2470
     return my;
2470
     return my;
2471
 }(Chat || {}));
2471
 }(Chat || {}));
2472
 module.exports = Chat;
2472
 module.exports = Chat;
2473
-},{"../../toolbars/ToolbarToggler":17,"../SidePanelToggler":8,"./Commands":10,"./Replacement":11,"./smileys.json":12}],10:[function(require,module,exports){
2473
+},{"../../toolbars/ToolbarToggler":18,"../SidePanelToggler":8,"./Commands":10,"./Replacement":11,"./smileys.json":12}],10:[function(require,module,exports){
2474
 /**
2474
 /**
2475
  * List with supported commands. The keys are the names of the commands and
2475
  * List with supported commands. The keys are the names of the commands and
2476
  * the value is the function that processes the message.
2476
  * the value is the function that processes the message.
3013
 module.exports = BottomToolbar;
3013
 module.exports = BottomToolbar;
3014
 
3014
 
3015
 },{"../side_pannels/SidePanelToggler":8}],17:[function(require,module,exports){
3015
 },{"../side_pannels/SidePanelToggler":8}],17:[function(require,module,exports){
3016
-/* global $, interfaceConfig, Moderator, DesktopStreaming.showDesktopSharingButton */
3017
-
3018
-var toolbarTimeoutObject,
3019
-    toolbarTimeout = interfaceConfig.INITIAL_TOOLBAR_TIMEOUT;
3020
-
3021
-function showDesktopSharingButton() {
3022
-    if (desktopsharing.isDesktopSharingEnabled()) {
3023
-        $('#desktopsharing').css({display: "inline"});
3024
-    } else {
3025
-        $('#desktopsharing').css({display: "none"});
3026
-    }
3027
-}
3028
-
3029
-/**
3030
- * Hides the toolbar.
3031
- */
3032
-function hideToolbar() {
3033
-    var header = $("#header"),
3034
-        bottomToolbar = $("#bottomToolbar");
3035
-    var isToolbarHover = false;
3036
-    header.find('*').each(function () {
3037
-        var id = $(this).attr('id');
3038
-        if ($("#" + id + ":hover").length > 0) {
3039
-            isToolbarHover = true;
3040
-        }
3041
-    });
3042
-    if ($("#bottomToolbar:hover").length > 0) {
3043
-        isToolbarHover = true;
3044
-    }
3045
-
3046
-    clearTimeout(toolbarTimeoutObject);
3047
-    toolbarTimeoutObject = null;
3048
-
3049
-    if (!isToolbarHover) {
3050
-        header.hide("slide", { direction: "up", duration: 300});
3051
-        $('#subject').animate({top: "-=40"}, 300);
3052
-        if ($("#remoteVideos").hasClass("hidden")) {
3053
-            bottomToolbar.hide(
3054
-                "slide", {direction: "right", duration: 300});
3055
-        }
3056
-    }
3057
-    else {
3058
-        toolbarTimeoutObject = setTimeout(hideToolbar, toolbarTimeout);
3059
-    }
3060
-}
3061
-
3062
-var ToolbarToggler = {
3063
-    /**
3064
-     * Shows the main toolbar.
3065
-     */
3066
-    showToolbar: function () {
3067
-        var header = $("#header"),
3068
-            bottomToolbar = $("#bottomToolbar");
3069
-        if (!header.is(':visible') || !bottomToolbar.is(":visible")) {
3070
-            header.show("slide", { direction: "up", duration: 300});
3071
-            $('#subject').animate({top: "+=40"}, 300);
3072
-            if (!bottomToolbar.is(":visible")) {
3073
-                bottomToolbar.show(
3074
-                    "slide", {direction: "right", duration: 300});
3075
-            }
3076
-
3077
-            if (toolbarTimeoutObject) {
3078
-                clearTimeout(toolbarTimeoutObject);
3079
-                toolbarTimeoutObject = null;
3080
-            }
3081
-            toolbarTimeoutObject = setTimeout(hideToolbar, toolbarTimeout);
3082
-            toolbarTimeout = interfaceConfig.TOOLBAR_TIMEOUT;
3083
-        }
3084
-
3085
-        if (xmpp.isModerator())
3086
-        {
3087
-//            TODO: Enable settings functionality.
3088
-//                  Need to uncomment the settings button in index.html.
3089
-//            $('#settingsButton').css({visibility:"visible"});
3090
-        }
3091
-
3092
-        // Show/hide desktop sharing button
3093
-        showDesktopSharingButton();
3094
-    },
3095
-
3096
-
3097
-    /**
3098
-     * Docks/undocks the toolbar.
3099
-     *
3100
-     * @param isDock indicates what operation to perform
3101
-     */
3102
-    dockToolbar: function (isDock) {
3103
-        if (isDock) {
3104
-            // First make sure the toolbar is shown.
3105
-            if (!$('#header').is(':visible')) {
3106
-                this.showToolbar();
3107
-            }
3108
-
3109
-            // Then clear the time out, to dock the toolbar.
3110
-            if (toolbarTimeoutObject) {
3111
-                clearTimeout(toolbarTimeoutObject);
3112
-                toolbarTimeoutObject = null;
3113
-            }
3114
-        }
3115
-        else {
3116
-            if (!$('#header').is(':visible')) {
3117
-                this.showToolbar();
3118
-            }
3119
-            else {
3120
-                toolbarTimeoutObject = setTimeout(hideToolbar, toolbarTimeout);
3121
-            }
3122
-        }
3123
-    },
3124
-
3125
-    showDesktopSharingButton: showDesktopSharingButton
3126
-
3127
-};
3128
-
3129
-module.exports = ToolbarToggler;
3130
-},{}],18:[function(require,module,exports){
3131
 /* global $, buttonClick, config, lockRoom,
3016
 /* global $, buttonClick, config, lockRoom,
3132
    setSharedKey, Util */
3017
    setSharedKey, Util */
3133
 var messageHandler = require("../util/MessageHandler");
3018
 var messageHandler = require("../util/MessageHandler");
3646
 }(Toolbar || {}));
3531
 }(Toolbar || {}));
3647
 
3532
 
3648
 module.exports = Toolbar;
3533
 module.exports = Toolbar;
3649
-},{"../authentication/Authentication":4,"../etherpad/Etherpad":6,"../prezi/Prezi":7,"../side_pannels/SidePanelToggler":8,"../util/MessageHandler":21,"../util/UIUtil":22,"./BottomToolbar":16}],19:[function(require,module,exports){
3650
-module.exports=require(17)
3651
-},{"/Users/boris/jitsi/git/jitsi-meet/modules/UI/toolbars/ToolbarToggler.js":17}],20:[function(require,module,exports){
3534
+},{"../authentication/Authentication":4,"../etherpad/Etherpad":6,"../prezi/Prezi":7,"../side_pannels/SidePanelToggler":8,"../util/MessageHandler":20,"../util/UIUtil":21,"./BottomToolbar":16}],18:[function(require,module,exports){
3535
+/* global $, interfaceConfig, Moderator, DesktopStreaming.showDesktopSharingButton */
3536
+
3537
+var toolbarTimeoutObject,
3538
+    toolbarTimeout = interfaceConfig.INITIAL_TOOLBAR_TIMEOUT;
3539
+
3540
+function showDesktopSharingButton() {
3541
+    if (desktopsharing.isDesktopSharingEnabled()) {
3542
+        $('#desktopsharing').css({display: "inline"});
3543
+    } else {
3544
+        $('#desktopsharing').css({display: "none"});
3545
+    }
3546
+}
3547
+
3548
+/**
3549
+ * Hides the toolbar.
3550
+ */
3551
+function hideToolbar() {
3552
+    var header = $("#header"),
3553
+        bottomToolbar = $("#bottomToolbar");
3554
+    var isToolbarHover = false;
3555
+    header.find('*').each(function () {
3556
+        var id = $(this).attr('id');
3557
+        if ($("#" + id + ":hover").length > 0) {
3558
+            isToolbarHover = true;
3559
+        }
3560
+    });
3561
+    if ($("#bottomToolbar:hover").length > 0) {
3562
+        isToolbarHover = true;
3563
+    }
3564
+
3565
+    clearTimeout(toolbarTimeoutObject);
3566
+    toolbarTimeoutObject = null;
3567
+
3568
+    if (!isToolbarHover) {
3569
+        header.hide("slide", { direction: "up", duration: 300});
3570
+        $('#subject').animate({top: "-=40"}, 300);
3571
+        if ($("#remoteVideos").hasClass("hidden")) {
3572
+            bottomToolbar.hide(
3573
+                "slide", {direction: "right", duration: 300});
3574
+        }
3575
+    }
3576
+    else {
3577
+        toolbarTimeoutObject = setTimeout(hideToolbar, toolbarTimeout);
3578
+    }
3579
+}
3580
+
3581
+var ToolbarToggler = {
3582
+    /**
3583
+     * Shows the main toolbar.
3584
+     */
3585
+    showToolbar: function () {
3586
+        var header = $("#header"),
3587
+            bottomToolbar = $("#bottomToolbar");
3588
+        if (!header.is(':visible') || !bottomToolbar.is(":visible")) {
3589
+            header.show("slide", { direction: "up", duration: 300});
3590
+            $('#subject').animate({top: "+=40"}, 300);
3591
+            if (!bottomToolbar.is(":visible")) {
3592
+                bottomToolbar.show(
3593
+                    "slide", {direction: "right", duration: 300});
3594
+            }
3595
+
3596
+            if (toolbarTimeoutObject) {
3597
+                clearTimeout(toolbarTimeoutObject);
3598
+                toolbarTimeoutObject = null;
3599
+            }
3600
+            toolbarTimeoutObject = setTimeout(hideToolbar, toolbarTimeout);
3601
+            toolbarTimeout = interfaceConfig.TOOLBAR_TIMEOUT;
3602
+        }
3603
+
3604
+        if (xmpp.isModerator())
3605
+        {
3606
+//            TODO: Enable settings functionality.
3607
+//                  Need to uncomment the settings button in index.html.
3608
+//            $('#settingsButton').css({visibility:"visible"});
3609
+        }
3610
+
3611
+        // Show/hide desktop sharing button
3612
+        showDesktopSharingButton();
3613
+    },
3614
+
3615
+
3616
+    /**
3617
+     * Docks/undocks the toolbar.
3618
+     *
3619
+     * @param isDock indicates what operation to perform
3620
+     */
3621
+    dockToolbar: function (isDock) {
3622
+        if (isDock) {
3623
+            // First make sure the toolbar is shown.
3624
+            if (!$('#header').is(':visible')) {
3625
+                this.showToolbar();
3626
+            }
3627
+
3628
+            // Then clear the time out, to dock the toolbar.
3629
+            if (toolbarTimeoutObject) {
3630
+                clearTimeout(toolbarTimeoutObject);
3631
+                toolbarTimeoutObject = null;
3632
+            }
3633
+        }
3634
+        else {
3635
+            if (!$('#header').is(':visible')) {
3636
+                this.showToolbar();
3637
+            }
3638
+            else {
3639
+                toolbarTimeoutObject = setTimeout(hideToolbar, toolbarTimeout);
3640
+            }
3641
+        }
3642
+    },
3643
+
3644
+    showDesktopSharingButton: showDesktopSharingButton
3645
+
3646
+};
3647
+
3648
+module.exports = ToolbarToggler;
3649
+},{}],19:[function(require,module,exports){
3652
 var JitsiPopover = (function () {
3650
 var JitsiPopover = (function () {
3653
     /**
3651
     /**
3654
      * Constructs new JitsiPopover and attaches it to the element
3652
      * Constructs new JitsiPopover and attaches it to the element
3772
 })();
3770
 })();
3773
 
3771
 
3774
 module.exports = JitsiPopover;
3772
 module.exports = JitsiPopover;
3775
-},{}],21:[function(require,module,exports){
3773
+},{}],20:[function(require,module,exports){
3776
 /* global $, jQuery */
3774
 /* global $, jQuery */
3777
 var messageHandler = (function(my) {
3775
 var messageHandler = (function(my) {
3778
 
3776
 
3941
 
3939
 
3942
 
3940
 
3943
 
3941
 
3944
-},{}],22:[function(require,module,exports){
3942
+},{}],21:[function(require,module,exports){
3945
 /**
3943
 /**
3946
  * Created by hristo on 12/22/14.
3944
  * Created by hristo on 12/22/14.
3947
  */
3945
  */
3965
 
3963
 
3966
 
3964
 
3967
 };
3965
 };
3968
-},{"../side_pannels/SidePanelToggler":8}],23:[function(require,module,exports){
3966
+},{"../side_pannels/SidePanelToggler":8}],22:[function(require,module,exports){
3969
 var JitsiPopover = require("../util/JitsiPopover");
3967
 var JitsiPopover = require("../util/JitsiPopover");
3970
 
3968
 
3971
 /**
3969
 /**
4376
 };
4374
 };
4377
 
4375
 
4378
 module.exports = ConnectionIndicator;
4376
 module.exports = ConnectionIndicator;
4379
-},{"../util/JitsiPopover":20}],24:[function(require,module,exports){
4377
+},{"../util/JitsiPopover":19}],23:[function(require,module,exports){
4380
 var AudioLevels = require("../audio_levels/AudioLevels");
4378
 var AudioLevels = require("../audio_levels/AudioLevels");
4381
 var Avatar = require("../avatar/Avatar");
4379
 var Avatar = require("../avatar/Avatar");
4382
 var Chat = require("../side_pannels/chat/Chat");
4380
 var Chat = require("../side_pannels/chat/Chat");
6578
 }(VideoLayout || {}));
6576
 }(VideoLayout || {}));
6579
 
6577
 
6580
 module.exports = VideoLayout;
6578
 module.exports = VideoLayout;
6581
-},{"../audio_levels/AudioLevels":2,"../avatar/Avatar":5,"../etherpad/Etherpad":6,"../prezi/Prezi":7,"../side_pannels/chat/Chat":9,"../side_pannels/contactlist/ContactList":13,"../util/UIUtil":22,"./ConnectionIndicator":23}],25:[function(require,module,exports){
6579
+},{"../audio_levels/AudioLevels":2,"../avatar/Avatar":5,"../etherpad/Etherpad":6,"../prezi/Prezi":7,"../side_pannels/chat/Chat":9,"../side_pannels/contactlist/ContactList":13,"../util/UIUtil":21,"./ConnectionIndicator":22}],24:[function(require,module,exports){
6582
 //var nouns = [
6580
 //var nouns = [
6583
 //];
6581
 //];
6584
 var pluralNouns = [
6582
 var pluralNouns = [
6759
 
6757
 
6760
 module.exports = RoomNameGenerator;
6758
 module.exports = RoomNameGenerator;
6761
 
6759
 
6762
-},{}],26:[function(require,module,exports){
6760
+},{}],25:[function(require,module,exports){
6763
 var animateTimeout, updateTimeout;
6761
 var animateTimeout, updateTimeout;
6764
 
6762
 
6765
 var RoomNameGenerator = require("./RoomnameGenerator");
6763
 var RoomNameGenerator = require("./RoomnameGenerator");
6863
 }
6861
 }
6864
 
6862
 
6865
 module.exports = setupWelcomePage;
6863
 module.exports = setupWelcomePage;
6866
-},{"./RoomnameGenerator":25}]},{},[1])(1)
6864
+},{"./RoomnameGenerator":24}]},{},[1])(1)
6867
 });
6865
 });

+ 2
- 2
modules/UI/UI.js View File

5
 var Prezi = require("./prezi/Prezi.js");
5
 var Prezi = require("./prezi/Prezi.js");
6
 var Etherpad = require("./etherpad/Etherpad.js");
6
 var Etherpad = require("./etherpad/Etherpad.js");
7
 var Chat = require("./side_pannels/chat/Chat.js");
7
 var Chat = require("./side_pannels/chat/Chat.js");
8
-var Toolbar = require("./toolbars/toolbar");
9
-var ToolbarToggler = require("./toolbars/toolbartoggler");
8
+var Toolbar = require("./toolbars/Toolbar");
9
+var ToolbarToggler = require("./toolbars/ToolbarToggler");
10
 var BottomToolbar = require("./toolbars/BottomToolbar");
10
 var BottomToolbar = require("./toolbars/BottomToolbar");
11
 var ContactList = require("./side_pannels/contactlist/ContactList");
11
 var ContactList = require("./side_pannels/contactlist/ContactList");
12
 var Avatar = require("./avatar/Avatar");
12
 var Avatar = require("./avatar/Avatar");

Loading…
Cancel
Save