lazybox 0.1.3 → 0.1.4

data/README.md

@@ -94,8 +94,8 @@ for options use global lazybox settings:
 
 ###Images
 
-```ruby
-  link_to 'Image', image.url, :rel => :lazybox
+```haml
+  - link_to 'Image', image.url, :rel => :lazybox
 ```
 Include in your `app/assets/javascripts/application.js`:
 
@@ -121,17 +121,18 @@ If there are more than one link to image you can click on image in the lazybox t
 Options
 -------
 
-    overlay:  true|false //default true. Show lazybox overlay.
-    esc:      true|false //default true. Close lazybox on esc press.
-    close:    true|false //default true. Show close lazybox button.
-    modal:    true|false //default true. Close lazybox on overlay click.
-    opacity:  0.6 //default 0.3. Set opacity for lazybox overlay.
-    klass:    'class' // Set class for lazybox. <div id='lazybox' class='class'>...</div>
+    overlay:    true|false //default true. Show lazybox overlay
+    esc:        true|false //default true. Close lazybox on esc press
+    close:      true|false //default true. Show close lazybox button
+    niceClose:  true|false //default true. Show nice close button like in fancybox(IE always shows simple close button)
+    modal:      true|false //default true. Close lazybox on overlay click
+    opacity:    0.6 //default 0.3. Set opacity for lazybox overlay
+    klass:      'class' // Set class for lazybox. <div id='lazybox' class='class'>...</div>
     //confirmation options
-    cancelText: //default 'Cancel'. Cancel button text.
-    submitText: //default 'Ok'. Confirm button text.
-    cancelClass: //default 'button'. Cancel button class.
-    submitClass: //default 'button'. Confirm button class.
+    cancelText:   //default 'Cancel'. Cancel button text
+    submitText:   //default 'Ok'. Confirm button text
+    cancelClass:  //default 'button'. Cancel button class
+    submitClass:  //default 'button'. Confirm button class
 
 Events
 ------
@@ -139,8 +140,8 @@ Events
     $.lazybox.show()
     $.lazybox.close()
     $.lazybox.center()
-    $(document).trigger('close.lazybox')
-    $(document).trigger('center.lazybox')
+    $(document).trigger('close.lazybox') //Will be deprecated in next version.  Use $.lazybox.close()
+    $(document).trigger('center.lazybox') //Will be deprecated in next version.  Use $.lazybox.center()
 
 
 Browser Compatibility

data/lib/lazybox/version.rb

@@ -1,3 +1,3 @@
 module Lazybox
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/vendor/assets/javascripts/lazybox.js

@@ -1,5 +1,5 @@
 (function($){
-  var defaults = {overlay: true, esc: true, close: true, modal: true, opacity: 0.3, cancelText: 'Cancel', cancelClass: 'button', submitText: 'Ok', submitClass: 'button'}
+  var defaults = {overlay: true, esc: true, close: true, niceClose: true, modal: true, opacity: 0.3, cancelText: 'Cancel', cancelClass: 'button', submitText: 'Ok', submitClass: 'button'}
   $.lazybox = function(html){ $.lazybox.show(html) }
   $.extend($.lazybox, {
     settings: $.extend({}, defaults),
@@ -35,11 +35,9 @@
       if (href.match(imagesRegexp)){
         var img = new Image()
         img.onload = function(element){
-          $.lazybox.show('<img title="Click to see next image" src="' + img.src + '" />', options)
-          $('#lazybox img').bind('click', function(){
-            (a.is(':last-child')) ? nextLink = a.siblings('a[rel*=lazybox]:first') : nextLink = a.next('a[rel*=lazybox]:first')
-            $('#lazybox').fadeOut(function(){ nextLink.click() })
-          })
+          $.lazybox.show('<img class="lazy_img" src="' + img.src + '" />', options)
+          nextLink = a.siblings('a[rel*=lazybox]:first') || a.next('a[rel*=lazybox]:first')
+          if (!nextLink.length == 0) $('#lazybox img').bind('click', function(){ $('#lazybox').fadeOut(function(){ nextLink.click() }) })
         }
         img.src = href
       } else $.ajax({url: href, success: function(data){ $.lazybox.show(data, options) }, error: function(){ $.lazybox.close() }})
@@ -48,22 +46,21 @@
 
   function init(options){
     var options = $.extend($.extend({}, defaults), $.lazybox.settings, options)
-    $('body:not(:has(#lazybox))').append("<div id='lazybox'><div id='lazybox_body'></div></div>")
     if (options.overlay) {
       $('body:not(:has(#lazybox_overlay))').append("<div id='lazybox_overlay'></div>")
-      $('#lazybox_overlay').css({filter: 'alpha(opacity='+options.opacity*100+')', opacity: options.opacity})
-      $('#lazybox_overlay').fadeIn(500)
+      $('#lazybox_overlay').css({filter: 'alpha(opacity='+options.opacity*100+')', opacity: options.opacity}).fadeIn(500)
     }
+    $('body:not(:has(#lazybox))').append("<div id='lazybox'><div id='lazybox_body'></div></div>")
     if (options.klass) { $('#lazybox').removeClass().addClass(options.klass) } else { $('#lazybox').removeClass() }
     if (options.close) {
       $('#lazybox:not(:has(#lazybox_close))').prepend($("<a id='lazybox_close' title='close'>×</a>"))
-      if ($.browser.msie) $('#lazybox_close').addClass('ie')
+      if (!$.browser.msie && options.niceClose) $('#lazybox_close').addClass('nice')
     } else $('#lazybox_close').remove()
     if (!options.modal && options.overlay) { $('#lazybox_overlay').bind('click', function(){ $.lazybox.close() }) } else { $('#lazybox_overlay').unbind() }
     $(document).keyup(function(e) { if (e.keyCode == 27 && options.esc) $.lazybox.close() })
     $('#lazybox_close, #lazybox_body .lazy_buttons a').live('click', function(e){ $.lazybox.close(); e.preventDefault() })
   }
 
-  $(document).bind('close.lazybox', function(){ $.lazybox.close() })
-  $(document).bind('center.lazybox', function(){ $.lazybox.center() })
+  $(document).bind('close.lazybox', function(){ $.lazybox.close(); console.warn('will be deprecated') })
+  $(document).bind('center.lazybox', function(){ $.lazybox.center(); console.warn('will be deprecated') })
 })(jQuery);

data/vendor/assets/stylesheets/lazybox.css

@@ -25,34 +25,36 @@
 }
 
 a#lazybox_close {
+  background: transparent;
+  border: none;
+  color: gray;
+  cursor: pointer;
+  font: bold 26px/100% Arial, Helvetica, sans-serif !important;
+  height: 25px;
+  position: absolute;
+  right: 0;
+  text-align: center;
+  top: 0;
+  width: 25px;
+}
+
+a#lazybox_close:hover { color: black; }
+
+a#lazybox_close.nice {
   background: black;
   border: 2px solid white;
   border-radius: 20px;
   box-shadow: 0 1px 5px #333;
   color: white;
-  cursor: pointer;
-  font: bold 26px/100% Arial, Helvetica, sans-serif !important;
-  height: 25px;
-  position: absolute;
   right: -17px;
-  text-align: center;
   top: -17px;
-  width: 25px;
   -moz-border-radius: 20px;
   -moz-box-shadow: 0 1px 5px #333;
   -webkit-box-shadow: 0 1px 5px #333;
 }
+a#lazybox_close.nice:hover { background: white; border-color: black; color: black; }
 
-a#lazybox_close:hover { background: white; border-color: black; color: black; }
-
-a#lazybox_close.ie {
-  background: transparent;
-  border: none;
-  color: gray;
-  right: 0;
-  top: 0;
-}
+img.lazy_img { cursor: pointer; }
 
-a#lazybox_close.ie:hover { color: black; }
 #lazybox .lazy_buttons { margin-top: 15px; text-align: right; }
 #lazybox.confirm { max-width: 300px; }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: lazybox
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Alex Galushka
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-26 00:00:00 Z
+date: 2012-03-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails