Development (#36)

fix: 
* change the way alarm is handled (using observer instead of event)
* radar not working for alliance (in some scenarios radar was not displaying any data)

Author: tomaski

modules/RepConvGRC.js

@@ -530,6 +530,8 @@ function _RepConvGRC() {
                             'class' : 'button_new square',
                             'style' : 'width:26px; float: left;'
                         })
+                        .data('ally_id', _ally)
+                        .data('ally_name', _ally_name)
                         .html($('<img/>',{src:RepConv.Const.staticImg+'/stats.png'}))
                         .mousePopup(new MousePopup(RepConvTool.GetLabel('STATS.ALLY')))
             if ("https:" == window.location.protocol && (RepConv.active.statsGRCL != 'potusek')) {
@@ -540,7 +542,7 @@ function _RepConvGRC() {
             } else {
                $(_link)
                    .click(function() {
-                       showStats('alliance', $(this).attr('ally_id'), $(this).attr('ally_name'));
+                       showStats('alliance', $(this).data('ally_id'), $(this).data('ally_name'));
                    })
             }
             RCGP.getJQElement().find($('#alliance_points')).next()
@@ -560,12 +562,11 @@ function _RepConvGRC() {
                             'style':'width: 23px; height: 23px; float: left;',
                             'class': 'grcrt radar'
                         })
+                        .data('ally_id', _ally)
+                        .data('ally_name', _ally_name)
                         .mousePopup(new MousePopup(RepConvTool.GetLabel('RADAR.TOWNFINDER')))
                         .click(function() {
-                            GRCRT_Radar.windowOpen({alliance:{'id':_ally,'name':_ally_name}})
-                            //RepConvRadar.setCurrentTown(),
-                            //RepConvRadar.setAlly(_ally, _ally_name);
-                            GRCRT_Radar.windowOpen();
+                            GRCRT_Radar.windowOpen({alliance:{'id':$(this).data('ally_id'),'name':$(this).data('ally_name')}})
                         })
                     );
         }
@@ -3452,6 +3453,26 @@ function _RepConvGRC() {
     RepConv.wndArray.push(_IdS);
     RepConv.wndArray.push('grcrt_stats');
     RepConv.wndArray.push('grcrt_analysis');
+    function addAttackObserver(){
+        if($('div.activity.attack_indicator').length == 0){
+            setTimeout(function(){
+                addAttackObserver();
+            },100)
+        } else {
+            var MutationObserver = window.MutationObserver || window.WebKitMutationObserver;                
+            var observer_attack = new MutationObserver(function(mutations) {
+                    mutations.forEach(function(mutation) {
+                        if($('div.activity.attack_indicator').hasClass('active')){
+                            attackIncoming(parseInt($('div.activity.attack_indicator div.count').html()))
+                        } else {
+                            attackIncoming(0)
+                        }
+                    });
+                });
+            observer_attack.observe(document.querySelector('div.activity.attack_indicator div.count'), { attributes: true, childList: true, characterData: true });
+        }
+
+    }
     this.init = function(){
         "use strict";
         try{
@@ -3494,6 +3515,7 @@ function _RepConvGRC() {
         town_groups_list_chg();
         // activity_commands_list();
         construction_queue_chg();
+        addAttackObserver();
     }
     // -- okienka
     function _grcrtWindowStats(){