Minor code cleanup and moving V4 into same /dist folder, as suggest…

…ed by jsdelivr jsdelivr/jsdelivr#16243
thednp · Feb 9, 2017 · 14aa40c · 14aa40c
1 parent 80908ca
commit 14aa40c
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/dist-v4/bootstrap-native.js → dist/bootstrap-native-v4.js b/dist-v4/bootstrap-native.js → dist/bootstrap-native-v4.js
@@ -208,7 +208,7 @@
       return child[clientHeight] + parseInt( btp ) + parseInt( btb ) + parseInt( mtp ) + parseInt( mbp );
     },
     getMaxHeight = function(parent) { // get collapse trueHeight and border
-      var parentHeight = 0, style, margin;
+      var parentHeight = 0;
       for (var k = 0, ll = parent.children[length]; k < ll; k++) {
         parentHeight += getOuterHeight(parent.children[k]);
       }

diff --git a/dist-v4/bootstrap-native.min.js → dist/bootstrap-native-v4.min.js b/dist-v4/bootstrap-native.min.js → dist/bootstrap-native-v4.min.js
diff --git a/dist/bootstrap-native.js b/dist/bootstrap-native.js
@@ -216,7 +216,7 @@
       return child[clientHeight] + parseInt( btp ) + parseInt( btb ) + parseInt( mtp ) + parseInt( mbp );
     },
     getMaxHeight = function(parent) { // get collapse trueHeight and border
-      var parentHeight = 0, style, margin;
+      var parentHeight = 0;
       for (var k = 0, ll = parent.children[length]; k < ll; k++) {
         parentHeight += getOuterHeight(parent.children[k]);
       }

diff --git a/lib/V3/utils.js b/lib/V3/utils.js
@@ -192,7 +192,7 @@ var globalObject = typeof global !== 'undefined' ? global : this||window,
     return child[clientHeight] + parseInt( btp ) + parseInt( btb ) + parseInt( mtp ) + parseInt( mbp );
   },
   getMaxHeight = function(parent) { // get collapse trueHeight and border
-    var parentHeight = 0, style, margin;
+    var parentHeight = 0;
     for (var k = 0, ll = parent.children[length]; k < ll; k++) {
       parentHeight += getOuterHeight(parent.children[k]);
     }

diff --git a/lib/V4/utils.js b/lib/V4/utils.js
@@ -185,7 +185,7 @@ var globalObject = typeof global !== 'undefined' ? global : this||window,
     return child[clientHeight] + parseInt( btp ) + parseInt( btb ) + parseInt( mtp ) + parseInt( mbp );
   },
   getMaxHeight = function(parent) { // get collapse trueHeight and border
-    var parentHeight = 0, style, margin;
+    var parentHeight = 0;
     for (var k = 0, ll = parent.children[length]; k < ll; k++) {
       parentHeight += getOuterHeight(parent.children[k]);
     }

diff --git a/package.json b/package.json
@@ -6,9 +6,9 @@
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "build": "node build.js > dist/bootstrap-native.js && npm run build-min",
-    "build-v4": "node build-v4.js > dist-v4/bootstrap-native.js && npm run build-v4-min",
+    "build-v4": "node build-v4.js > dist/bootstrap-native-v4.js && npm run build-v4-min",
     "build-min": "node build.js -m > dist/bootstrap-native.min.js",
-    "build-v4-min": "node build-v4.js -m > dist-v4/bootstrap-native.min.js",
+    "build-v4-min": "node build-v4.js -m > dist/bootstrap-native-v4.min.js",
     "watch": "onchange \"lib/*\" -i -- npm run build"
   },
   "repository": {

diff --git a/v4.html b/v4.html
@@ -549,6 +549,6 @@ <h4 id="three">three</h4>
     ================================================== -->
     <!-- Placed at the end of the document so the pages load faster -->
     <script src="https://maxcdn.bootstrapcdn.com/js/ie10-viewport-bug-workaround.js"></script>
-    <script type="text/javascript" src="./dist-v4/bootstrap-native.js"></script>
+    <script type="text/javascript" src="./dist/bootstrap-native-v4.js"></script>
   </body>
 </html>