Merge pull request #139 from Idrinth/idrinth

not waiting for codacy, since it considers my commits fine and still didn't even start checking the pull request

Author: Idrinth

Diff for: .lgtm

@@ -1,3 +1,3 @@
-pattern = "(?i)^(:shipit:|:\\+1:|LGTM|Approved|Looks\\sGood\\sTo\\sMe)"
+pattern = "(?i)^(:shipit:|:\\+1:|LGTM|Approved|Looks\\s+Good\\s+To\\s+Me|Seems\\s+good|Looks\\s+good)"
 approvals = 1
 self_approval_off = true

Diff for: src/mods/chat.js

@@ -725,16 +725,17 @@ idrinth.chat = {
                     );
         }, 2500 );
         window.setTimeout ( function () {
-            idrinth.core.ajax.run (
-                    'https://dotd.idrinth.de/static/emoticons/data/',
+            idrinth.core.ajax.runHome (
+                    'emoticons/data/',
                     function ( reply ) {
                         idrinth.chat.emotes = JSON.parse ( reply );
                     },
                     function ( reply ) {
                     },
                     function ( reply ) {
                     },
-                    ''
+                    '',
+                    true
                     );
         }, 1 );
     },

Diff for: src/mods/core.js

@@ -6,9 +6,9 @@ idrinth.core = {
         return parent && typeof parent === 'object' && field && parent.hasOwnProperty ( field ) && typeof parent[field] !== 'object' && typeof parent[field] !== 'function';
     },
     ajax: {
-        runHome: function ( url, success, failure, timeout, additionalHeader ) {
-            var homeUrl = 'https://dotd.idrinth.de/' + ( idrinth.settings.isWorldServer ? 'world-' : '' ) + idrinth.platform + ( '/' + url ).replace ( /\/\// );
-            idrinth.core.ajax.run ( homeUrl, success, failure, timeout, additionalHeader )
+        runHome: function ( url, success, failure, timeout, additionalHeader, isStatic ) {
+            var homeUrl = 'https://dotd.idrinth.de/' + isStatic ? 'static/' : ( ( idrinth.settings.isWorldServer ? 'world-' : '' ) + idrinth.platform ) + ( '/' + url ).replace ( /\/\//, '/' );
+            idrinth.core.ajax.run ( homeUrl, success, failure, timeout, additionalHeader );
         },
         active: { },
         run: function ( url, success, failure, timeout, additionalHeader ) {
@@ -23,7 +23,7 @@ idrinth.core = {
                     try {
                         return func ( value );
                     } catch ( e ) {
-                        idrinth.core.log ( e.getMessage () );
+                        idrinth.core.log ( typeof e.getMessage === 'function' ? e.getMessage () : e );
                         return null;
                     }
                 };

Diff for: src/mods/war.js

@@ -2,6 +2,12 @@ idrinth.war = {
     from: null,
     to: null,
     element: null,
+    warTO: null,
+    setTO: function ( ) {
+        if ( !idrinth.war.warTO ) {
+            idrinth.war.warTO = window.setTimeout ( idrinth.war.getData, 1000 );
+        }
+    },
     getData: function () {
         var raids2Join = function () {
             var list = [ ];
@@ -18,12 +24,8 @@ idrinth.war = {
         idrinth.core.ajax.runHome (
                 "war-service/" + raids2Join () + "/" + Date.now () + "/",
                 idrinth.war.updateData,
-                function () {
-                    window.setTimeout ( idrinth.war.getData, 1000 );
-                },
-                function () {
-                    window.setTimeout ( idrinth.war.getData, 2000 );
-                },
+                idrinth.war.setTO,
+                idrinth.war.setTO,
                 idrinth.raids.knowRaids ()
                 );
     },
@@ -178,7 +180,7 @@ idrinth.war = {
             }
         };
         process ( data );
-        window.setTimeout ( idrinth.war.getData, 50000 + Math.random () % 20000 );
+        idrinth.war.setTO ();
     },
     start: function () {
         var build = function ( ) {
@@ -239,7 +241,7 @@ idrinth.war = {
             );
             idrinth.ui.body.appendChild ( idrinth.war.element );
         };
-        window.setTimeout ( idrinth.war.getData, 5000 );
+        idrinth.war.warTO = window.setTimeout ( idrinth.war.getData, 5000 );
         build ();
     }
 };

Diff for: src/stable.js

@@ -88,7 +88,19 @@ var idrinth = {
                     idrinth.settings.newgroundLoad * 1000 );
         }
     },
-    reload: function () {
+    clearTimeout: function ( timeout ) {
+        if ( timeout ) {
+            try {
+                window.clearTimeout ( timeout );
+            } catch ( e ) {
+                idrinth.core.log ( typeof e.getMessage === 'function' ? e.getMessage : e )
+            }
+        }
+    },
+    reload: function ( ) {
+        idrinth.clearTimeout ( idrinth.chat.updateTimeout );
+        idrinth.clearTimeout ( idrinth.war.warTO );
+        idrinth.raids.clearInterval ();
         idrinth.ui.removeElement ( 'idrinth-controls' );
         idrinth.ui.removeElement ( 'idrinth-chat' );
         idrinth.ui.removeElement ( 'idrinth-war' );
@@ -100,7 +112,7 @@ var idrinth = {
         }, 1 );
     },
     platform: '',
-    startInternal: function () {
+    startInternal: function ( ) {
         var startModules = function () {
             idrinth.settings.start ( );
             idrinth.ui.start ( );