jquery-colorbox-rails 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79930c768e466651d77e00307e60609c41fddd75
-  data.tar.gz: aaf3cfe530c55ed42500a114b911ac98f40496d9
+  metadata.gz: 8b1cbb113169ded1c863bd449b1a257e4c2c43c9
+  data.tar.gz: a88d24971a9dc0a5c90ac402ef318e55958bd252
 SHA512:
-  metadata.gz: 02cf81354ce9f02d19416bf258ed0ed6372acd3cb0bdcd6b0fed85f289a4844e65d978a704292011e2da8f2f54b71447e2b63f675230c072de7b95f0714d634d
-  data.tar.gz: 7cb7f7d4e676cf3dd491081efaa09cc33f36467ce6da7d7bf9f4ccf9f433b38f56a75656ab0eaf0f976e3da24749de6e07f5d471757b8041ec4b66d21fb34daf
+  metadata.gz: 3ecd0516eef25ae9101e3ef1d35f0740bbc5ed8ce154497c218eb921f85b92a84f6b46c29be037230dd784c00061a89defe47b07e374a59794c6bd0033e569f8
+  data.tar.gz: 0f16084911f78e4992fbd2e4b3cb5e13878e8aa0b76100027db22e267dd11e39dbeb7ba9a45cddcf62bda0bdfbef69d7a8f8e90bffc0d5e5c98cd4fc499e3000

data/README.md

@@ -2,7 +2,7 @@
 
 jquery-colorbox-rails integrates [jquery.colorbox](https://github.com/jackmoore/colorbox) with rails 3.1+ asset pipeline.
 
-Integrated colorbox version: <b id="colorbox-version">1.4.24</b>
+Integrated colorbox version: <b id="colorbox-version">1.4.26</b>
 
 ### Installation
 

data/Rakefile

@@ -9,6 +9,7 @@ task :update do
 	[js_dir, css_dir, img_dir].each do |dir|
 		FileUtils.rm_r(dir)
 		FileUtils.mkdir(dir)
+		FileUtils.touch(File.join(dir, '.gitkeep'))
 	end
 
 	puts 'Updating source files...'

data/lib/jquery-colorbox-rails/version.rb

@@ -1,3 +1,3 @@
 module JqueryColorboxRails
-  VERSION = "0.0.7"
-end
+  VERSION = "0.0.8"
+end

data/vendor/assets/javascripts/jquery.colorbox-et.js

@@ -0,0 +1,15 @@
+/*
+	jQuery Colorbox language configuration
+	language: Estonian (et)
+	translated by: keevitaja
+*/
+jQuery.extend(jQuery.colorbox.settings, {
+	current: "{current}/{total}",
+	previous: "eelmine",
+	next: "järgmine",
+	close: "sulge",
+	xhrError: "Sisu ei õnnestunud laadida.",
+	imgError: "Pilti ei õnnestunud laadida.",
+	slideshowStart: "Käivita slaidid",
+	slideshowStop: "Peata slaidid"
+});

data/vendor/assets/javascripts/jquery.colorbox.js

@@ -1,5 +1,5 @@
 /*!
-	Colorbox v1.4.24 - 2013-06-24
+	Colorbox v1.4.26 - 2013-06-30
 	jQuery lightbox and modal window plugin
 	(c) 2013 Jack Moore - http://www.jacklmoore.com/colorbox
 	license: http://www.opensource.org/licenses/mit-license.php
@@ -130,6 +130,7 @@
 	div = "div",
 	className,
 	requests = 0,
+	previousCSS = {},
 	init;
 
 	// ****************
@@ -607,29 +608,41 @@
 		}
 
 		$box.css({top: offset.top, left: offset.left, visibility:'visible'});
-
-		// setting the speed to 0 to reduce the delay between same-sized content.
-		speed = ($box.width() === settings.w + loadedWidth && $box.height() === settings.h + loadedHeight) ? 0 : speed || 0;
 		
 		// this gives the wrapper plenty of breathing room so it's floated contents can move around smoothly,
 		// but it has to be shrank down around the size of div#colorbox when it's done.  If not,
 		// it can invoke an obscure IE bug when using iframes.
 		$wrap[0].style.width = $wrap[0].style.height = "9999px";
 		
-		function modalDimensions(that) {
-			$topBorder[0].style.width = $bottomBorder[0].style.width = $content[0].style.width = (parseInt(that.style.width,10) - interfaceWidth)+'px';
-			$content[0].style.height = $leftBorder[0].style.height = $rightBorder[0].style.height = (parseInt(that.style.height,10) - interfaceHeight)+'px';
+		function modalDimensions() {
+			$topBorder[0].style.width = $bottomBorder[0].style.width = $content[0].style.width = (parseInt($box[0].style.width,10) - interfaceWidth)+'px';
+			$content[0].style.height = $leftBorder[0].style.height = $rightBorder[0].style.height = (parseInt($box[0].style.height,10) - interfaceHeight)+'px';
 		}
 
 		css = {width: settings.w + loadedWidth + interfaceWidth, height: settings.h + loadedHeight + interfaceHeight, top: top, left: left};
 
-		if(speed===0){ // temporary workaround to side-step jQuery-UI 1.8 bug (http://bugs.jquery.com/ticket/12273)
+		// setting the speed to 0 if the content hasn't changed size or position
+		if (speed) {
+			var tempSpeed = 0;
+			$.each(css, function(i){
+				if (css[i] !== previousCSS[i]) {
+					tempSpeed = speed;
+					return;
+				}
+			});
+			speed = tempSpeed;
+		}
+
+		previousCSS = css;
+
+		if (!speed) {
 			$box.css(css);
 		}
+
 		$box.dequeue().animate(css, {
-			duration: speed,
+			duration: speed || 0,
 			complete: function () {
-				modalDimensions(this);
+				modalDimensions();
 				
 				active = false;
 				
@@ -647,9 +660,7 @@
 					loadedCallback();
 				}
 			},
-			step: function () {
-				modalDimensions(this);
-			}
+			step: modalDimensions
 		});
 	};
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jquery-colorbox-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Krzysztof Knapik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-25 00:00:00.000000000 Z
+date: 2013-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -54,6 +54,7 @@ files:
 - vendor/assets/javascripts/jquery.colorbox-da.js
 - vendor/assets/javascripts/jquery.colorbox-de.js
 - vendor/assets/javascripts/jquery.colorbox-es.js
+- vendor/assets/javascripts/jquery.colorbox-et.js
 - vendor/assets/javascripts/jquery.colorbox-fa.js
 - vendor/assets/javascripts/jquery.colorbox-fi.js
 - vendor/assets/javascripts/jquery.colorbox-fr.js