enju_leaf 1.1.0.rc3 → 1.1.0.rc4

data/spec/fixtures/produces.yml

@@ -2,133 +2,133 @@
 produce_00001: 
   updated_at: 2008-01-11 23:28:19.277110 +09:00
   manifestation_id: 1
-  patron_id: 1
+  agent_id: 1
   id: 1
   position: 1
   created_at: 2008-01-11 23:28:19.277110 +09:00
 produce_00002: 
   updated_at: 2008-01-11 23:28:57.068191 +09:00
   manifestation_id: 2
-  patron_id: 2
+  agent_id: 2
   id: 2
   position: 1
   created_at: 2008-01-11 23:28:57.068191 +09:00
 produce_00003: 
   updated_at: 2008-01-11 23:32:03.701425 +09:00
   manifestation_id: 3
-  patron_id: 3
+  agent_id: 3
   id: 3
   position: 1
   created_at: 2008-01-11 23:32:03.701425 +09:00
 produce_00004: 
   updated_at: 2008-01-11 02:34:20.183962 +09:00
   manifestation_id: 4
-  patron_id: 1
+  agent_id: 1
   id: 4
   position: 1
   created_at: 2008-01-11 02:34:20.183962 +09:00
 produce_00005: 
   updated_at: 2008-01-11 02:34:32.352223 +09:00
   manifestation_id: 5
-  patron_id: 2
+  agent_id: 2
   id: 5
   position: 2
   created_at: 2008-01-11 02:34:32.352223 +09:00
 produce_00006: 
   updated_at: 2008-01-11 23:35:36.467584 +09:00
   manifestation_id: 1
-  patron_id: 3
+  agent_id: 3
   id: 6
   position: 2
   created_at: 2008-01-11 23:35:36.467584 +09:00
 produce_00007: 
   updated_at: 2008-01-11 02:40:24.038276 +09:00
   manifestation_id: 2
-  patron_id: 1
+  agent_id: 1
   id: 7
   position: 1
   created_at: 2008-01-11 02:40:24.038276 +09:00
 produce_00008: 
   updated_at: 2008-01-11 02:40:40.316742 +09:00
   manifestation_id: 3
-  patron_id: 2
+  agent_id: 2
   id: 8
   position: 2
   created_at: 2008-01-11 02:40:40.316742 +09:00
 produce_00009: 
   updated_at: 2008-01-11 02:40:55.664604 +09:00
   manifestation_id: 4
-  patron_id: 3
+  agent_id: 3
   id: 9
   position: 3
   created_at: 2008-01-11 02:40:55.664604 +09:00
 produce_00010: 
   updated_at: 2008-01-11 02:44:37.135721 +09:00
   manifestation_id: 5
-  patron_id: 1
+  agent_id: 1
   id: 10
   position: 1
   created_at: 2008-01-11 02:44:37.135721 +09:00
 produce_00101:
   updated_at: 2010-03-03 20:00:00.135721 +09:00
   manifestation_id: 207
-  patron_id: 102
+  agent_id: 102
   id: 101
   position: 1
   created_at: 2010-03-03 20:00:00.135721 +09:00
 produce_00102:
   updated_at: 2010-03-03 20:00:00.135721 +09:00
   manifestation_id: 201
-  patron_id: 102
+  agent_id: 102
   id: 102
   position: 1
   created_at: 2010-03-03 20:00:00.135721 +09:00
 produce_00103:
   updated_at: 2010-03-03 20:00:00.135721 +09:00
   manifestation_id: 202
-  patron_id: 102
+  agent_id: 102
   id: 103
   position: 1
   created_at: 2010-03-03 20:00:00.135721 +09:00
 produce_00104:
   updated_at: 2010-03-16 11:00:00.135721 +09:00
   manifestation_id: 208
-  patron_id: 101
+  agent_id: 101
   id: 104
   position: 1
   created_at: 2010-03-16 11:00:00.135721 +09:00
 produce_00105:
   updated_at: 2010-03-16 19:00:00.135721 +09:00
   manifestation_id: 204
-  patron_id: 104
+  agent_id: 104
   id: 105
   position: 1
   created_at: 2010-03-16 19:00:00.135721 +09:00
 produce_00106:
   updated_at: 2010-03-16 19:00:00.135721 +09:00
   manifestation_id: 205
-  patron_id: 104
+  agent_id: 104
   id: 106
   position: 1
   created_at: 2010-03-16 19:00:00.135721 +09:00
 produce_00107:
   updated_at: 2010-03-16 19:00:00.135721 +09:00
   manifestation_id: 206
-  patron_id: 104
+  agent_id: 104
   id: 107
   position: 1
   created_at: 2010-03-16 19:00:00.135721 +09:00
 produce_00201:
   updated_at: 2010-03-15 20:00:00.135721 +09:00
   manifestation_id: 120
-  patron_id: 201
+  agent_id: 201
   id: 201
   position: 1
   created_at: 2010-03-15 20:00:00.135721 +09:00
 produce_00202:
   updated_at: 2010-03-15 20:00:00.135721 +09:00
   manifestation_id: 198
-  patron_id: 202
+  agent_id: 202
   id: 202
   position: 1
   created_at: 2010-03-15 20:00:00.135721 +09:00
@@ -139,7 +139,7 @@ produce_00202:
 # Table name: produces
 #
 #  id               :integer         not null, primary key
-#  patron_id        :integer         not null
+#  agent_id        :integer         not null
 #  manifestation_id :integer         not null
 #  position         :integer
 #  type             :string(255)

data/spec/fixtures/realizes.yml

@@ -2,70 +2,70 @@
 realize_00001: 
   updated_at: 2008-01-11 23:28:19.277110 +09:00
   expression_id: 1
-  patron_id: 1
+  agent_id: 1
   id: 1
   position: 1
   created_at: 2008-01-11 23:28:19.277110 +09:00
 realize_00002: 
   updated_at: 2008-01-11 23:28:57.068191 +09:00
   expression_id: 2
-  patron_id: 2
+  agent_id: 2
   id: 2
   position: 2
   created_at: 2008-01-11 23:28:57.068191 +09:00
 realize_00003: 
   updated_at: 2008-01-11 23:32:03.701425 +09:00
   expression_id: 3
-  patron_id: 3
+  agent_id: 3
   id: 3
   position: 1
   created_at: 2008-01-11 23:32:03.701425 +09:00
 realize_00004: 
   updated_at: 2008-01-11 02:34:20.183962 +09:00
   expression_id: 4
-  patron_id: 1
+  agent_id: 1
   id: 4
   position: 1
   created_at: 2008-01-11 02:34:20.183962 +09:00
 realize_00005: 
   updated_at: 2008-01-11 02:34:32.352223 +09:00
   expression_id: 5
-  patron_id: 2
+  agent_id: 2
   id: 5
   position: 1
   created_at: 2008-01-11 02:34:32.352223 +09:00
 realize_00006: 
   updated_at: 2008-01-11 23:35:36.467584 +09:00
   expression_id: 1
-  patron_id: 3
+  agent_id: 3
   id: 6
   position: 2
   created_at: 2008-01-11 23:35:36.467584 +09:00
 realize_00007: 
   updated_at: 2008-01-11 02:40:24.038276 +09:00
   expression_id: 2
-  patron_id: 1
+  agent_id: 1
   id: 7
   position: 2
   created_at: 2008-01-11 02:40:24.038276 +09:00
 realize_00008: 
   updated_at: 2008-01-11 02:40:40.316742 +09:00
   expression_id: 3
-  patron_id: 2
+  agent_id: 2
   id: 8
   position: 2
   created_at: 2008-01-11 02:40:40.316742 +09:00
 realize_00009: 
   updated_at: 2008-01-11 02:40:55.664604 +09:00
   expression_id: 4
-  patron_id: 3
+  agent_id: 3
   id: 9
   position: 2
   created_at: 2008-01-11 02:40:55.664604 +09:00
 realize_00010: 
   updated_at: 2008-01-11 02:44:37.135721 +09:00
   expression_id: 5
-  patron_id: 1
+  agent_id: 1
   id: 10
   position: 2
   created_at: 2008-01-11 02:44:37.135721 +09:00
@@ -76,7 +76,7 @@ realize_00010:
 # Table name: realizes
 #
 #  id              :integer         not null, primary key
-#  patron_id       :integer         not null
+#  agent_id       :integer         not null
 #  expression_id   :integer         not null
 #  position        :integer
 #  type            :string(255)

data/spec/spec_helper.rb

@@ -13,8 +13,6 @@ require 'sunspot-rails-tester'
 # in spec/support/ and its subdirectories.
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
-$original_sunspot_session = Sunspot.session
-
 RSpec.configure do |config|
   # == Mock Framework
   #

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

@@ -1,6 +1,7 @@
 /*!
-	jQuery Colorbox v1.4.14 - 2013-04-16
-	(c) 2013 Jack Moore - jacklmoore.com/colorbox
+	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
 */
 (function ($, document, window) {
@@ -32,7 +33,7 @@
 		opacity: 0.9,
 		preloading: true,
 		className: false,
-		
+
 		// alternate image paths for high-res displays
 		retinaImage: false,
 		retinaUrl: false,
@@ -48,6 +49,7 @@
 
 		open: false,
 		returnFocus: true,
+		trapFocus: true,
 		reposition: true,
 		loop: true,
 		slideshow: false,
@@ -55,13 +57,14 @@
 		slideshowSpeed: 2500,
 		slideshowStart: "start slideshow",
 		slideshowStop: "stop slideshow",
-		photoRegex: /\.(gif|png|jp(e|g|eg)|bmp|ico)((#|\?).*)?$/i,
+		photoRegex: /\.(gif|png|jp(e|g|eg)|bmp|ico|webp)((#|\?).*)?$/i,
 
 		onOpen: false,
 		onLoad: false,
 		onComplete: false,
 		onCleanup: false,
 		onClosed: false,
+
 		overlayClose: true,
 		escKey: true,
 		arrowKey: true,
@@ -70,7 +73,8 @@
 		left: false,
 		right: false,
 		fixed: false,
-		data: undefined
+		data: undefined,
+		closeButton: true
 	},
 	
 	// Abstracting the HTML and event identifiers for easy rebranding
@@ -126,13 +130,14 @@
 	div = "div",
 	className,
 	requests = 0,
+	previousCSS = {},
 	init;
 
 	// ****************
 	// HELPER FUNCTIONS
 	// ****************
 	
-	// Convience function for creating new jQuery objects
+	// Convenience function for creating new jQuery objects
 	function $tag(tag, id, css) {
 		var element = document.createElement(tag);
 
@@ -336,7 +341,11 @@
 			}
 			className = settings.className;
 
-			$close.html(settings.close).show();
+			if (settings.closeButton) {
+				$close.html(settings.close).appendTo($content);
+			} else {
+				$close.appendTo('<div/>');
+			}
 
 			if (!open) {
 				open = active = true; // Prevents the page-change action from queuing up if the visitor holds down the left or right keys.
@@ -366,15 +375,18 @@
 
 				$box.focus();
 				
-				// Confine focus to the modal
-				// Uses event capturing that is not supported in IE8-
-				if (document.addEventListener) {
 
-					document.addEventListener('focus', trapFocus, true);
-					
-					$events.one(event_closed, function () {
-						document.removeEventListener('focus', trapFocus, true);
-					});
+				if (settings.trapFocus) {
+					// Confine focus to the modal
+					// Uses event capturing that is not supported in IE8-
+					if (document.addEventListener) {
+
+						document.addEventListener('focus', trapFocus, true);
+						
+						$events.one(event_closed, function () {
+							document.removeEventListener('focus', trapFocus, true);
+						});
+					}
 				}
 
 				// Return focus on closing
@@ -402,7 +414,7 @@
 				tabindex: '-1'
 			}).hide();
 			$overlay = $tag(div, "Overlay").hide();
-			$loadingOverlay = $tag(div, "LoadingOverlay").add($tag(div, "LoadingGraphic"));
+			$loadingOverlay = $([$tag(div, "LoadingOverlay")[0],$tag(div, "LoadingGraphic")[0]]);
 			$wrap = $tag(div, "Wrapper");
 			$content = $tag(div, "Content").append(
 				$title = $tag(div, "Title"),
@@ -410,9 +422,10 @@
 				$prev = $('<button type="button"/>').attr({id:prefix+'Previous'}),
 				$next = $('<button type="button"/>').attr({id:prefix+'Next'}),
 				$slideshow = $tag('button', "Slideshow"),
-				$loadingOverlay,
-				$close = $('<button type="button"/>').attr({id:prefix+'Close'})
+				$loadingOverlay
 			);
+
+			$close = $('<button type="button"/>').attr({id:prefix+'Close'});
 			
 			$wrap.append( // The 3x3 Grid that makes up Colorbox
 				$tag(div).append(
@@ -445,7 +458,7 @@
 		function clickHandler(e) {
 			// ignore non-left-mouse-clicks and clicks modified with ctrl / command, shift, or alt.
 			// See: http://jacklmoore.com/notes/click-events/
-			if (!(e.which > 1 || e.shiftKey || e.altKey || e.metaKey || e.control)) {
+			if (!(e.which > 1 || e.shiftKey || e.altKey || e.metaKey || e.ctrlKey)) {
 				e.preventDefault();
 				launch(this);
 			}
@@ -595,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;
 				
@@ -635,35 +660,45 @@
 					loadedCallback();
 				}
 			},
-			step: function () {
-				modalDimensions(this);
-			}
+			step: modalDimensions
 		});
 	};
 
 	publicMethod.resize = function (options) {
+		var scrolltop;
+		
 		if (open) {
 			options = options || {};
 			
 			if (options.width) {
 				settings.w = setSize(options.width, 'x') - loadedWidth - interfaceWidth;
 			}
+
 			if (options.innerWidth) {
 				settings.w = setSize(options.innerWidth, 'x');
 			}
+
 			$loaded.css({width: settings.w});
 			
 			if (options.height) {
 				settings.h = setSize(options.height, 'y') - loadedHeight - interfaceHeight;
 			}
+
 			if (options.innerHeight) {
 				settings.h = setSize(options.innerHeight, 'y');
 			}
+
 			if (!options.innerHeight && !options.height) {
+				scrolltop = $loaded.scrollTop();
 				$loaded.css({height: "auto"});
 				settings.h = $loaded.height();
 			}
+
 			$loaded.css({height: settings.h});
+
+			if(scrolltop) {
+				$loaded.scrollTop(scrolltop);
+			}
 			
 			publicMethod.position(settings.transition === "none" ? 0 : settings.speed);
 		}
@@ -760,7 +795,7 @@
 
 						if (src && isImage(data, src)) {
 							src = retinaUrl(data, src);
-							img = new Image();
+							img = document.createElement('img');
 							img.src = src;
 						}
 					});
@@ -887,7 +922,9 @@
 
 			href = retinaUrl(settings, href);
 
-			$(photo = new Image())
+			photo = document.createElement('img');
+
+			$(photo)
 			.addClass(prefix + 'Photo')
 			.bind('error',function () {
 				settings.title = false;