Merge branch 'master' of https://github.com/cappslock/responsive-nav.js into cappslock-master

arielsalminen · arielsalminen · commit d372675f4add · 2015-04-09T19:05:18.000+03:00
Conflicts:
	client/dist/responsive-nav.min.js
	responsive-nav.min.js
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "responsive-nav",
-  "version": "1.0.38",
+  "version": "1.0.39",
   "main": [
     "responsive-nav.css",
     "responsive-nav.js"
diff --git a/client/dist/bower/bower.json b/client/dist/bower/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "responsive-nav",
-  "version": "1.0.38",
+  "version": "1.0.39",
   "main": [
     "responsive-nav.css",
     "responsive-nav.js"
diff --git a/client/dist/responsive-nav.js b/client/dist/responsive-nav.js
@@ -1,4 +1,4 @@
-/*! responsive-nav.js 1.0.38
+/*! responsive-nav.js 1.0.39
  * https://github.com/viljamis/responsive-nav.js
  * http://responsive-nav.com
  *
@@ -654,6 +654,10 @@
 
   };
 
-  window.responsiveNav = responsiveNav;
+  if (typeof module !== "undefined" && module.exports) {
+    module.exports = responsiveNav;
+  } else {
+    window.responsiveNav = responsiveNav;
+  }
 
 }(document, window, 0));
diff --git a/client/dist/responsive-nav.min.js b/client/dist/responsive-nav.min.js
diff --git a/client/dist/styles/responsive-nav.css b/client/dist/styles/responsive-nav.css
@@ -1,4 +1,4 @@
-/*! responsive-nav.js 1.0.38 by @viljamis */
+/*! responsive-nav.js 1.0.39 by @viljamis */
 
 .nav-collapse ul {
   margin: 0;
diff --git a/client/src/responsive-nav.js b/client/src/responsive-nav.js
@@ -492,6 +492,10 @@
 
   };
 
-  window.responsiveNav = responsiveNav;
+  if (typeof module !== "undefined" && module.exports) {
+    module.exports = responsiveNav;
+  } else {
+    window.responsiveNav = responsiveNav;
+  }
 
 }(document, window, 0));
diff --git a/package.json b/package.json
@@ -1,8 +1,8 @@
 {
   "name": "responsive-nav",
-  "version": "1.0.38",
+  "version": "1.0.39",
   "description": "Responsive Nav JS plugin",
-  "main": "index.js",
+  "main": "responsive-nav.js",
   "scripts": {
     "test": "grunt test --verbose"
   },
diff --git a/responsive-nav.css b/responsive-nav.css
@@ -1,4 +1,4 @@
-/*! responsive-nav.js 1.0.38 by @viljamis */
+/*! responsive-nav.js 1.0.39 by @viljamis */
 
 .nav-collapse ul {
   margin: 0;
diff --git a/responsive-nav.js b/responsive-nav.js
@@ -1,4 +1,4 @@
-/*! responsive-nav.js 1.0.38
+/*! responsive-nav.js 1.0.39
  * https://github.com/viljamis/responsive-nav.js
  * http://responsive-nav.com
  *
@@ -654,6 +654,10 @@
 
   };
 
-  window.responsiveNav = responsiveNav;
+  if (typeof module !== "undefined" && module.exports) {
+    module.exports = responsiveNav;
+  } else {
+    window.responsiveNav = responsiveNav;
+  }
 
 }(document, window, 0));
diff --git a/responsive-nav.min.js b/responsive-nav.min.js

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "responsive-nav",`
`3`		`- "version": "1.0.38",`
	`3`	`+ "version": "1.0.39",`
`4`	`4`	`"main": [`
`5`	`5`	`"responsive-nav.css",`
`6`	`6`	`"responsive-nav.js"`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/! responsive-nav.js 1.0.38 by @viljamis /`
	`1`	`+/! responsive-nav.js 1.0.39 by @viljamis /`
`2`	`2`
`3`	`3`	`.nav-collapse ul {`
`4`	`4`	`margin: 0;`