UI Fixes after Webpack migration.

polonel · polonel · commit b67c915bc0ec · 2017-02-08T21:04:08.000-05:00
diff --git a/src/public/js/app.js b/src/public/js/app.js
@@ -29,6 +29,7 @@ require(['config', 'jquery', 'modules/helpers', 'angular', 'angularjs/main'], fu
     });
 
     require([
+        'underscore',
         'modules/navigation',
         'modules/enjoyhint',
         'uikit',
@@ -41,19 +42,20 @@ require(['config', 'jquery', 'modules/helpers', 'angular', 'angularjs/main'], fu
         'nicescroll',
         'easypiechart'
 
-    ], function(nav, eh) {
+    ], function(_, nav, eh) {
         //Page loading (init)
         require(['pages/pageloader'], function(pl) { pl.init(); });
 
         nav.init();
-        setTimeout(function(){
 
+        var $event = _.debounce(function() {
             helpers.hideLoader(1000);
             helpers.countUpMe();
             helpers.UI.cardShow();
 
             $.event.trigger('$trudesk:ready');
-        }, 500);
-        //eh.init();
+        }, 100);
+
+        $event();
     });
 });
diff --git a/src/public/js/modules/ajaxify.js b/src/public/js/modules/ajaxify.js
@@ -14,14 +14,15 @@
 
 define('modules/ajaxify', [
     'jquery',
+    'underscore',
     'angular',
     'modules/helpers',
     'modules/navigation',
     'pages/pageloader',
     'modules/socket',
     'history'
 
-], function($, angular, helpers, nav, pageLoader, socketClient) {
+], function($, _, angular, helpers, nav, pageLoader, socketClient) {
 
     $(window).on('statechangecomplete', function() {
         //Global
@@ -46,7 +47,11 @@ define('modules/ajaxify', [
         helpers.UI.cardShow();
         helpers.countUpMe();
 
-        $.event.trigger('$trudesk:ready');
+        var event = _.debounce(function() {
+            $.event.trigger('$trudesk:ready');
+        }, 100);
+
+        event();
     });
 
 
diff --git a/src/public/js/modules/helpers.js b/src/public/js/modules/helpers.js
@@ -48,6 +48,8 @@ function($, _, moment, UIkit, CountUp, Waves, Selectize, Snackbar, ROLES) {
         self.UI.matchHeight();
 
         var layout = self.onWindowResize();
+        //Initial Call to Load Layout
+        layout();
         $(window).resize(layout);
     };
 
diff --git a/src/public/js/pages/messages.js b/src/public/js/pages/messages.js
@@ -77,7 +77,10 @@ define('pages/messages', [
                     $messageScrollerNS.doScrollTop($messageScroller.outerHeight() + 5000, 1000);
 
                 //set active
-                $('ul > li[data-conversation-id="' + $convoId + '"]').addClass('active');
+                if ($convoId !== undefined) {
+                    var item = $('ul > li[data-conversation-id="' + $convoId + '"]');
+                    item.addClass('active');
+                }
 
                 //Remove All Chat Boxes
                 if ($('#__page').text().toLowerCase() === 'messages') {
diff --git a/src/public/js/truRequire.js b/src/public/js/truRequire.js
@@ -1,7 +1,8 @@
 //This gets loaded for accessing require from outside Webpack bundle.
 var allMods = {
     jquery: function() { return require('jquery'); },
-    snackbar: function() { return require('snackbar'); }
+    snackbar: function() { return require('snackbar'); },
+    underscore: function() { return require('underscore'); }
 };
 
 module.exports = function (modules, cb) {
diff --git a/src/views/login-otp.hbs b/src/views/login-otp.hbs
@@ -152,7 +152,8 @@
     </style>
 
     <script src="/socket.io/socket.io.js"></script>
-    <script src="/js/vendor/requirejs/requirejs.min.js"></script>
+    <script src="/js/vendor.js"></script>
+    <script src="/js/truRequire.js"></script>
     <script src="/js/trudesk.min.js"></script>
 </head>
 <body>
@@ -230,10 +231,11 @@
 </div>
 
 <script type="text/javascript">
-    $(document).ready(function() {
-        setTimeout(function() {
+    window.truRequire(['jquery'], function(loadedModules) {
+        var $ = loadedModules[0];
+        $(window).on('$trudesk:ready', function() {
             $('#code').focus();
-        }, 250);
+        });
     });
 </script>
 </body>
