unpoly-rails 0.31.2 → 0.32.0

data/spec_app/spec/javascripts/up/modal_spec.js.coffee

@@ -2,7 +2,7 @@ describe 'up.modal', ->
 
   u = up.util
   
-  describe 'Javascript functions', ->
+  describe 'JavaScript functions', ->
 
     assumedScrollbarWidth = 15
 
@@ -352,7 +352,7 @@ describe 'up.modal', ->
         Trigger.click(@$link)
         expect(@followSpy).toHaveBeenCalledWith(@$link)
 
-      # IE does not call Javascript and always performs the default action on right clicks
+      # IE does not call JavaScript and always performs the default action on right clicks
       unless navigator.userAgent.match(/Trident/)
         it 'does nothing if the right mouse button is used', ->
           @stubFollow()
@@ -392,7 +392,7 @@ describe 'up.modal', ->
           Trigger.click(@$link)
           expect(@followSpy).not.toHaveBeenCalled()
 
-        # IE does not call Javascript and always performs the default action on right clicks
+        # IE does not call JavaScript and always performs the default action on right clicks
         unless navigator.userAgent.match(/Trident/)
           it 'does nothing if the right mouse button is pressed down', ->
             Trigger.mousedown(@$link, button: 2)

data/spec_app/spec/javascripts/up/motion_spec.js.coffee

@@ -2,7 +2,7 @@ describe 'up.motion', ->
 
   u = up.util
   
-  describe 'Javascript functions', ->
+  describe 'JavaScript functions', ->
   
     describe 'up.animate', ->
 

data/spec_app/spec/javascripts/up/popup_spec.js.coffee

@@ -2,7 +2,7 @@ describe 'up.popup', ->
 
   u = up.util
 
-  describe 'Javascript functions', ->
+  describe 'JavaScript functions', ->
 
     describe 'up.popup.attach', ->
 
@@ -164,7 +164,7 @@ describe 'up.popup', ->
         Trigger.click(@$link)
         expect(@attachSpy).toHaveBeenCalledWith(@$link)
 
-      # IE does not call Javascript and always performs the default action on right clicks
+      # IE does not call JavaScript and always performs the default action on right clicks
       unless navigator.userAgent.match(/Trident/)
         it 'does nothing if the right mouse button is used', ->
           @stubAttach()
@@ -228,7 +228,7 @@ describe 'up.popup', ->
           Trigger.click(@$link)
           expect(@attachSpy).not.toHaveBeenCalled()
 
-        # IE does not call Javascript and always performs the default action on right clicks
+        # IE does not call JavaScript and always performs the default action on right clicks
         unless navigator.userAgent.match(/Trident/)
           it 'does nothing if the right mouse button is pressed down', ->
             Trigger.mousedown(@$link, button: 2)
@@ -276,6 +276,24 @@ describe 'up.popup', ->
             expect(backgroundClicked).not.toHaveBeenCalled()
             done()
 
+      describe 'when clicked inside a popup when a modal is open', ->
+
+        it 'closes the popup, but not the modal', (done) ->
+
+          up.modal.extract '.modalee', '<div class="modalee"></div>'
+          $modalee = $('.up-modal .modalee')
+          $opener = $modalee.affix('a')
+          up.popup.attach($opener, html: '<div class="popupee">text</div>', target: '.popupee')
+          $popupee = $('.up-popup .popupee')
+          $closer = $popupee.affix('a[up-close]') # link is within the popup
+          up.hello($closer)
+          Trigger.clickSequence($closer)
+          u.nextFrame ->
+            expect(up.popup.isOpen()).toBe(false)
+            expect(up.modal.isOpen()).toBe(true)
+            expect(backgroundClicked).not.toHaveBeenCalled()
+            done()
+
       describe 'when no popup is open', ->
 
         it 'does nothing and allows the event chain to continue', (done) ->

data/spec_app/spec/javascripts/up/proxy_spec.js.coffee

@@ -2,7 +2,7 @@ describe 'up.proxy', ->
 
   u = up.util
 
-  describe 'Javascript functions', ->
+  describe 'JavaScript functions', ->
 
     beforeEach ->
       jasmine.clock().install()

data/spec_app/spec/javascripts/up/syntax_spec.js.coffee

@@ -1,6 +1,6 @@
 describe 'up.syntax', ->
   
-  describe 'Javascript functions', ->
+  describe 'JavaScript functions', ->
   
     describe 'up.compiler', ->
       

data/spec_app/spec/javascripts/up/tooltip_spec.js.coffee

@@ -2,7 +2,7 @@ describe 'up.tooltip', ->
 
   u = up.util
 
-  describe 'Javascript functions', ->
+  describe 'JavaScript functions', ->
     
     describe 'up.tooltip.attach', ->
       

data/spec_app/spec/javascripts/up/util_spec.js.coffee

@@ -2,7 +2,7 @@ describe 'up.util', ->
 
   u = up.util
 
-  describe 'Javascript functions', ->
+  describe 'JavaScript functions', ->
 
     describe 'up.util.previewable', ->
 
@@ -229,7 +229,7 @@ describe 'up.util', ->
           up.util.setTimer(0, callback)
           expect(callback).toHaveBeenCalled()
 
-        it "returns undefined so the return value won't be mistaken with a Javascript timer ID", ->
+        it "returns undefined so the return value won't be mistaken with a JavaScript timer ID", ->
           callback = -> 'function return value'
           timerReturnValue = up.util.setTimer(0, callback)
           expect(timerReturnValue).toBeUndefined()

data/spec_app/vendor/assets/bower_components/jasmine-jquery/README.md

@@ -276,7 +276,7 @@ By default, fixtures are loaded from `spec/javascripts/fixtures/json`. You can c
 
 Your fixture data is loaded into an object stashed by the JSONFixtures structure.  You fetch the data using the filename as the key.  This allows you to load multiple chunks of test data in a spec.
 
-Because a deep copy of Javascript objects can be a little tricky, this module will refetch data each time you call `load`.  If you modify the data within a spec, you must call `load` or `loadJSONFixtures` again to repopulate the data.
+Because a deep copy of JavaScript objects can be a little tricky, this module will refetch data each time you call `load`.  If you modify the data within a spec, you must call `load` or `loadJSONFixtures` again to repopulate the data.
 
 To invoke fixture related methods, obtain Fixtures singleton through a factory and invoke a method on it:
 
@@ -356,7 +356,7 @@ Under Windows 7, you have to launch `C:\Users\[UserName]\AppData\Local\Google\Ch
 
 [jasmine-ajax](https://github.com/jasmine/jasmine-ajax) library doesn't let user to manually start / stop XMLHttpRequest mocking, but instead it overrides XMLHttpRequest automatically when loaded. This breaks jasmine-jquery fixtures as fixture loading mechanism uses jQuery.ajax, that stops to function the very moment jasmine-ajax is loaded. A workaround for this may be to invoke jasmine-jquery `preloadFixtures` function (specifying all required fixtures) before jasmine-ajax is loaded. This way subsequent calls to `loadFixtures` or `readFixtures` methods will get fixtures content from cache, without need to use jQuery.ajax and thus will work correctly even after jasmine-ajax is loaded.
 
-## Testing with Javascript Test Driver
+## Testing with JavaScript Test Driver
 
 When using [jstd](http://code.google.com/p/js-test-driver/) and the jasmine adapter you will need to include jasmine-jquery.js after your jasmine-jstd-adapter files, otherwise jasmine-jquery matchers will not be available when tests are executed. Check out [this issue](https://github.com/velesin/jasmine-jquery/issues/95#issuecomment-9293180) for a thorough configuration example too.
 

data/unpoly-rails.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   spec.version       = Unpoly::Rails::VERSION
   spec.authors       = ["Henning Koch"]
   spec.email         = ["henning.koch@makandra.de"]
-  spec.description   = 'Rails bindings for Unpoly, the progressive enhancement Javascript framework'
+  spec.description   = 'Rails bindings for Unpoly, the unobtrusive JavaScript framework'
   spec.summary       = spec.description
   spec.homepage      = ""
   spec.license       = "MIT"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unpoly-rails
 version: !ruby/object:Gem::Version
-  version: 0.31.2
+  version: 0.32.0
 platform: ruby
 authors:
 - Henning Koch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-17 00:00:00.000000000 Z
+date: 2017-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -52,7 +52,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Rails bindings for Unpoly, the progressive enhancement Javascript framework
+description: Rails bindings for Unpoly, the unobtrusive JavaScript framework
 email:
 - henning.koch@makandra.de
 executables: []
@@ -159,6 +159,7 @@ files:
 - spec_app/app/models/concerns/.keep
 - spec_app/app/views/css_test/modal.erb
 - spec_app/app/views/css_test/modal_contents.erb
+- spec_app/app/views/css_test/modal_contents_wide.erb
 - spec_app/app/views/css_test/popup.erb
 - spec_app/app/views/css_test/popup_contents.erb
 - spec_app/app/views/css_test/tooltip.erb
@@ -446,5 +447,5 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: Rails bindings for Unpoly, the progressive enhancement Javascript framework
+summary: Rails bindings for Unpoly, the unobtrusive JavaScript framework
 test_files: []