chore(introspection): clean up workarounds for dart 1.4 and 1.5

Author: juliemr

lib/introspection.dart

@@ -176,31 +176,10 @@ js.JsObject _jsScopeFromProbe(ElementProbe probe) =>
 // Proxies a Dart function that accepts up to 10 parameters.
 js.JsFunction _jsFunction(Function fn) {
   const Object X = __varargSentinel;
-  Function fnCopy = fn;  // workaround a bug.
   return new js.JsFunction.withThis(
       (thisArg, [o1=X, o2=X, o3=X, o4=X, o5=X, o6=X, o7=X, o8=X, o9=X, o10=X]) {
-        // Work around a bug in dart 1.4.0 where the closurized variable, fn,
-        // gets mysteriously replaced with our own closure function leading to a
-        // stack overflow.
-        fn = fnCopy;
-        if (o10 == null && identical(o9, X)) {
-          // Work around another bug in dart 1.4.0.  This bug is not present in
-          // dart 1.5.0-dev.2.0.
-          // In dart 1.4.0, when running in Dartium (not dart2js), if you invoke
-          // a JsFunction from Dart code (either by calling .apply([args]) on it
-          // or by calling .callMethod(jsFuncName, [args]) on a JsObject
-          // containing the JsFunction, regardless of whether you specified the
-          // thisArg keyword parameter, the Dart function is called with the
-          // first argument in the thisArg param causing all the arguments to be
-          // shifted by one.  We can detect this by the fact that o10 is null
-          // but o9 is X (should only happen when o9 got a default value) and
-          // work around it by using thisArg as the first parameter.
-          return __invokeFn(fn, thisArg, o1, o2, o3, o4, o5, o6, o7, o8, o9);
-        } else {
-          return __invokeFn(fn, o1, o2, o3, o4, o5, o6, o7, o8, o9, o10);
-        }
-      }
-      );
+        return __invokeFn(fn, o1, o2, o3, o4, o5, o6, o7, o8, o9, o10);
+      });
 }
 
 

test/introspection_spec.dart

@@ -125,80 +125,77 @@ void main() {
         expect(js.context['ngProbe'].apply([ngtop])).toBeDefined();
       });
 
-      // Issue #1219
-      if (identical(1, 1.0) || !js.context['DART_VERSION'].toString().contains("version: 1.5.")) {
-        describe(r'testability', () {
+      describe(r'testability', () {
 
-          var testability;
+        var testability;
 
-          beforeEach(() {
-            testability = angular['getTestability'].apply([ngtop]);
-          });
-
-          it('should be available from Javascript', () {
-            expect(testability).toBeDefined();
-          });
-
-          it('should expose allowAnimations', () {
-            allowAnimations(allowed) => testability['allowAnimations'].apply([allowed]);
-            expect(allowAnimations(false)).toEqual(true);
-            expect(allowAnimations(false)).toEqual(false);
-            expect(allowAnimations(true)).toEqual(false);
-            expect(allowAnimations(true)).toEqual(true);
-          });
+        beforeEach(() {
+          testability = angular['getTestability'].apply([ngtop]);
+        });
 
-          describe('bindings', () {
-            it('should find exact bindings', () {
-              // exactMatch should fail.
-              var bindingNodes = testability['findBindings'].apply(['introspection', true]);
-              expect(bindingNodes.length).toEqual(0);
-
-              // substring search (default) should succeed.
-              // exactMatch should default to false.
-              bindingNodes = testability['findBindings'].apply(['introspection']);
-              expect(bindingNodes.length).toEqual(1);
-              bindingNodes = testability['findBindings'].apply(['introspection', false]);
-              expect(bindingNodes.length).toEqual(1);
-
-              // and so should exact search with the correct query.
-              bindingNodes = testability['findBindings'].apply(["'introspection FTW'", true]);
-              expect(bindingNodes.length).toEqual(1);
-            });
+        it('should be available from Javascript', () {
+          expect(testability).toBeDefined();
+        });
 
-            _assertBinding(String query) {
-              var bindingNodes = testability['findBindings'].apply([query]);
-              expect(bindingNodes.length).toEqual(1);
-              var node = bindingNodes[0];
-              var probe = js.context['ngProbe'].apply([node]);
-              expect(probe).toBeDefined();
-              var bindings = probe['bindings'];
-              expect(bindings['length']).toEqual(1);
-              expect(bindings[0].contains(query)).toBe(true);
-            }
-
-            it('should find ng-bind bindings', () => _assertBinding('introspection FTW'));
-            it('should find attribute mustache bindings', () => _assertBinding('attrMustache'));
-            it('should find text mustache bindings', () => _assertBinding('textMustache'));
-          });
+        it('should expose allowAnimations', () {
+          allowAnimations(allowed) => testability['allowAnimations'].apply([allowed]);
+          expect(allowAnimations(false)).toEqual(true);
+          expect(allowAnimations(false)).toEqual(false);
+          expect(allowAnimations(true)).toEqual(false);
+          expect(allowAnimations(true)).toEqual(true);
+        });
 
-          it('should find models', () {
+        describe('bindings', () {
+          it('should find exact bindings', () {
             // exactMatch should fail.
-            var modelNodes = testability['findModels'].apply(['my', true]);
-            expect(modelNodes.length).toEqual(0);
+            var bindingNodes = testability['findBindings'].apply(['introspection', true]);
+            expect(bindingNodes.length).toEqual(0);
 
             // substring search (default) should succeed.
-            modelNodes = testability['findModels'].apply(['my']);
-            expect(modelNodes.length).toEqual(1);
-            var divElement = modelNodes[0];
-            expect(divElement is DivElement).toEqual(true);
-            var probe = js.context['ngProbe'].apply([divElement]);
-            expect(probe).toBeDefined();
-            var models = probe['models'];
-            expect(models['length']).toEqual(1);
-            expect(models[0]).toEqual('myModel');
+            // exactMatch should default to false.
+            bindingNodes = testability['findBindings'].apply(['introspection']);
+            expect(bindingNodes.length).toEqual(1);
+            bindingNodes = testability['findBindings'].apply(['introspection', false]);
+            expect(bindingNodes.length).toEqual(1);
+
+            // and so should exact search with the correct query.
+            bindingNodes = testability['findBindings'].apply(["'introspection FTW'", true]);
+            expect(bindingNodes.length).toEqual(1);
           });
+
+          _assertBinding(String query) {
+            var bindingNodes = testability['findBindings'].apply([query]);
+            expect(bindingNodes.length).toEqual(1);
+            var node = bindingNodes[0];
+            var probe = js.context['ngProbe'].apply([node]);
+            expect(probe).toBeDefined();
+            var bindings = probe['bindings'];
+            expect(bindings['length']).toEqual(1);
+            expect(bindings[0].contains(query)).toBe(true);
+          }
+
+          it('should find ng-bind bindings', () => _assertBinding('introspection FTW'));
+          it('should find attribute mustache bindings', () => _assertBinding('attrMustache'));
+          it('should find text mustache bindings', () => _assertBinding('textMustache'));
         });
-      }
+
+        it('should find models', () {
+          // exactMatch should fail.
+          var modelNodes = testability['findModels'].apply(['my', true]);
+          expect(modelNodes.length).toEqual(0);
+
+          // substring search (default) should succeed.
+          modelNodes = testability['findModels'].apply(['my']);
+          expect(modelNodes.length).toEqual(1);
+          var divElement = modelNodes[0];
+          expect(divElement is DivElement).toEqual(true);
+          var probe = js.context['ngProbe'].apply([divElement]);
+          expect(probe).toBeDefined();
+          var models = probe['models'];
+          expect(models['length']).toEqual(1);
+          expect(models[0]).toEqual('myModel');
+        });
+      });
     });
   });
 }