Address PR feedback by reducing code changes to core history module.

facebook · Dec 9, 2019 · 6c4e1c4 · 6c4e1c4
1 parent 0558b29
commit 6c4e1c4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 13 deletions.
diff --git a/modules/core/history.js b/modules/core/history.js
@@ -125,17 +125,6 @@ export function coreHistory(context) {
         },
 
 
-        countAIFeaturesAdded: function() {
-            var count = 0; 
-            for (var i = 0; i <= _index; i++) {
-                if (_stack[i].annotation && _stack[i].annotation.type === 'fb_accept_feature') {
-                    count++; 
-                }
-            }
-            return count; 
-        },
-
-
         peekAllAnnotations: function() {
             var result = [];
             for (var i = 0; i <= _index; i++) {

diff --git a/modules/ui/fb_feature_picker.js b/modules/ui/fb_feature_picker.js
@@ -21,8 +21,16 @@ export function uiFbFeaturePicker(context, keybinding) {
         var gpxInUrl = utilStringQs(window.location.hash).gpx;
         if (gpxInUrl) return false;
 
-        var numAiFeatures = context.history().countAIFeaturesAdded(); 
-        return numAiFeatures >= AI_FEATURES_LIMIT_NON_TM_MODE;
+        var aiFeatures = context.history().peekAllAnnotations(); 
+
+        var aiFeatureCount = 0; 
+        for (var i = 0; i <= aiFeatures.length; i++) {
+            if (aiFeatures[i] && aiFeatures[i].type === 'fb_accept_feature') {
+                aiFeatureCount++; 
+            }
+        }
+
+        return aiFeatureCount >= AI_FEATURES_LIMIT_NON_TM_MODE;
     }