Merge branch 'dev'

Constantin · Constantin · commit 3242c80ef0e9 · 2014-09-17T18:14:24.000+02:00
diff --git a/bower.json b/bower.json
@@ -1,5 +1,5 @@
 {
   "name": "swipebox",
-  "version": "1.3.0",
+  "version": "1.3.0.1",
   "main": "src/js/jquery.swipebox.js"
 }
diff --git a/grunt/package.json b/grunt/package.json
@@ -1,6 +1,6 @@
 {
   "name": "grunt-swipebox",
-  "version": "1.3.0",
+  "version": "1.3.0.1",
   "description": "A touchable jQuery lightbox",
   "devDependencies": {
     "grunt": "~0.4.2",
diff --git a/scss/swipebox.scss b/scss/swipebox.scss
@@ -1,4 +1,4 @@
-/*! Swipebox v1.2.8 | Constantin Saguin csag.co | MIT License | github.com/brutaldesign/swipebox */
+/*! Swipebox v1.3.0 | Constantin Saguin csag.co | MIT License | github.com/brutaldesign/swipebox */
 
 // Gradient mixin
 @mixin css-gradient($from: #dfdfdf, $to: #f8f8f8) {
diff --git a/src/css/swipebox.css b/src/css/swipebox.css
@@ -1,4 +1,4 @@
-/*! Swipebox v1.2.8 | Constantin Saguin csag.co | MIT License | github.com/brutaldesign/swipebox */
+/*! Swipebox v1.3.0 | Constantin Saguin csag.co | MIT License | github.com/brutaldesign/swipebox */
 html.swipebox-html.swipebox-touch {
   overflow: hidden !important;
 }
diff --git a/src/css/swipebox.min.css b/src/css/swipebox.min.css
diff --git a/src/js/jquery.swipebox.js b/src/js/jquery.swipebox.js
@@ -1,4 +1,4 @@
-/*! Swipebox v1.3.0 | Constantin Saguin csag.co | MIT License | github.com/brutaldesign/swipebox */
+/*! Swipebox v1.3.0.1 | Constantin Saguin csag.co | MIT License | github.com/brutaldesign/swipebox */
 
 ;( function ( window, document, $, undefined ) {
 
@@ -746,7 +746,7 @@
 				
 				}
 
-				if ( youtubeShortUrl || youtubeShortUrl || vimeoUrl ) {
+				if ( youtubeUrl || youtubeShortUrl || vimeoUrl ) {
 
 				} else {
 					iframe = '<iframe width="560" height="315" src="' + url + '" frameborder="0" allowfullscreen></iframe>';
diff --git a/src/js/jquery.swipebox.min.js b/src/js/jquery.swipebox.min.js

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "swipebox",`
`3`		`- "version": "1.3.0",`
	`3`	`+ "version": "1.3.0.1",`
`4`	`4`	`"main": "src/js/jquery.swipebox.js"`
`5`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "grunt-swipebox",`
`3`		`- "version": "1.3.0",`
	`3`	`+ "version": "1.3.0.1",`
`4`	`4`	`"description": "A touchable jQuery lightbox",`
`5`	`5`	`"devDependencies": {`
`6`	`6`	`"grunt": "~0.4.2",`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/! Swipebox v1.2.8 \| Constantin Saguin csag.co \| MIT License \| github.com/brutaldesign/swipebox /`
	`1`	`+/! Swipebox v1.3.0 \| Constantin Saguin csag.co \| MIT License \| github.com/brutaldesign/swipebox /`
`2`	`2`
`3`	`3`	`// Gradient mixin`
`4`	`4`	`@mixin css-gradient($from: #dfdfdf, $to: #f8f8f8) {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/! Swipebox v1.3.0 \| Constantin Saguin csag.co \| MIT License \| github.com/brutaldesign/swipebox /`
	`1`	`+/! Swipebox v1.3.0.1 \| Constantin Saguin csag.co \| MIT License \| github.com/brutaldesign/swipebox /`
`2`	`2`
`3`	`3`	`;( function ( window, document, $, undefined ) {`
`4`	`4`
`@@ -746,7 +746,7 @@`
`746`	`746`
`747`	`747`	`}`
`748`	`748`
`749`		`- if ( youtubeShortUrl \|\| youtubeShortUrl \|\| vimeoUrl ) {`
	`749`	`+ if ( youtubeUrl \|\| youtubeShortUrl \|\| vimeoUrl ) {`
`750`	`750`
`751`	`751`	`} else {`
`752`	`752`	`iframe = '<iframe width="560" height="315" src="' + url + '" frameborder="0" allowfullscreen></iframe>';`