ngannotate-rails 0.14.0.1 → 0.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76f18064b3f05f1095ce98f771f09bfe9f84681f
-  data.tar.gz: 6ff5ced0258a5811c01e4e224083a30181bf4b25
+  metadata.gz: 87cb7921c3a730cf709747038bb4f9371bf9f88c
+  data.tar.gz: 6aa0c2d47066c286f58e568a5468c49cb8fc297a
 SHA512:
-  metadata.gz: eb4d157bd943ec7c58900849d35be2a8c83bc96aaef4911412907d84305ca7c3a7d457fd049a1504a7bac4b8d08736d3b1c92b0d8b1860694e0df59feab0088f
-  data.tar.gz: 17ef84bb1a3b0c91d63f46c0e71fb7a0caf9aea137ed047c5ec624ee89e530a5230bc2448fa4c86ec383fa01e0cd7c71b2d1b410173169ac18a3199fa8df4e5c
+  metadata.gz: 2e28bf4381923f177bfaf0df50a14092571acbfd4927570f21df0faf128f84c4ffd46a0c3d829d4ae6fdbd43e13c3f6578960bf7d0f1f9b3e3651052b2706939
+  data.tar.gz: 7ede4c18256cbd11f7a2f212402a3de4e62b5185b0113bb8b00c0199830988775ca60830419669516d8133f33680fb8d435079be476e792cdef3bfa482888f9c

data/lib/ngannotate/rails/version.rb

@@ -1,5 +1,5 @@
 module Ngannotate
   module Rails
-    VERSION = "0.14.0.1"
+    VERSION = "0.14.1"
   end
 end

data/vendor/ngannotate.js

@@ -2970,7 +2970,7 @@ function matchDirectiveReturnObject(node) {
 }
 
 function limit(name, node) {
-    if (node) {
+    if (node && !node.$limitToMethodName) {
         node.$limitToMethodName = name;
     }
     return node;
@@ -3428,7 +3428,7 @@ function judgeSuspects(ctx) {
         var jumped = jumpOverIife(target);
         var jumpedAndFollowed = followReference(jumped) || jumped;
 
-        if (target.$limitToMethodName && findOuterMethodName(target) !== target.$limitToMethodName) {
+        if (target.$limitToMethodName && target.$limitToMethodName !== "*never*" && findOuterMethodName(target) !== target.$limitToMethodName) {
             return null;
         }
 
@@ -3999,7 +3999,6 @@ window.annotate = function ngAnnotate(src, options) {
 "use strict";
 
 var is = require("simple-is");
-var fmt = require("simple-fmt");
 
 module.exports = {
     inspectComments: inspectComments,
@@ -4045,15 +4044,18 @@ function addSuspect(target, ctx) {
         addObjectExpression(target.declarations[0].init, ctx);
     } else if (target.type === "Property") {
         // {/*@ngInject*/ justthisone: function(a), ..}
+        target.value.$limitToMethodName = "*never*";
         ctx.addModuleContextIndependentSuspect(target.value, ctx);
     } else {
         // /*@ngInject*/ function(a) {}
+        target.$limitToMethodName = "*never*";
         ctx.addModuleContextIndependentSuspect(target, ctx);
     }
 }
 
 function addObjectExpression(node, ctx) {
     nestedObjectValues(node).forEach(function(n) {
+        n.$limitToMethodName = "*never*";
         ctx.addModuleContextIndependentSuspect(n, ctx);
     });
 }
@@ -4073,7 +4075,7 @@ function nestedObjectValues(node, res) {
     return res;
 }
 
-},{"simple-fmt":25,"simple-is":26}],17:[function(require,module,exports){
+},{"simple-is":26}],17:[function(require,module,exports){
 // scope.js
 // MIT licensed, see LICENSE file
 // Copyright (c) 2013-2014 Olov Lassus <olov.lassus@gmail.com>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ngannotate-rails
 version: !ruby/object:Gem::Version
-  version: 0.14.0.1
+  version: 0.14.1
 platform: ruby
 authors:
 - Kari Ikonen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-03 00:00:00.000000000 Z
+date: 2014-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails