magnific-popup-rails 0.8.1 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dbbad4e8f9e51d536d3821cafcf978ebf3417a60
-  data.tar.gz: 54c4d1b21b1f17c0a27cd2aa9ecd6f786412fbda
+  metadata.gz: 821d3f66177fce467ec9456d4a91287c18de87c9
+  data.tar.gz: 65c242c690bea4fc20bf718b94c8dd2f60dd4962
 SHA512:
-  metadata.gz: 25b37b9f77023e714ee9b34ead27421c46bd9dae26014138014c71a52ecacc75342598bbcf115d210109905b26872c25f9a4eed8b73a154be8940c33ef2cb277
-  data.tar.gz: 4a76ac27f904c0bcd08b59e0834dda8cff80ff35568fe38071d986038ffa0d8af34e13bf56d1a22bed5448151489ea5f64175f9467c94f00e3154ec3676e2b65
+  metadata.gz: 84d1fccc5180eddc7c227a2bb5261fb61265dd4973f131d066bfce404aa62cb097c8c5b66b6702b0af526ea1d2847e7278e26fbbb3b9b888a5cf97c24f14946a
+  data.tar.gz: 4be25255d6ae041d1378204734451cee75e13a2e84fcf8667e756319307384ea207a7547d5e6aa94511bf9605e10306c51cf6bce41563b8821100f25f2915d6a

data/.gitignore

@@ -0,0 +1,17 @@
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp

data/README.md

@@ -14,7 +14,7 @@ I used [markmcconachie's](https://github.com/markmcconachie) [normalize-rails](h
 
 Add this line to your application's Gemfile:
 
-    gem 'magnific-popup-rails', github: "joshuajansen/magnific-popup-rails"
+    gem 'magnific-popup-rails'
 
 And then execute:
 

data/Rakefile

@@ -6,7 +6,7 @@ desc "Download the latest magnific-popup.css and magnific-popup.js"
 task :update do
   # CSS
   url = "https://raw.github.com/dimsemenov/Magnific-Popup/master/dist/magnific-popup.css"
-  outputfile = "vendor/assets/stylesheets/magnific-popup-rails/magnific-popup.css"
+  outputfile = "vendor/assets/stylesheets/magnific-popup/magnific-popup.css"
 
   open(outputfile, 'wb') do |file|
     file << open(url).read
@@ -14,7 +14,7 @@ task :update do
 
   # JS
   url = "https://raw.github.com/dimsemenov/Magnific-Popup/master/dist/jquery.magnific-popup.js"
-  outputfile = "vendor/assets/javascripts/magnific-popup-rails/jquery.magnific-popup.js"
+  outputfile = "vendor/assets/javascripts/magnific-popup/jquery.magnific-popup.js"
 
   open(outputfile, 'wb') do |file|
     file << open(url).read

data/lib/magnific-popup-rails/engine.rb

@@ -1,8 +1,8 @@
 module MagnificPopup
   module Rails
     class Engine < ::Rails::Engine
-      initializer "configure assets of magnific-popup-rails", :group => :all do |app|
-        app.config.assets.precompile += %w( magnific-popup-rails/*.css magnific-popup-rails/*.js )
+      initializer "configure assets of magnific-popup", :group => :all do |app|
+        app.config.assets.precompile += %w( magnific-popup/*.css magnific-popup/*.js )
       end
     end
   end

data/lib/magnific-popup-rails/version.rb

@@ -1,5 +1,5 @@
 module MagnificPopup
   module Rails
-    VERSION = "0.8.1"
+    VERSION = "0.8.3"
   end
 end

data/vendor/assets/javascripts/{magnific-popup-rails → magnific-popup}/jquery.magnific-popup.js

@@ -1,4 +1,4 @@
-/*! Magnific Popup - v0.8.2 - 2013-05-05
+/*! Magnific Popup - v0.8.3 - 2013-05-09
 * http://dimsemenov.com/plugins/magnific-popup/
 * Copyright (c) 2013 Dmitry Semenov; */
 ;(function($) {
@@ -302,10 +302,10 @@ MagnificPopup.prototype = {
 		// add content
 		mfp.updateItemHTML();
 
-		// remove scrollbar, add padding e.t.c
-		
+		_mfpTrigger('BuildControls');
 
 
+		// remove scrollbar, add padding e.t.c
 		_body.css(bodyStyles);
 		
 		// add everything to DOM
@@ -406,6 +406,7 @@ MagnificPopup.prototype = {
 		if(mfp._lastFocusedEl) {
 			$(mfp._lastFocusedEl).focus(); // put tab focus back
 		}	
+		mfp.content = null;
 		mfp.currTemplate = null;
 		mfp.prevHeight = 0;
 	},
@@ -434,8 +435,13 @@ MagnificPopup.prototype = {
 		var item = mfp.items[mfp.index];
 
 		// Detach and perform modifications
+		
+
 		mfp.contentContainer.detach();
 
+		if(mfp.content)
+			mfp.content.detach();
+
 		if(!item.parsed) {
 			item = mfp.parseEl( mfp.index );
 		}
@@ -445,8 +451,11 @@ MagnificPopup.prototype = {
 		var type = item.type;		
 		if(!mfp.currTemplate[type]) {
 			var markup = mfp.st[type] ? mfp.st[type].markup : false;
+
+			// allows to modify markup
+			_mfpTrigger('FirstMarkupParse', markup);
+
 			if(markup) {
-				_mfpTrigger('FirstMarkupParse', markup);
 				mfp.currTemplate[type] = $(markup);
 			} else {
 				// if there is no markup found we just define that template is parsed
@@ -493,7 +502,7 @@ MagnificPopup.prototype = {
 		_mfpTrigger(BEFORE_APPEND_EVENT);
 		mfp.container.addClass('mfp-'+type+'-holder');
 
-		mfp.contentContainer.html(mfp.content);
+		mfp.contentContainer.append(mfp.content);
 	},
 
 
@@ -565,6 +574,7 @@ MagnificPopup.prototype = {
 					
 				e.preventDefault();
 				options.el = $(this);
+				options.mainEl = el;
 				if(options.delegate) {
 					options.items = el.find(options.delegate);
 				}
@@ -1056,7 +1066,9 @@ $.magnificPopup.registerModule('image', {
 				_mfpTrigger('ImageHasSize', item);
 
 				if(item.imgHidden) {
-					mfp.content.removeClass('mfp-loading');
+					if(mfp.content)
+						mfp.content.removeClass('mfp-loading');
+					
 					item.imgHidden = false;
 				}
 
@@ -1361,17 +1373,8 @@ $.magnificPopup.registerModule('gallery', {
 				values.counter = l ? _replaceCurrTotal(gSt.tCounter, item.index, l) : '';
 			});
 
-			_mfpOn(CHANGE_EVENT+ns, function() {
-
-				if(mfp._preloadTimeout) clearTimeout(mfp._preloadTimeout);
-
-				mfp._preloadTimeout = setTimeout(function() {
-					mfp.preloadNearbyImages();
-					mfp._preloadTimeout = null;
-				}, 16);		
-
+			_mfpOn('BuildControls' + ns, function() {
 				if(gSt.arrows && !mfp.arrowLeft) {
-
 					var markup = gSt.arrowMarkup,
 						arrowLeft = mfp.arrowLeft = $( markup.replace('%title%', gSt.tPrev).replace('%dir%', 'left') ).addClass(PREVENT_CLOSE_CLASS),			
 						arrowRight = mfp.arrowRight = $( markup.replace('%title%', gSt.tNext).replace('%dir%', 'right') ).addClass(PREVENT_CLOSE_CLASS);
@@ -1396,6 +1399,15 @@ $.magnificPopup.registerModule('gallery', {
 				}
 			});
 
+			_mfpOn(CHANGE_EVENT+ns, function() {
+				if(mfp._preloadTimeout) clearTimeout(mfp._preloadTimeout);
+
+				mfp._preloadTimeout = setTimeout(function() {
+					mfp.preloadNearbyImages();
+					mfp._preloadTimeout = null;
+				}, 16);		
+			});
+
 
 			_mfpOn(CLOSE_EVENT+ns, function() {
 				_document.off(ns);
@@ -1418,6 +1430,11 @@ $.magnificPopup.registerModule('gallery', {
 			mfp.index = _getLoopedId(mfp.index - 1);
 			mfp.updateItemHTML();
 		},
+		goTo: function(newIndex) {
+			mfp.direction = (newIndex >= mfp.index);
+			mfp.index = newIndex;
+			mfp.updateItemHTML();
+		},
 		preloadNearbyImages: function() {
 			var p = mfp.st.gallery.preload,
 				preloadBefore = Math.min(p[0], mfp.items.length),

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: magnific-popup-rails
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.3
 platform: ruby
 authors:
 - Joshua Jansen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-07 00:00:00.000000000 Z
+date: 2013-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -32,6 +32,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .gitignore
 - Gemfile
 - LICENSE
 - README.md
@@ -40,10 +41,10 @@ files:
 - lib/magnific-popup-rails/engine.rb
 - lib/magnific-popup-rails/version.rb
 - magnific-popup-rails.gemspec
-- vendor/assets/javascripts/magnific-popup-rails/index.js
-- vendor/assets/javascripts/magnific-popup-rails/jquery.magnific-popup.js
-- vendor/assets/stylesheets/magnific-popup-rails/index.css
-- vendor/assets/stylesheets/magnific-popup-rails/magnific-popup.css
+- vendor/assets/javascripts/magnific-popup/index.js
+- vendor/assets/javascripts/magnific-popup/jquery.magnific-popup.js
+- vendor/assets/stylesheets/magnific-popup/index.css
+- vendor/assets/stylesheets/magnific-popup/magnific-popup.css
 homepage: https://github.com/joshuajansen/magnific-popup-rails
 licenses: []
 metadata: {}