Bug 869382: Check for activate/deactivate in retranslation management…

…; r=stas
l20n · Jun 6, 2013 · 460a667 · 460a667
1 parent 335b66f
commit 460a667
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/lib/l20n/retranslation.js b/lib/l20n/retranslation.js
@@ -64,6 +64,9 @@ define(function (require, exports, module) {
         if (get.globals.length != 0) {
           _usage.push(get);
           get.globals.forEach(function(id) {
+            if (!this.globals[i].activate) {
+              return;
+            }
             _counter[id]++;
             this.globals[id].activate();
           }, this);
@@ -73,7 +76,7 @@ define(function (require, exports, module) {
         // because we're just adding new entities to the bind
         bound.callback = get.callback;
         var added = get.globals.filter(function(id) {
-          return bound.globals.indexOf(id) === -1;
+          return this.globals[id].activate && bound.globals.indexOf(id) === -1;
         });
         added.forEach(function(id) {
           _counter[id]++;
@@ -86,14 +89,14 @@ define(function (require, exports, module) {
       } else {
         // see which globals were added and which ones were removed
         var added = get.globals.filter(function(id) {
-          return bound.globals.indexOf(id) === -1;
+          return this.globals[id].activate && bound.globals.indexOf(id) === -1;
         });
         added.forEach(function(id) {
           _counter[id]++;
           this.globals[id].activate();
         }, this);
         var removed = bound.globals.filter(function(id) {
-          return get.globals.indexOf(id) === -1;
+          return this.globals[id].deactivate && get.globals.indexOf(id) === -1;
         });
         removed.forEach(function(id) {
           _counter[id]--;