diff --git a/dist-v4/bootstrap-native.js b/dist/bootstrap-native-v4.js similarity index 99% rename from dist-v4/bootstrap-native.js rename to dist/bootstrap-native-v4.js index 4c20f022..44b5ca11 100644 --- a/dist-v4/bootstrap-native.js +++ b/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 b/dist/bootstrap-native-v4.min.js similarity index 100% rename from dist-v4/bootstrap-native.min.js rename to dist/bootstrap-native-v4.min.js diff --git a/dist/bootstrap-native.js b/dist/bootstrap-native.js index dbc800c8..b0e575c9 100644 --- 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 index d0b6e97f..d5fff721 100644 --- 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 index 3a86911f..de06033e 100644 --- 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 index 563227ab..0e666c1f 100644 --- 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 index 1ec3476a..8ea4c295 100644 --- a/v4.html +++ b/v4.html @@ -549,6 +549,6 @@