nifty-dialog 1.0.7 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b17c5e6343a7f028a5e4a119869c582c9e80ffe
-  data.tar.gz: 121b62a9505fffb0b83bac28b151716289c2ed64
+  metadata.gz: 94f066df26a586231cbedd7d4986e6ea9d0b6178
+  data.tar.gz: 4d6857df30c08175a381e96dc5efcfc80b429663
 SHA512:
-  metadata.gz: 9d1d108df5b7ee2b92351f8745e2217b3f070fb9addbf33b8260ec0dd14ce5a15634740dc5b3faab4a8f768731a9414226949c13829b81378911fc11790f8831
-  data.tar.gz: dcaae9b4c1ffaceced401219c899fb78af4d84d328e8b6c72425ecc6f6fd3f66e98d609fc8c0a0aed3b5467a6af0f6e2d2976d848968579faa42fdb2765e68c0
+  metadata.gz: a127632d0ab5a6293c6f84839eae771bb3b49bf3f32cdad3f6865f18f28a23ae5548ab2b839868d17378811f5bf5ae126158dccb6362055d62a7562eb90f1b3d
+  data.tar.gz: 7fc98d090a9bb77c28a5864ec6aef18f193753dbe0075aea41cc2c6fc0ae5f9ff5a52665fcd0f190ac9c25378123974515df25c89f0aa2c895e2248cf925ad90

data/lib/nifty/dialog/version.rb

@@ -1,5 +1,5 @@
 module Nifty
   module Dialog
-    VERSION = '1.0.7'
+    VERSION = '1.1.0'
   end
 end

data/vendor/assets/javascripts/nifty/dialog.coffee

@@ -42,20 +42,24 @@ window.Nifty.Dialog =
 
     options.id = dialogID unless options.id?
 
+    # Add the overlay
+    overlayClass = ''
+    overlayClass = 'invisible' if dialogID > 1
+    theOverlay = $("<div class='niftyOverlay #{overlayClass}'></div>").appendTo($('body')).css('z-index', 2000 + dialogID - 1)
+
     # create a template and assign the ID
     dialogTemplate = $("<div class='niftyDialog #{options.class || ''}' id='niftyDialog-#{options.id}'></div>")
     dialogTemplate.data('dialogID', dialogID)
 
     # insert the dialog into the page
-    insertedDialog = dialogTemplate.appendTo($('body'))
+    insertedDialog = dialogTemplate.appendTo(theOverlay)
     insertedDialog.css('z-index', 2000 + dialogID)
 
     # set the content on the dialog
     insertedDialog.data('options', options)
 
-    overlayClass = ''
-    overlayClass = 'invisible' if dialogID > 1
-    theOverlay = $("<div class='niftyOverlay #{overlayClass}'></div>").insertBefore(insertedDialog).css('z-index', 2000 + dialogID - 1)
+    # fade the overlay
+    $('body').addClass('niftyDialog-open')
     theOverlay.fadeIn('fast')
 
     # if we have a width, set the width for the dialog
@@ -81,10 +85,16 @@ window.Nifty.Dialog =
       if options.behavior? && behavior = this.behaviors[options.behavior]
         behavior.onClose.call(null, insertedDialog, options) if behavior.onClose?
       insertedDialog.fadeOut 'fast', -> insertedDialog.remove()
-      theOverlay.fadeOut 'fast', -> theOverlay.remove()
+      theOverlay.fadeOut 'fast', ->
+        theOverlay.remove()
+        if $('.niftyOverlay').length == 0
+          $('body').removeClass('niftyDialog-open')
+
 
     # Set that clicking on the dialog's overlay will close the dialog
-    theOverlay.on 'click', -> insertedDialog.data('closeAction').call()
+    theOverlay.on 'click', (e)->
+      if $(e.target).is('.niftyOverlay')
+        insertedDialog.data('closeAction').call()
 
     # load in the content
     if options.url?

data/vendor/assets/stylesheets/nifty/dialog.scss

@@ -6,10 +6,12 @@ div.niftyOverlay {
   background:rgba(0,0,0,0.5);
   top:0;
   left:0;
-  width:100%;
-  height:4000px;
+  right:0;
+  bottom:0;
   display:none;
   z-index:50;
+  overflow-y: scroll;
+
 }
 
 //
@@ -19,17 +21,19 @@ div.niftyOverlay.invisible {
   background:transparent;
 }
 
+body.niftyDialog-open {
+  overflow-y: hidden;
+}
+
 //
 // Dialog
 //
 div.niftyDialog {
   display:none;
-  position:fixed;
-  top:50%;
-  top:100px;
-  left:50%;
-  margin-left:-250px;
+  position:relative;
   width:500px;
+  margin:100px auto;
+  margin-bottom: 100px !important;
   background:#fff;
   box-shadow:0 0 70px rgb(0,0,0);
   h2 {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nifty-dialog
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.1.0
 platform: ruby
 authors:
 - Adam Cooke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-30 00:00:00.000000000 Z
+date: 2014-12-01 00:00:00.000000000 Z
 dependencies: []
 description: A javascript library for working with dialogs
 email: