Merge branch 'development' of github.com:iconfu/svg-inject into devel…

…opment
iconfu · Oct 25, 2018 · 82510e0 · 82510e0
2 parents 4277e71 + 76147b7
commit 82510e0
Showing 1 changed file with 13 additions and 12 deletions.
diff --git a/src/svg-inject.js b/src/svg-inject.js
@@ -251,8 +251,9 @@
         imgElem[__SVGINJECT] = INJECTED;
         removeOnLoadAttribute(imgElem);
         // Invoke afterInject hook if set
-        if (options.afterInject) {
-          options.afterInject(imgElem, injectElem);
+        var afterInject = options.afterInject;
+        if (afterInject) {
+          afterInject(imgElem, injectElem);
         }
       }
     } else {
@@ -411,11 +412,11 @@
       options = mergeOptions(defaultOptions, options);
 
       var run = function(resolve) {
-        var onAllFinish = function() {
-          if (options.onAllFinish) {
-            options.onAllFinish();
-          }
-
+        var allFinish = function() {
+          var onAllFinish = options.onAllFinish;
+          if (onAllFinish) {
+            onAllFinish();
+          }          
           resolve && resolve();
         };
 
@@ -425,21 +426,21 @@
           var injectCount = img[_LENGTH_];
 
           if (injectCount == 0) {
-            onAllFinish();
+            allFinish();
           } else {
-            var onFinish = function() {
+            var finish = function() {
               if (++injectIndex == injectCount) {
-                onAllFinish();
+                allFinish();
               }
             };
 
             for (var i = 0; i < injectCount; i++) {
-              SVGInjectElement(img[i], options, onFinish);
+              SVGInjectElement(img[i], options, finish);
             }
           }
         } else {
           // only one img element
-          SVGInjectElement(img, options, onAllFinish);
+          SVGInjectElement(img, options, allFinish);
         }
       };