nifty-dialog 1.0.6 → 1.0.7

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 8b17c5e6343a7f028a5e4a119869c582c9e80ffe
+  data.tar.gz: 121b62a9505fffb0b83bac28b151716289c2ed64
+SHA512:
+  metadata.gz: 9d1d108df5b7ee2b92351f8745e2217b3f070fb9addbf33b8260ec0dd14ce5a15634740dc5b3faab4a8f768731a9414226949c13829b81378911fc11790f8831
+  data.tar.gz: dcaae9b4c1ffaceced401219c899fb78af4d84d328e8b6c72425ecc6f6fd3f66e98d609fc8c0a0aed3b5467a6af0f6e2d2976d848968579faa42fdb2765e68c0

data/lib/nifty/dialog/version.rb

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

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

@@ -1,15 +1,15 @@
 window.Nifty ||= {}
 window.Nifty.Dialog =
-  
+
   # The numerical ID to start showing dialogs from
   startingID: 1
-  
+
   # A callback reference which is run on content set if set.
   onSetContent: null
-  
+
   # Stores all behaviors
   behaviors: {}
-      
+
   # Open a new dialog which will accept a number of possible options.
   #
   #   id         => the ID to assign to this dialog (prefixed with 'niftyDialog-' )
@@ -39,30 +39,30 @@ window.Nifty.Dialog =
     # set a dialog ID for this dialog
     dialogsOpen = $('div.niftyDialog').length
     dialogID = if dialogsOpen == 0 then this.startingID else (dialogsOpen * 10) + this.startingID
-    
+
     options.id = dialogID unless options.id?
 
     # create a template and assign the ID
-    dialogTemplate = $("<div class='niftyDialog #{options.class}' id='niftyDialog-#{options.id}'></div>")
+    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.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)
     theOverlay.fadeIn('fast')
-    
+
     # if we have a width, set the width for the dialog
     if options.width?
       insertedDialog.css('width', "#{options.width}px")
       insertedDialog.css('margin-left', "-#{options.width / 2}px")
-    
+
     if options.offset?
       insertedDialog.css('margin-top', "#{options.offset}px")
 
@@ -72,9 +72,9 @@ window.Nifty.Dialog =
       insertedDialog.css
         'margin-left': "#{x}px"
         'margin-top': "#{y}px"
-      
 
-    # Set the closing action for the inserted dialog to close dialog 
+
+    # Set the closing action for the inserted dialog to close dialog
     # and fade out the appropriate overlay
     insertedDialog.data 'closeAction', =>
       options.onClose.call(null, insertedDialog, options) if options.onClose?
@@ -85,7 +85,7 @@ window.Nifty.Dialog =
 
     # Set that clicking on the dialog's overlay will close the dialog
     theOverlay.on 'click', -> insertedDialog.data('closeAction').call()
-    
+
     # load in the content
     if options.url?
       # if loading from a URL, do this
@@ -93,14 +93,14 @@ window.Nifty.Dialog =
       insertedDialog.addClass 'loading'
       if options.behavior? && behavior = this.behaviors[options.behavior]
         behavior.beforeLoad.call(null, insertedDialog, options) if behavior.beforeLoad?
-      
+
       $.ajax
         url: options.url
         success: (data)=> this.displayDialog(insertedDialog, data)
-    
+
     else if options.html?
       this.displayDialog(insertedDialog, options.html)
-    
+
     else
       # anything else won't work
       console.log "Dialog could not be displayed. Invalid options passed."
@@ -115,7 +115,7 @@ window.Nifty.Dialog =
     else
       console.log "Must pass a 'name' option to the addBehavior method."
       false
-    
+
   # Complete the opening of a dialog with the given HTML
   displayDialog: (dialog, content)->
     dialog.html(content)
@@ -124,6 +124,7 @@ window.Nifty.Dialog =
     options = dialog.data('options')
     if options.behavior? && behavior = this.behaviors[options.behavior]
       behavior.onLoad.call(null, dialog, options) if behavior.onLoad?
+      behavior.onSetContent.call(null, dialog, options) if behavior.onSetContent?
     options.afterLoad.call(null, dialog) if options.afterLoad?
     this.onSetContent(null, dialog) if this.onSetContent?
 
@@ -149,7 +150,7 @@ window.Nifty.Dialog =
       $.ajax
         url: options.url
         success: (data)=> this.setContent(data, id)
-  
+
   # Create a new overlay
   createOverlay: (options)->
     overlay = $("<div class='niftyOverlay invisible'></div>")
@@ -160,10 +161,10 @@ window.Nifty.Dialog =
       overlay.fadeOut 'fast', ->
         overlay.remove()
     overlay.fadeIn('fast')
-    
+
   # Closes the top dialgo in the dialog stack
   closeTopDialog: ->
     if $('div.niftyDialog').length
       $('div.niftyDialog:last').data('closeAction').call()
-    
-  
+
+

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nifty-dialog
 version: !ruby/object:Gem::Version
-  version: 1.0.6
-  prerelease: 
+  version: 1.0.7
 platform: ruby
 authors:
 - Adam Cooke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-07 00:00:00.000000000 Z
+date: 2014-11-30 00:00:00.000000000 Z
 dependencies: []
 description: A javascript library for working with dialogs
 email:
@@ -18,33 +17,32 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/nifty/dialog/version.rb
 - lib/nifty/dialog.rb
+- lib/nifty/dialog/version.rb
 - vendor/assets/javascripts/nifty/dialog.coffee
 - vendor/assets/stylesheets/nifty/dialog.scss
 homepage: https://github.com/niftyware/dialog
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23.2
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A javascript library for working with dialogs
 test_files: []
 has_rdoc: