enju_leaf 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ce15458b367d549170357329294bbe8ba7c3b7a
-  data.tar.gz: c91e3e707e1544ef2042e1112f9437b57d240f90
+  metadata.gz: 495a9c35f27e957fc76075bb6c9a65f2fe2ea27a
+  data.tar.gz: 2b7085c28d123459a30bad1ae16a3bfaf5de4084
 SHA512:
-  metadata.gz: adbf99aa3bd12ebc290a26535b9a01626cea20b26e66056a6ad52c4a314f56d16fecf759409083bef3dbf172ddb88d2cb2734dd470816b592695ab6ae9292e34
-  data.tar.gz: 3e503313b773432bd6f3b309ccd2d88004936467840230485b669ebc31d44234fd7b887d4e190423043b70fc667024516163b0c38f456ffa905db576486a740d
+  metadata.gz: 92fc6f5a49e12b4117a55eb8ed87ec89e8007cdc940db4f9d37b776fc19c724a87b580007d371e19028247b44095fb0630c5b86f409fcb42c8a123e2e9dab02f
+  data.tar.gz: 81a037660b09b63f2e7a65a3199958e14625fbdcd7d53950d29bd4c0e2fc8c5b9c5817406399a2ef4776302bf481854b4a791d20c57f332edc12132ca569c6f3

data/README.rdoc

@@ -1,6 +1,6 @@
 = Next-L Enju Leaf
 {<img src="https://travis-ci.org/next-l/enju_leaf.svg?branch=1.1" alt="Build Status" />}[https://travis-ci.org/next-l/enju_leaf]
-{<img src="https://coveralls.io/repos/next-l/enju_leaf/badge.png?branch=1.1" alt="Coverage Status" />}[https://coveralls.io/r/next-l/enju_leaf?branch=1.1]
+{<img src="https://coveralls.io/repos/next-l/enju_nii/badge.svg?branch=1.1&service=github" alt="Coverage Status" />}[https://coveralls.io/github/next-l/enju_nii?branch=1.1]
 {<img src="https://hakiri.io/github/next-l/enju_leaf/1.1.svg" alt="security" />}[https://hakiri.io/github/next-l/enju_leaf/1.1]
 
 Next-L Enju Leaf は、{Project Next-L}[http://www.next-l.jp] で開発している図書館管理システムです。

data/app/models/profile.rb

@@ -14,9 +14,9 @@ class Profile < ActiveRecord::Base
   validates_associated :user_group, :library
   validates_associated :user
   validates_presence_of :user_group, :library, :locale #, :user_number
-  validates :user_number, uniqueness: true, format: { with: /\A[0-9A-Za-z_]+\Z/ }, allow_blank: true
+  validates :user_number, uniqueness: true, format: { with: /\A[0-9A-Za-z_]+\z/ }, allow_blank: true
   validates :user_id, uniqueness: true, allow_blank: true
-  validates :birth_date, format: { with: /\A\d{4}-\d{1,2}-\d{1,2}\Z/ }, allow_blank: true
+  validates :birth_date, format: { with: /\A\d{4}-\d{1,2}-\d{1,2}\z/ }, allow_blank: true
 
   normalize_attribute :user_number
 

data/app/models/role.rb

@@ -1,6 +1,6 @@
 class Role < ActiveRecord::Base
   include MasterModel
-  validates :name, presence: true, format: { with: /\A[A-Za-z][a-z_,]*[a-z]\Z/ }
+  validates :name, presence: true, format: { with: /\A[A-Za-z][a-z_,]*[a-z]\z/ }
   has_many :user_has_roles
   has_many :users, through: :user_has_roles
   after_save :clear_all_cache

data/app/views/my_accounts/_edit_credential.html.erb

@@ -38,7 +38,7 @@
         <%- if current_user.has_role?('Administrator') and current_user != profile.user -%>
           <%= u.select :role_id, @roles.collect{|r| [r.display_name.localize, r.id]} %>
         <% else %>
-          <%= u.select(:role_id, @roles.collect{|r| [r.display_name.localize, r.id]}, {}, {disabled: 'disabled'}) -%>
+          <%= current_user.role.display_name.localize -%>
         <% end %>
       <% end %>
     </div>
@@ -55,12 +55,14 @@
       <%= f.text_field :full_name_transcription -%>
     </div>
 
-    <%- if current_user.has_role?('Librarian') -%>
-      <div class="field">
-        <%= f.label t('activerecord.models.user_group') -%><br />
+    <div class="field">
+      <%= f.label t('activerecord.models.user_group') -%><br />
+      <%- if current_user.has_role?('Librarian') -%>
         <%= f.select(:user_group_id, @user_groups.collect{|u| [u.display_name.localize, u.id]}) -%>
-      </div>
-    <%- end -%>
+      <%- else -%>
+        <%= current_user.profile.user_group.display_name.localize if current_user.profile.user_group -%>
+      <%- end -%>
+    </div>
 
     <div class="field">
       <%= f.label :user_number -%><br />
@@ -71,17 +73,24 @@
       <%- end -%>
     </div>
 
-    <%- if current_user.has_role?('Librarian') -%>
-      <div class="field">
-        <%= f.label t('activerecord.models.library') -%><br />
+    <div class="field">
+      <%= f.label t('activerecord.models.library') -%><br />
+      <%- if current_user.has_role?('Librarian') -%>
         <%= f.select(:library_id, @libraries.collect{|l| [l.display_name.localize, l.id]}) -%>
-      </div>
+      <% else %>
+        <%= current_user.profile.library.display_name.localize if current_user.profile.library %>
+      <% end %>
+    </div>
 
-      <div class="field">
-        <%= f.label t('role.required_role') -%><br />
+    <div class="field">
+      <%= f.label t('role.required_role') -%><br />
+      <%- if current_user.has_role?('Librarian') -%>
         <%= f.select(:required_role_id, @roles.collect{|r| [r.display_name.localize, r.id]}) -%>
-      </div>
-    <%- end -%>
+      <%- else -%>
+        <%= current_user.role.display_name.localize -%>
+      <%- end -%>
+    </div>
+
     <div class="field">
       <%= f.label :locale -%><br />
       <%= f.select(:locale, @available_languages.collect{|language| [language.display_name.localize, language.iso_639_1]}) -%>

data/app/views/profiles/show.html.erb

@@ -40,7 +40,7 @@
       <% if defined?(EnjuMessage) %>
         <li><%= link_to t('message.send'), new_message_path(recipient: @profile.user.username) -%></li>
       <% end %>
-      <%- if can? :create, @profile -%>
+      <%- if can? :create, Profile -%>
         <li><%= link_to t('page.new', model: t('activerecord.models.profile')), new_profile_path -%></li>
       <% end %>
       <%- if can? :destroy, @profile -%>

data/lib/enju_leaf/export_file.rb

@@ -15,7 +15,8 @@ module ExportFile
   module InstanceMethods
     def send_message
       sender = User.find(1) #system
-      message_template = MessageTemplate.localized_template('export_completed', user.profile.locale)
+      locale = user.profile.try(:locale) || I18n.default_locale.to_s
+      message_template = MessageTemplate.localized_template('export_completed', locale)
       request = MessageRequest.new
       request.assign_attributes({sender: sender, receiver: user, message_template: message_template})
       request.save_message_body

data/lib/enju_leaf/import_file.rb

@@ -55,7 +55,8 @@ module ImportFile
     # インポート完了時のメッセージを送信します。
     def send_message
       sender = User.find(1)
-      message_template = MessageTemplate.localized_template('import_completed', user.profile.locale)
+      locale = user.profile.try(:locale) || I18n.default_locale.to_s
+      message_template = MessageTemplate.localized_template('import_completed', locale)
       request = MessageRequest.new
       request.assign_attributes({sender: sender, receiver: user, message_template: message_template})
       request.save_message_body

data/lib/enju_leaf/master_model.rb

@@ -26,7 +26,7 @@ module MasterModel
 
     private
     def valid_name?
-      unless name =~ /\A[a-z][0-9a-z_]*[0-9a-z]\Z/
+      unless name =~ /\A[a-z][0-9a-z_]*[0-9a-z]\z/
         errors.add(:name, I18n.t('page.only_lowercase_letters_and_numbers_are_allowed'))
       end
     end

data/lib/enju_leaf/user.rb

@@ -37,7 +37,7 @@ module EnjuLeaf
         accepts_nested_attributes_for :user_has_role
 
         validates :username, presence: true, uniqueness: true, format: {
-          with: /\A[0-9A-Za-z][0-9A-Za-z_\-]*[0-9A-Za-z]\Z/
+          with: /\A[0-9A-Za-z][0-9A-Za-z_\-]*[0-9A-Za-z]\z/
         }
         validates :email, format: Devise::email_regexp, allow_blank: true, uniqueness: true
         validates_date :expired_at, allow_blank: true

data/lib/enju_leaf/version.rb

@@ -1,3 +1,3 @@
 module EnjuLeaf
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/lib/enju_leaf.rb

@@ -57,7 +57,7 @@ module EnjuLeaf
         format.mobile { render template: 'page/404', status: 404 }
         format.xml { render template: 'page/404', status: 404 }
         format.json { render text: '{"error": "not_found"}' }
-        format.xml { render template: 'page/404.xml', status: 404 }
+        format.rss { render template: 'page/404.xml', status: 404 }
       end
     end
 

data/lib/generators/enju_leaf/setup/setup_generator.rb

@@ -56,7 +56,7 @@ EOS
         ""
     end
     gsub_file 'config/routes.rb', /devise_for :users$/, "devise_for :users, skip: [:registration]"
-    gsub_file 'config/initializers/devise.rb', '# config.email_regexp = /\A[^@]+@[^@]+\z/', 'config.email_regexp = /\A([\w\.%\+\-]+)@([\w\-]+\.)+([\w]{2,})\Z/i'
+    gsub_file 'config/initializers/devise.rb', '# config.email_regexp = /\A[^@]+@[^@]+\z/', 'config.email_regexp = /\A([\w\.%\+\-]+)@([\w\-]+\.)+([\w]{2,})\z/i'
     gsub_file 'config/initializers/devise.rb', '# config.authentication_keys = [:email]', 'config.authentication_keys = [:username]'
     gsub_file 'config/initializers/devise.rb', '# config.secret_key', 'config.secret_key'
     gsub_file 'config/initializers/devise.rb',

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

@@ -1,5 +1,5 @@
 /*!
-	Colorbox 1.5.14
+	Colorbox 1.6.3
 	license: MIT
 	http://www.jacklmoore.com/colorbox
 */
@@ -85,6 +85,39 @@
 		},
 		title: function() {
 			return this.title;
+		},
+		createImg: function() {
+			var img = new Image();
+			var attrs = $(this).data('cbox-img-attrs');
+
+			if (typeof attrs === 'object') {
+				$.each(attrs, function(key, val){
+					img[key] = val;
+				});
+			}
+
+			return img;
+		},
+		createIframe: function() {
+			var iframe = document.createElement('iframe');
+			var attrs = $(this).data('cbox-iframe-attrs');
+
+			if (typeof attrs === 'object') {
+				$.each(attrs, function(key, val){
+					iframe[key] = val;
+				});
+			}
+
+			if ('frameBorder' in iframe) {
+				iframe.frameBorder = 0;
+			}
+			if ('allowTransparency' in iframe) {
+				iframe.allowTransparency = "true";
+			}
+			iframe.name = (new Date()).getTime(); // give the iframe a unique name to prevent caching
+			iframe.allowFullscreen = true;
+
+			return iframe;
 		}
 	},
 
@@ -92,7 +125,7 @@
 	colorbox = 'colorbox',
 	prefix = 'cbox',
 	boxElement = prefix + 'Element',
-	
+
 	// Events
 	event_open = prefix + '_open',
 	event_load = prefix + '_load',
@@ -123,7 +156,7 @@
 	$close,
 	$groupControls,
 	$events = $('<a/>'), // $({}) would be prefered, but there is an issue with jQuery 1.4.2
-	
+
 	// Variables for cached values or use across multiple functions
 	settings,
 	interfaceHeight,
@@ -145,7 +178,7 @@
 	// ****************
 	// HELPER FUNCTIONS
 	// ****************
-	
+
 	// Convenience function for creating new jQuery objects
 	function $tag(tag, id, css) {
 		var element = document.createElement(tag);
@@ -160,7 +193,7 @@
 
 		return $(element);
 	}
-	
+
 	// Get the window height using innerHeight when available to avoid an issue with iOS
 	// http://bugs.jquery.com/ticket/6724
 	function winheight() {
@@ -204,7 +237,7 @@
 		var
 		max = $related.length,
 		newIndex = (index + increment) % max;
-		
+
 		return (newIndex < 0) ? max + newIndex : newIndex;
 	}
 
@@ -212,7 +245,7 @@
 	function setSize(size, dimension) {
 		return Math.round((/%/.test(size) ? ((dimension === 'x' ? $window.width() : winheight()) / 100) : 1) * parseInt(size, 10));
 	}
-	
+
 	// Checks an href to see if it is a photo.
 	// There is a force photo option (photo: true) for hrefs that cannot be matched by the regex.
 	function isImage(settings, url) {
@@ -239,7 +272,7 @@
 
 	function getRelated(rel) {
 		index = 0;
-		
+
 		if (rel && rel !== false && rel !== 'nofollow') {
 			$related = $('.' + boxElement).filter(function () {
 				var options = $.data(this, colorbox);
@@ -247,7 +280,7 @@
 				return (settings.get('rel') === rel);
 			});
 			index = $related.index(settings.el);
-			
+
 			// Check direct calls to Colorbox.
 			if (index === -1) {
 				$related = $related.add(settings.el);
@@ -297,7 +330,7 @@
 
 		function stop() {
 			clear();
-			
+
 			$events
 				.unbind(event_complete, set)
 				.unbind(event_load, clear);
@@ -354,17 +387,17 @@
 			options = $(element).data(colorbox);
 
 			settings = new Settings(element, options);
-			
+
 			getRelated(settings.get('rel'));
 
 			if (!open) {
 				open = active = true; // Prevents the page-change action from queuing up if the visitor holds down the left or right keys.
 
 				setClass(settings.get('className'));
-				
+
 				// Show colorbox so the sizes can be calculated in older versions of jQuery
 				$box.css({visibility:'hidden', display:'block', opacity:''});
-				
+
 				$loaded = $tag(div, 'LoadedContent', 'width:0; height:0; overflow:hidden; visibility:hidden');
 				$content.css({width:'', height:''}).append($loaded);
 
@@ -380,8 +413,8 @@
 				var maxWidth = settings.get('maxWidth');
 				var maxHeight = settings.get('maxHeight');
 
-				settings.w = (maxWidth !== false ? Math.min(initialWidth, setSize(maxWidth, 'x')) : initialWidth) - loadedWidth - interfaceWidth;
-				settings.h = (maxHeight !== false ? Math.min(initialHeight, setSize(maxHeight, 'y')) : initialHeight) - loadedHeight - interfaceHeight;
+				settings.w = Math.max((maxWidth !== false ? Math.min(initialWidth, setSize(maxWidth, 'x')) : initialWidth) - loadedWidth - interfaceWidth, 0);
+				settings.h = Math.max((maxHeight !== false ? Math.min(initialHeight, setSize(maxHeight, 'y')) : initialHeight) - loadedHeight - interfaceHeight, 0);
 
 				$loaded.css({width:'', height:settings.h});
 				publicMethod.position();
@@ -392,14 +425,14 @@
 				$groupControls.add($title).hide();
 
 				$box.focus();
-				
+
 				if (settings.get('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);
 						});
@@ -420,7 +453,7 @@
 				cursor: settings.get('overlayClose') ? 'pointer' : '',
 				visibility: 'visible'
 			}).show();
-			
+
 			if (settings.get('closeButton')) {
 				$close.html(settings.get('close')).appendTo($content);
 			} else {
@@ -456,7 +489,7 @@
 			);
 
 			$close = $('<button type="button"/>').attr({id:prefix+'Close'});
-			
+
 			$wrap.append( // The 3x3 Grid that makes up Colorbox
 				$tag(div).append(
 					$tag(div, "TopLeft"),
@@ -474,9 +507,9 @@
 					$tag(div, "BottomRight")
 				)
 			).find('div div').css({'float': 'left'});
-			
+
 			$loadingBay = $tag(div, false, 'position:absolute; width:9999px; visibility:hidden; display:none; max-width:none;');
-			
+
 			$groupControls = $next.add($prev).add($current).add($slideshow);
 		}
 		if (document.body && !$box.parent().length) {
@@ -514,7 +547,7 @@
 						publicMethod.close();
 					}
 				});
-				
+
 				// Key Bindings
 				$(document).bind('keydown.' + prefix, function (e) {
 					var key = e.keyCode;
@@ -562,7 +595,7 @@
 	// Usage format: $.colorbox.close();
 	// Usage from within an iframe: parent.jQuery.colorbox.close();
 	// ****************
-	
+
 	publicMethod = $.fn[colorbox] = $[colorbox] = function (options, callback) {
 		var settings;
 		var $obj = this;
@@ -572,15 +605,12 @@
 		if ($.isFunction($obj)) { // assume a call to $.colorbox
 			$obj = $('<a/>');
 			options.open = true;
-		} else if (!$obj[0]) { // colorbox being applied to empty collection
-			return $obj;
 		}
 
-
 		if (!$obj[0]) { // colorbox being applied to empty collection
 			return $obj;
 		}
-		
+
 		appendHTML();
 
 		if (addBindings()) {
@@ -595,12 +625,12 @@
 			}).addClass(boxElement);
 
 			settings = new Settings($obj[0], options);
-			
+
 			if (settings.get('open')) {
 				launch($obj[0]);
 			}
 		}
-		
+
 		return $obj;
 	};
 
@@ -612,7 +642,7 @@
 		offset = $box.offset(),
 		scrollTop,
 		scrollLeft;
-		
+
 		$window.unbind('resize.' + prefix);
 
 		// remove the modal so that it doesn't influence the document width/height
@@ -639,7 +669,7 @@
 		} else {
 			left += Math.round(Math.max($window.width() - settings.w - loadedWidth - interfaceWidth, 0) / 2);
 		}
-		
+
 		if (settings.get('bottom') !== false) {
 			top += Math.max(winheight() - settings.h - loadedHeight - interfaceHeight - setSize(settings.get('bottom'), 'y'), 0);
 		} else if (settings.get('top') !== false) {
@@ -649,12 +679,12 @@
 		}
 
 		$box.css({top: offset.top, left: offset.left, visibility:'visible'});
-		
+
 		// 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() {
 			$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';
@@ -684,13 +714,13 @@
 			duration: speed || 0,
 			complete: function () {
 				modalDimensions();
-				
+
 				active = false;
-				
+
 				// shrink the wrapper down to exactly the size of colorbox to avoid a bug in IE's iframe implementation.
 				$wrap[0].style.width = (settings.w + loadedWidth + interfaceWidth) + "px";
 				$wrap[0].style.height = (settings.h + loadedHeight + interfaceHeight) + "px";
-				
+
 				if (settings.get('reposition')) {
 					setTimeout(function () {  // small delay before binding onresize due to an IE8 bug.
 						$window.bind('resize.' + prefix, publicMethod.position);
@@ -707,10 +737,10 @@
 
 	publicMethod.resize = function (options) {
 		var scrolltop;
-		
+
 		if (open) {
 			options = options || {};
-			
+
 			if (options.width) {
 				settings.w = setSize(options.width, 'x') - loadedWidth - interfaceWidth;
 			}
@@ -720,7 +750,7 @@
 			}
 
 			$loaded.css({width: settings.w});
-			
+
 			if (options.height) {
 				settings.h = setSize(options.height, 'y') - loadedHeight - interfaceHeight;
 			}
@@ -740,7 +770,7 @@
 			if(scrolltop) {
 				$loaded.scrollTop(scrolltop);
 			}
-			
+
 			publicMethod.position(settings.get('transition') === "none" ? 0 : settings.get('speed'));
 		}
 	};
@@ -749,13 +779,13 @@
 		if (!open) {
 			return;
 		}
-		
+
 		var callback, speed = settings.get('transition') === "none" ? 0 : settings.get('speed');
 
 		$loaded.remove();
 
 		$loaded = $tag(div, 'LoadedContent').append(object);
-		
+
 		function getWidth() {
 			settings.w = settings.w || $loaded.width();
 			settings.w = settings.mw && settings.mw < settings.w ? settings.mw : settings.w;
@@ -766,17 +796,17 @@
 			settings.h = settings.mh && settings.mh < settings.h ? settings.mh : settings.h;
 			return settings.h;
 		}
-		
+
 		$loaded.hide()
 		.appendTo($loadingBay.show())// content has to be appended to the DOM for accurate size calculations.
 		.css({width: getWidth(), overflow: settings.get('scrolling') ? 'auto' : 'hidden'})
 		.css({height: getHeight()})// sets the height independently from the width in case the new width influences the value of height.
 		.prependTo($content);
-		
+
 		$loadingBay.hide();
-		
+
 		// floating the IMG removes the bottom line-height and fixed a problem where IE miscalculates the width of the parent element as 100% of the document width.
-		
+
 		$(photo).css({'float': 'none'});
 
 		setClass(settings.get('className'));
@@ -785,17 +815,17 @@
 			var total = $related.length,
 				iframe,
 				complete;
-			
+
 			if (!open) {
 				return;
 			}
-			
+
 			function removeFilter() { // Needed for IE8 in versions of jQuery prior to 1.7.2
 				if ($.support.opacity === false) {
 					$box[0].style.removeAttribute('filter');
 				}
 			}
-			
+
 			complete = function () {
 				clearTimeout(loadingTimer);
 				$loadingOverlay.hide();
@@ -803,20 +833,20 @@
 				settings.get('onComplete');
 			};
 
-			
+
 			$title.html(settings.get('title')).show();
 			$loaded.show();
-			
+
 			if (total > 1) { // handle grouping
 				if (typeof settings.get('current') === "string") {
 					$current.html(settings.get('current').replace('{current}', index + 1).replace('{total}', total)).show();
 				}
-				
+
 				$next[(settings.get('loop') || index < total - 1) ? "show" : "hide"]().html(settings.get('next'));
 				$prev[(settings.get('loop') || index) ? "show" : "hide"]().html(settings.get('previous'));
-				
+
 				slideshow();
-				
+
 				// Preloads images within a rel group
 				if (settings.get('preloading')) {
 					$.each([getIndex(-1), getIndex(1)], function(){
@@ -835,32 +865,23 @@
 			} else {
 				$groupControls.hide();
 			}
-			
+
 			if (settings.get('iframe')) {
-				iframe = document.createElement('iframe');
-				
-				if ('frameBorder' in iframe) {
-					iframe.frameBorder = 0;
-				}
-				
-				if ('allowTransparency' in iframe) {
-					iframe.allowTransparency = "true";
-				}
+
+				iframe = settings.get('createIframe');
 
 				if (!settings.get('scrolling')) {
 					iframe.scrolling = "no";
 				}
-				
+
 				$(iframe)
 					.attr({
 						src: settings.get('href'),
-						name: (new Date()).getTime(), // give the iframe a unique name to prevent caching
-						'class': prefix + 'Iframe',
-						allowFullScreen : true // allow HTML5 video to go fullscreen
+						'class': prefix + 'Iframe'
 					})
 					.one('load', complete)
 					.appendTo($loaded);
-				
+
 				$events.one(event_purge, function () {
 					iframe.src = "//about:blank";
 				});
@@ -871,14 +892,14 @@
 			} else {
 				complete();
 			}
-			
+
 			if (settings.get('transition') === 'fade') {
 				$box.fadeTo(speed, 1, removeFilter);
 			} else {
 				removeFilter();
 			}
 		};
-		
+
 		if (settings.get('transition') === 'fade') {
 			$box.fadeTo(speed, 0, function () {
 				publicMethod.position(0, callback);
@@ -890,27 +911,27 @@
 
 	function load () {
 		var href, setResize, prep = publicMethod.prep, $inline, request = ++requests;
-		
+
 		active = true;
-		
+
 		photo = false;
-		
+
 		trigger(event_purge);
 		trigger(event_load);
 		settings.get('onLoad');
-		
+
 		settings.h = settings.get('height') ?
 				setSize(settings.get('height'), 'y') - loadedHeight - interfaceHeight :
 				settings.get('innerHeight') && setSize(settings.get('innerHeight'), 'y');
-		
+
 		settings.w = settings.get('width') ?
 				setSize(settings.get('width'), 'x') - loadedWidth - interfaceWidth :
 				settings.get('innerWidth') && setSize(settings.get('innerWidth'), 'x');
-		
+
 		// Sets the minimum dimensions for use in image scaling
 		settings.mw = settings.w;
 		settings.mh = settings.h;
-		
+
 		// Re-evaluate the minimum width and height based on maxWidth and maxHeight values.
 		// If the width or height exceed the maxWidth or maxHeight, use the maximum values instead.
 		if (settings.get('maxWidth')) {
@@ -921,13 +942,13 @@
 			settings.mh = setSize(settings.get('maxHeight'), 'y') - loadedHeight - interfaceHeight;
 			settings.mh = settings.h && settings.h < settings.mh ? settings.h : settings.mh;
 		}
-		
+
 		href = settings.get('href');
-		
+
 		loadingTimer = setTimeout(function () {
 			$loadingOverlay.show();
 		}, 100);
-		
+
 		if (settings.get('inline')) {
 			var $target = $(href);
 			// Inserts an empty placeholder where inline content is being pulled from.
@@ -949,11 +970,11 @@
 
 			href = retinaUrl(settings, href);
 
-			photo = new Image();
+			photo = settings.get('createImg');
 
 			$(photo)
 			.addClass(prefix + 'Photo')
-			.bind('error',function () {
+			.bind('error.'+prefix,function () {
 				prep($tag(div, 'Error').html(settings.get('imgError')));
 			})
 			.one('load', function () {
@@ -961,18 +982,11 @@
 					return;
 				}
 
-				// A small pause because some browsers will occassionaly report a 
+				// A small pause because some browsers will occassionaly report a
 				// img.width and img.height of zero immediately after the img.onload fires
 				setTimeout(function(){
 					var percent;
 
-					$.each(['alt', 'longdesc', 'aria-describedby'], function(i,val){
-						var attr = $(settings.el).attr(val) || $(settings.el).attr('data-'+val);
-						if (attr) {
-							photo.setAttribute(val, attr);
-						}
-					});
-
 					if (settings.get('retinaImage') && window.devicePixelRatio > 1) {
 						photo.height = photo.height / window.devicePixelRatio;
 						photo.width = photo.width / window.devicePixelRatio;
@@ -992,16 +1006,17 @@
 							setResize();
 						}
 					}
-					
+
 					if (settings.h) {
 						photo.style.marginTop = Math.max(settings.mh - photo.height, 0) / 2 + 'px';
 					}
-					
+
 					if ($related[1] && (settings.get('loop') || $related[index + 1])) {
 						photo.style.cursor = 'pointer';
-						photo.onclick = function () {
+
+						$(photo).bind('click.'+prefix, function () {
 							publicMethod.next();
-						};
+						});
 					}
 
 					photo.style.width = photo.width + 'px';
@@ -1009,7 +1024,7 @@
 					prep(photo);
 				}, 1);
 			});
-			
+
 			photo.src = href;
 
 		} else if (href) {
@@ -1020,7 +1035,7 @@
 			});
 		}
 	}
-		
+
 	// Navigates to the next page/image in a set.
 	publicMethod.next = function () {
 		if (!active && $related[1] && (settings.get('loop') || $related[index + 1])) {
@@ -1028,7 +1043,7 @@
 			launch($related[index]);
 		}
 	};
-	
+
 	publicMethod.prev = function () {
 		if (!active && $related[1] && (settings.get('loop') || index)) {
 			index = getIndex(-1);
@@ -1039,20 +1054,20 @@
 	// Note: to use this within an iframe use the following format: parent.jQuery.colorbox.close();
 	publicMethod.close = function () {
 		if (open && !closing) {
-			
+
 			closing = true;
 			open = false;
 			trigger(event_cleanup);
 			settings.get('onCleanup');
 			$window.unbind('.' + prefix);
 			$overlay.fadeTo(settings.get('fadeOut') || 0, 0);
-			
+
 			$box.stop().fadeTo(settings.get('fadeOut') || 0, 0, function () {
 				$box.hide();
 				$overlay.hide();
 				trigger(event_purge);
 				$loaded.remove();
-				
+
 				setTimeout(function () {
 					closing = false;
 					trigger(event_closed);

data/vendor/assets/stylesheets/colorbox.css

@@ -2,7 +2,7 @@
     Colorbox Core Style:
     The following CSS is consistent between example themes and should not be altered.
 */
-#colorbox, #cboxOverlay, #cboxWrapper{position:absolute; top:0; left:0; z-index:9999; overflow:hidden;}
+#colorbox, #cboxOverlay, #cboxWrapper{position:absolute; top:0; left:0; z-index:9999; overflow:hidden; -webkit-transform: translate3d(0,0,0);}
 #cboxWrapper {max-width:none;}
 #cboxOverlay{position:fixed; width:100%; height:100%;}
 #cboxMiddleLeft, #cboxBottomLeft{clear:left;}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enju_leaf
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-10 00:00:00.000000000 Z
+date: 2015-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -36,42 +36,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre71
+        version: 0.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre71
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: enju_library
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre45
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre45
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: enju_manifestation_viewer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre19
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre19
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: friendly_id
   requirement: !ruby/object:Gem::Requirement
@@ -174,16 +174,16 @@ dependencies:
   name: sunspot_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: resque
   requirement: !ruby/object:Gem::Requirement
@@ -342,16 +342,16 @@ dependencies:
   name: statesman
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: kramdown
   requirement: !ruby/object:Gem::Requirement
@@ -414,56 +414,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: enju_circulation
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre49
+        version: 0.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre49
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: enju_bookmark
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2.pre23
+        version: 0.1.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2.pre23
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: enju_search_log
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre12
+        version: 0.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre12
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
@@ -510,16 +510,16 @@ dependencies:
   name: sunspot_solr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: 2.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: sunspot-rails-tester
   requirement: !ruby/object:Gem::Requirement