lazybox 0.2.3 → 0.2.4

data/README.md

@@ -3,7 +3,7 @@ LazyBox
 
 [Live Demo](http://lazybox.herokuapp.com/)
 
-[Demo Source](https://github.com/alex-galushka/lazybox_demo)
+[Demo Source](https://github.com/galulex/lazybox_demo)
 
 Lazybox is a jQuery-based, lightbox that can display entire remote pages, images and confirmation dialogs.
 Replace standard rails confirmations with lazybox just added several rows to your project. Use lazybox with rails assets pipeline.

data/lib/lazybox/version.rb

@@ -1,3 +1,3 @@
 module Lazybox
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

data/vendor/assets/javascripts/lazybox.js.coffee

@@ -34,7 +34,7 @@
 
     close: (speed) ->
       speed = speed || defaults.speed
-      effect = if box.position().top == 0 then 'slideUp' else 'fadeOut'
+      effect = if (box.position().top - window.scrollY == 0) then 'slideUp' else 'fadeOut'
       box[effect](speed)
       overlay.fadeOut(speed+200)
 
@@ -69,9 +69,13 @@
         img.onload = (element) ->
           options = $.lazybox.show(img, options)
           nextLink = if a.is(':last-child') then a.siblings('a[rel*=lazybox]:first') else a.next('a[rel*=lazybox]:first')
-          if nextLink.length != 0
-            $('#lazybox img').bind 'click', () =>
-              box.fadeOut(options.speed, () -> nextLink.click())
+          prevLink = if a.is(':first-child') then a.siblings('a[rel*=lazybox]:last') else a.prev('a[rel*=lazybox]:first')
+          if nextLink.length and prevLink.length
+            $('#lazybox_body:not(:has(a#next_lazy_img))').append("<a id='prev_lazy_img' href=''><b>‹</b></a><a id='next_lazy_img' href=''><b>›</b></a>")
+            $('#next_lazy_img, #prev_lazy_img').bind 'click', (event) ->
+              event.preventDefault()
+              box.fadeOut options.speed, () ->
+                if event.currentTarget.id == 'next_lazy_img' then nextLink.click() else prevLink.click()
         $(img).attr({ 'class': 'lazy_img', src: href })
       else
         $.ajax({

data/vendor/assets/javascripts/lazybox.js.js

@@ -1,3 +1,4 @@
+// Generated by CoffeeScript 1.4.0
 (function() {
 
   (function($) {
@@ -38,7 +39,7 @@
       close: function(speed) {
         var effect;
         speed = speed || defaults.speed;
-        effect = box.position().top === 0 ? 'slideUp' : 'fadeOut';
+        effect = box.position().top - window.scrollY === 0 ? 'slideUp' : 'fadeOut';
         box[effect](speed);
         return overlay.fadeOut(speed + 200);
       },
@@ -46,7 +47,9 @@
         var y;
         if (fixed) {
           y = onTop ? 0 : (box.outerHeight()) / 2;
-          if (y < 20 && !onTop) y = 20;
+          if (y < 20 && !onTop) {
+            y = 20;
+          }
           return box.css({
             'margin-left': -box.outerWidth() / 2,
             'margin-top': -y,
@@ -56,7 +59,9 @@
           });
         } else {
           y = onTop ? 0 : (($(window).height() - $('#lazybox').outerHeight()) / 2) + $(window).scrollTop();
-          if (y < 20 && !onTop) y = 20;
+          if (y < 20 && !onTop) {
+            y = 20;
+          }
           return box.css({
             top: y,
             left: (($(window).width() - box.outerWidth()) / 2) + $(window).scrollLeft(),
@@ -69,7 +74,9 @@
         var message, options;
         options = $.extend(defaults, $.lazybox.settings);
         message = element.data('confirm');
-        if (!message) return true;
+        if (!message) {
+          return true;
+        }
         $.lazybox.show('<p>' + message + '</p><div class="lazy_buttons"></div>', {
           klass: 'confirm'
         });
@@ -94,14 +101,20 @@
         if (href.match(imagesRegexp)) {
           img = new Image();
           img.onload = function(element) {
-            var nextLink,
-              _this = this;
+            var nextLink, prevLink;
             options = $.lazybox.show(img, options);
             nextLink = a.is(':last-child') ? a.siblings('a[rel*=lazybox]:first') : a.next('a[rel*=lazybox]:first');
-            if (nextLink.length !== 0) {
-              return $('#lazybox img').bind('click', function() {
+            prevLink = a.is(':first-child') ? a.siblings('a[rel*=lazybox]:last') : a.prev('a[rel*=lazybox]:first');
+            if (nextLink.length && prevLink.length) {
+              $('#lazybox_body:not(:has(a#next_lazy_img))').append("<a id='prev_lazy_img' href=''><b>‹</b></a><a id='next_lazy_img' href=''><b>›</b></a>");
+              return $('#next_lazy_img, #prev_lazy_img').bind('click', function(event) {
+                event.preventDefault();
                 return box.fadeOut(options.speed, function() {
-                  return nextLink.click();
+                  if (event.currentTarget.id === 'next_lazy_img') {
+                    return nextLink.click();
+                  } else {
+                    return prevLink.click();
+                  }
                 });
               });
             }
@@ -160,7 +173,9 @@
         overlay.unbind();
       }
       $(document).keyup(function(e) {
-        if (e.keyCode === 27 && options.esc) return $.lazybox.close(options.speed);
+        if (e.keyCode === 27 && options.esc) {
+          return $.lazybox.close(options.speed);
+        }
       });
       box.on('click', '#lazybox_close, .lazy_buttons a', function(e) {
         $.lazybox.close(options.speed);

data/vendor/assets/stylesheets/lazybox.css.scss

@@ -22,14 +22,15 @@
   z-index: 1001;
   &.confirm { max-width: 300px; }
   .lazy_buttons { margin-top: 15px; text-align: right; }
-  img.lazy_img { cursor: pointer; }
+  img.lazy_img { display: block; }
+  #lazybox_body { position: relative; }
 }
 
 a#lazybox_close {
   background: transparent;
   color: gray;
   cursor: pointer;
-  font: bold 26px/100% Arial, Helvetica, sans-serif !important;
+  font: bold 26px/100% Arial, Helvetica, sans-serif;
   height: 25px;
   position: absolute;
   right: 0;
@@ -38,3 +39,28 @@ a#lazybox_close {
   width: 25px;
   &:hover { color: black; }
 }
+
+a#prev_lazy_img, a#next_lazy_img {
+  background: rgba(0, 0, 0, 0);
+  height: 100%;
+  outline: none;
+  position: absolute;
+  top: 0;
+  text-decoration: none;
+  width: 33px;
+  &:hover {
+    background: rgba(0, 0, 0, 0.3);
+    b { opacity: 0.8; }
+  }
+  b {
+    color: whiteSmoke;
+    font: bold 96px/100% Arial, Helvetica, sans-serif;
+    height: 100px;
+    opacity: 0.3;
+    position: absolute;
+    top: 50%;
+    margin-top: -50px;
+  }
+}
+
+a#next_lazy_img { right: 0; }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lazybox
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-09 00:00:00.000000000 Z
+date: 2012-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &19446660 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: '3.1'
   type: :development
   prerelease: false
-  version_requirements: *19446660
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &19446240 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +37,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19446240
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Lazybox is a jQuery-based, lightbox that can display entire remote pages,
   images and confirmation dialogs. Replace standard rails confirmations with lazybox
   just added several rows to your project. Use lazybox with rails assets pipeline.
@@ -45,8 +55,8 @@ files:
 - README.md
 - lib/lazybox.rb
 - lib/lazybox/version.rb
-- vendor/assets/javascripts/lazybox.js.coffee
 - vendor/assets/javascripts/lazybox.js.js
+- vendor/assets/javascripts/lazybox.js.coffee
 - vendor/assets/stylesheets/lazybox.css.scss
 homepage: https://github.com/galulex/lazybox
 licenses: []
@@ -68,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Use LazyBox for popup windows with Rails