da-js 1.2.1 → 1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ce2526b33932c7db329c1ba4cea698420694b9752a608b7471501379531be6a
-  data.tar.gz: 4c189b4f3a79d7c618d9b73c8ae98aa98992dc1b5425375b1651a3969979e042
+  metadata.gz: 297d35e3613edee0251be3530d2d5d5d22fe2d94a87d39b0e074a5321799fe28
+  data.tar.gz: 685474146d93ba5bc47c580e266808aae53d00e4ddfbc7c9074f96e14af95c12
 SHA512:
-  metadata.gz: 6052c825693cb2864d71207106a13c024683ee1a9035e145420d59263706ae1164a1798bf874a1411a0a3edcb68dbab5343234f38e488179df084d26e0f7176e
-  data.tar.gz: 55341ecbc4165e14ce29d08ecc403143ee9ba2025915eadbf2c595f3fd98bec16da8ca71148b958925df92d46623f99002ae6a4209925b073040d69a65b2a0a6
+  metadata.gz: 6e11b743b1a5ce9e4ad29e05e7500d6816137b48563448c0e8ca98ba195ef68dbf149173ef026518e3128ac7e6b83543a23994bd605b577266758cfd3fde714a
+  data.tar.gz: 5668570bda4bde3f9e1bcb522c0d2e4c9a97669c89cb344f3ca0b95d9094937c89cb68850be37323e992c7089995ead6ea0bc0404bb41c058dd843d716c2ec17

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## Version 1.3
+### Conditional Visibility
+* After visibility has been recalculated for all elememtn, a `updated.conditionalVisibility` event is triggered.
+
 ## Version 1.2.1
 * Relax gemspec version requirements: Can now be used with Rails 6.
 

data/Rakefile

@@ -1,8 +1 @@
 require "bundler/gem_tasks"
-
-require 'cucumber'
-require 'cucumber/rake/task'
-
-Cucumber::Rake::Task.new(:test) do |t|
-  t.cucumber_opts = "features --format progress"
-end

data/da-js.gemspec

@@ -18,14 +18,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency "railties", ">= 3.1.0", "< 7"
+  s.add_dependency "railties", ">= 3.1.0"
   s.add_dependency "sprockets"
   s.add_dependency "coffee-script"
-
-  s.add_development_dependency "cucumber", "~> 1.3"
-  s.add_development_dependency "rspec-expectations", "~> 2.7"
-  s.add_development_dependency "sinatra", "~> 1.4"
-  s.add_development_dependency "sinatra-contrib"
-  s.add_development_dependency "capybara-webkit", "~> 1.3"
-  s.add_development_dependency "launchy"
 end

data/lib/assets/javascripts/da-js/conditional_visibility.js.coffee

@@ -1,40 +1,40 @@
 # Hide/show elements dynamically according to their `data-visible-if` attribute.
 #
 # All elements with a `data-visible-if` attribute are checked on change, focusout and click events:
-# For each element, the content of its `data-visible-if` attribute is eval'd. If the eval'd code 
+# For each element, the content of its `data-visible-if` attribute is eval'd. If the eval'd code
 # returns true, the element is shown – otherwise it is hidden. (The attribute must contain valid
 # JavaScript code.)
 #
-# Use `$("body").conditionalVisibility()` to enable the functionality for the whole document, 
-# or use a more specific selector to enable it only for some elements. 
+# Use `$("body").conditionalVisibility()` to enable the functionality for the whole document,
+# or use a more specific selector to enable it only for some elements.
 #
 # The following options can be specified when initializing the plugin:
-# 
-#   - `events`: The events which should trigger re-evaluation of visibilities (default: 
+#
+#   - `events`: The events which should trigger re-evaluation of visibilities (default:
 #     `"change focusout click"`)
 #
 #   - `animate`: If elements should be shown/hidden using animations (default: `true`).
-# 
+#
 # There are two ways to manually force re-evaluation of visibilities:
 #
 #   - `$(…).trigger("updateVisibilities")` updates visibilities (using animations) and then triggers
 #     `shown.conditionalVisibility` / `hidden.conditionalVisibility` events accordingly.
-# 
-#   - `$(…).trigger("setVisibilities")` sets visibilities directly (no animations, does not trigger 
+#
+#   - `$(…).trigger("setVisibilities")` sets visibilities directly (no animations, does not trigger
 #     custom events). This is already called automatically on pageready. You may want to call this
-#     manually after new elements have been added to the DOM (eg a modal with content fetched via 
+#     manually after new elements have been added to the DOM (eg a modal with content fetched via
 #     ajax).
-# 
-# The current state of an element with conditional visibility can be queried using 
+#
+# The current state of an element with conditional visibility can be queried using
 # `$(...).data('visible-if-state')`, which returns either `'visible'` or `'hidden'`. This differs
 # from using jQuery’s `:visible` or `:hidden` pseude-selectors on the element in that it has
 # immediate effect, even if animations are used: When an element changes from being visible to being
 # hidden, it is still `:visible` in the jQuery sense until the animation has completed. However,
-# `data('visible-if-state')` will return `'hidden'` immediately after the evaluation of the 
+# `data('visible-if-state')` will return `'hidden'` immediately after the evaluation of the
 # visibility condition.
 #
 # Example:
-# 
+#
 #   <form id="myform">
 #     <input id="checkbox" type="checkbox" >
 #     <input id="text" data-visible-if="$('#checkbox')[0].checked">
@@ -44,12 +44,12 @@
 #   </script>
 
 $.fn.conditionalVisibility = (options = {}) ->
-    defaults = 
+    defaults =
       animate: true
       events: "change focusout click"
-    
+
     options = $.extend({}, defaults, options)
-      
+
     updateVisibilities = (event) ->
       $(this).find("[data-visible-if]").each ->
         $this = $(this)
@@ -58,22 +58,21 @@ $.fn.conditionalVisibility = (options = {}) ->
           if $this.is(":hidden")
             if options.animate then $this.slideDown(100) else $this.show()
             $this.promise().done -> $this.trigger("shown.conditionalVisibility")
-        else 
+        else
           $(this).data("visible-if-state", "hidden")
           if $this.is(":visible")
             if options.animate then $this.slideUp(100) else $this.hide()
             $this.promise().done -> $this.trigger("hidden.conditionalVisibility")
-    
+      $(this).trigger("updated.conditionalVisibility")
+
     setVisibilities = (event) ->
       $(this).find("[data-visible-if]").each ->
         $this = $(this)
         isVisible = !!eval($this.data("visible-if"))
         $(this).data("visible-if-state", if isVisible then "visible" else "hidden")
         $this.toggle isVisible
-    
+
     this
       .on "#{options.events} updateVisibilities", updateVisibilities
       .on "setVisibilities", setVisibilities
       .trigger "setVisibilities"
-
-  

data/lib/assets/javascripts/da-js/form_change_tracker.js

@@ -1,15 +1,15 @@
 (function( $ ) {
   // Track changes to form fields accordingly set/reset CSS class "changed".
   //
-  // Usage: 
+  // Usage:
   //     $("#myform").formChangeTracker();
   //
   // If the form element is wrapped in an element with the class "field" (rails scaffold) or "input" (formtastic), the class "changed" is set/reset on this wrapper element. Otherwise, "changed" is set/reset on the form element itself and its label (if present).
-  
+
   $.fn.formChangeTracker = function() {
 
     var elementSelector = "input[type!=hidden],textarea,select";
-  
+
     return this.each(function() {
 
       var form = $(this);
@@ -26,7 +26,7 @@
         if (element.type == "checkbox" || element.type == "radio") return element.checked;
         return $(element).val();
       }
-      
+
       function updateStatus(event, ignoreOtherRadiobuttons) {
         var targets = targetsForElement(this);
 
@@ -35,7 +35,7 @@
         } else {
           targets.removeClass('changed');
         }
-    
+
         // For radiobuttons, if there is no container, also update all other radiobuttons of the same group
         if (this.type == "radio" && !ignoreOtherRadiobuttons && targets.index(this) != -1) {
           form.find("input[type=radio][name='" + this.name + "']").each(function() {
@@ -47,15 +47,15 @@
       function elementHasChanged(element) {
         return valueFor(element) !== $(element).data("initialValue");
       }
-  
+
       // Return the element(s) on that the "changed" class should be set/removed.
       function targetsForElement(element) {
         // use wrapping element with class .field or .input (formtastic) if present ...
         var targets = $(element).closest("form .field, form .input");
-    
+
         // ... or fallback to the form element itself (and its label)
         if (targets.length == 0) targets = $(element).add("label[for=" + element.id + "]");
-    
+
         return targets;
       }
 

data/lib/assets/javascripts/da-js/numeric_value.js.coffee

@@ -1,6 +1,6 @@
 # Like val(), but return the value parsed as float (or 0, if the value is not numeric). Also works for non-input elements (using the element's text content as value).
 #
-# Thousands delimiters (",") are handled correctly. 
+# Thousands delimiters (",") are handled correctly.
 # German thousands delimiters (".") and separators (",") are handled correctly if the lang attribute of the input element (or any of its parent elements) is set to "de".
 #
 # Options:
@@ -8,13 +8,13 @@
 #   nullOnError: If true, null is returned (instead of 0) if the value is not numeric.
 
 $.fn.numericValue = (options = {}) ->
-  
+
   delocalize = (val, locale) ->
     if locale == "de"
       val.replace(".", "").replace(",", ".")
     else
       val.replace(",", "")
-  
+
   $this = $(this)
   locale = $this.closest("[lang]").attr("lang")
   val = if $this.is(":input") then $this.val() else $this.text()

data/lib/assets/javascripts/da-js.js

@@ -1 +1 @@
-//= require_tree ./da-js
+//= require_tree ./da-js

data/lib/da-js/version.rb

@@ -1,5 +1,5 @@
 module Da
   module Js
-    VERSION = "1.2.1".freeze
+    VERSION = "1.3".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: da-js
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: '1.3'
 platform: ruby
 authors:
 - Stefan Daschek
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-11 00:00:00.000000000 Z
+date: 2024-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -17,9 +17,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,9 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7'
 - !ruby/object:Gem::Dependency
   name: sprockets
   requirement: !ruby/object:Gem::Requirement
@@ -58,90 +52,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: cucumber
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: rspec-expectations
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.7'
-- !ruby/object:Gem::Dependency
-  name: sinatra
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
-- !ruby/object:Gem::Dependency
-  name: sinatra-contrib
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: capybara-webkit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: launchy
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Some jQuery extensions we tend to use in almost all our projects.
 email:
 - stefan@die-antwort.eu
@@ -155,20 +65,6 @@ files:
 - README.md
 - Rakefile
 - da-js.gemspec
-- features/change_tracker.feature
-- features/conditional_visibility.feature
-- features/numeric_value.feature
-- features/step_definitions/change_tracker_steps.rb
-- features/step_definitions/conditional_visibility_steps.rb
-- features/step_definitions/numeric_value_steps.rb
-- features/step_definitions/shared_steps.rb
-- features/support/env.rb
-- features/support/testapp/config.ru
-- features/support/testapp/testapp.rb
-- features/support/testapp/vendor/jquery-1.11.1.js
-- features/support/testapp/views/conditional_visibility.erb
-- features/support/testapp/views/form_change_tracker.erb
-- features/support/testapp/views/numeric_value.erb
 - lib/assets/javascripts/da-js.js
 - lib/assets/javascripts/da-js/conditional_visibility.js.coffee
 - lib/assets/javascripts/da-js/form_change_tracker.js
@@ -193,23 +89,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: da-js
-rubygems_version: 2.7.6.2
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Mixed jQuery extensions
-test_files:
-- features/change_tracker.feature
-- features/conditional_visibility.feature
-- features/numeric_value.feature
-- features/step_definitions/change_tracker_steps.rb
-- features/step_definitions/conditional_visibility_steps.rb
-- features/step_definitions/numeric_value_steps.rb
-- features/step_definitions/shared_steps.rb
-- features/support/env.rb
-- features/support/testapp/config.ru
-- features/support/testapp/testapp.rb
-- features/support/testapp/vendor/jquery-1.11.1.js
-- features/support/testapp/views/conditional_visibility.erb
-- features/support/testapp/views/form_change_tracker.erb
-- features/support/testapp/views/numeric_value.erb
+test_files: []

data/features/change_tracker.feature

@@ -1,125 +0,0 @@
-@javascript
-Feature: Change tracker for forms
-  There are two special cases:
-   - A select has always a selected option. We use the first option (with empty value) as "empty".
-   - All radiobuttons can initially be unselected, but going back to this state is impossible. So, in the "empty form" scenario, we skip the radiobutton in second part (when we test "resetting" the form elements)
-  
-  Scenario Outline: An empty form 
-    Given an empty <Form>
-    Then no <Element> should be marked as changed
-     
-    When I enter some text in the textfield
-    Then the textfield's <Element> should be marked as changed
-    
-    When I enter some text in the textarea
-    Then the textarea's <Element> should be marked as changed
-    
-    When I check the checkbox
-    Then the checkbox's <Element> should be marked as changed
-    
-    When I select the first option
-    Then the select's <Element> should be marked as changed
-    
-    # Now for resetting everything (except radiobuttons, see feature description)
-    When I clear the textfield
-    Then the textfield's <Element> should no longer be marked as changed
-    
-    When I clear the textarea
-    Then the textarea's <Element> should no longer be marked as changed
-    
-    When I uncheck the checkbox
-    Then the checkbox's <Element> should no longer be marked as changed
-
-    When I select the empty option
-    Then the select's <Element> should no longer be marked as changed
-    
-    Examples:
-      | Form          | Element                |
-      | simple_form   | form element and label |
-      | scaffold_form | field container        |
-      | formtastic    | field container        |
-
-  
-  Scenario: Radiobuttons in an empty simple form
-    Given an empty simple_form
-    When I choose the first radiobutton
-    Then the first radiobutton's form element and label should be marked as changed
-    But the second radiobutton's form element and label should not be marked as changed
-    And the third radiobutton's form element and label should not be marked as changed
-
-     
-  Scenario: Radiobuttons in an empty scaffold form
-    Given an empty scaffold_form
-    When I choose the first radiobutton
-    Then the first radiobutton's field container should be marked as changed
-  
- 
-  Scenario Outline: A prefilled form 
-    Given a prefilled <Form>
-    Then no <Element> should be marked as changed
-     
-    When I change the textfield's content
-    Then the textfield's <Element> should be marked as changed
-    When I clear the textfield
-    Then the textfield's <Element> should be marked as changed
-    
-    When I change the textarea's content
-    Then the textarea's <Element> should be marked as changed
-    When I clear the textarea
-    Then the textarea's <Element> should be marked as changed
-    
-    When I uncheck the checkbox
-    Then the checkbox's <Element> should be marked as changed
-    
-    When I select the second option
-    Then the select's <Element> should be marked as changed
-    
-    # Now reset everything again
-    When I reset the textfield to its initial value
-    Then the textfield's <Element> should no longer be marked as changed
-    
-    When I reset the textarea to its initial value
-    Then the textarea's <Element> should no longer be marked as changed
-    
-    When I check the checkbox
-    Then the checkbox's <Element> should no longer be marked as changed
-
-    When I select the first option
-    Then the select's <Element> should no longer be marked as changed
-
-    And no <Element> should be marked as changed
-
-    Examples:
-      | Form          | Element                |
-      | simple_form   | form element and label |
-      | scaffold_form | field container        |
-      | formtastic    | field container        |
-
-
-  Scenario: Radiobuttons in an prefilled simple form
-    Given an prefilled simple_form
-    Then no form element and label should be marked as changed
-  
-    When I choose the second radiobutton
-    Then the second radiobutton's form element and label should be marked as changed
-    And the first radiobutton's form element and label should be marked as changed
-    But the third radiobutton's form element and label should not be marked as changed
-    
-    When I choose the first radiobutton
-    Then no form element and label should be marked as changed    
-
-     
-  Scenario Outline: Radiobuttons in an prefilled form
-    Given an prefilled <Form>
-    Then no form element and label should be marked as changed
-    
-    When I choose the second radiobutton
-    Then the second radiobutton's field container should be marked as changed
-
-    When I choose the first radiobutton
-    Then no form element and label should be marked as changed
-
-    Examples:
-      | Form          |
-      | scaffold_form |
-      | formtastic    |

data/features/conditional_visibility.feature

@@ -1,55 +0,0 @@
-@javascript
-Feature: Conditional visibility for elements
-  
-  Background:
-    Given I visit the test page for "conditional visibility"
-
-  Scenario: Basic functionality
-    Then the "Other Country" input should be hidden
-    But the "Message" input should be visible
-     
-    When I select "Other …" from the "Country" select
-    Then the "Other Country" input should be visible
-    
-    When I uncheck the "I want to leave a message" checkbox
-    Then the "Message" input should be hidden
-    
-    When I select "Austria" from the "Country" select
-    Then the "Other Country" input should be hidden
-    
-    When I check the "I want to leave a message" checkbox
-    Then the "Message" input should be visible
-    
-  Scenario: Changing a field value via javascript and triggering the event manually
-    When I set the "I want to leave a message" checkbox to unchecked using JavaScript
-    Then the "Message" input should be visible
-    
-    When I trigger the "updateVisibilities" event on the form
-    Then the "Message" input should be hidden
-
-
-  Scenario: Manually configuring events triggering visibility re-calculations
-    # Assert default behaviour first
-    When I enter "foo" in the "amount" field
-    Then the "#amount_info" element should be hidden
-    When I blur the "amount" field
-    Then the "#amount_info" element should be visible
-    
-    Given I visit the test page for "conditional visibility" with options "{events: 'keypress'}"
-    Then the "#amount_info" element should be hidden
-    When I enter "foo" in the "amount" field
-    Then the "#amount_info" element should be visible
-    
-    
-  Scenario: Using the triggered events
-    Given I bind an event listener to "shown.conditionalVisibility"
-    And I bind an event listener to "hidden.conditionalVisibility"
-    When I select "Other …" from the "Country" select
-    Then the event listener for "shown.conditionalVisibility" should have been called "1" time
-    And the event listener for "hidden.conditionalVisibility" should have been called "0" times
-    When I select "Austria" from the "Country" select
-    Then the event listener for "shown.conditionalVisibility" should have been called "1" times
-    And the event listener for "hidden.conditionalVisibility" should have been called "1" times
-    
-    
-    

data/features/numeric_value.feature

@@ -1,66 +0,0 @@
-@javascript
-Feature: Numeric value of input elements
-  
-  Background:
-    Given I visit the test page for "numeric value"
-
-  Scenario Outline: English locale
-    When I fill in "textfield" with "<String>"
-    Then the numeric value of "textfield" should be "<Value>"
-    
-    Examples:
-      | String   | Value   |
-      | 1        | 1       |
-      | 1.2      | 1.2     |
-      | 1234.56  | 1234.56 |
-      | 1,234.56 | 1234.56 |
-      | 1,234    | 1234    |
-      | abc      | 0       |
-      | $ 3      | 0       |
-      |          | 0       |
-
-  Scenario Outline: German locale
-    Given the HTML element has a lang attribute set to "de"
-    When I fill in "textfield" with "<String>"
-    Then the numeric value of "textfield" should be "<Value>"
-    
-    Examples:
-      | String   | Value   |
-      | 1        | 1       |
-      | 1,2      | 1.2     |
-      | 1234,56  | 1234.56 |
-      | 1.234,56 | 1234.56 |
-      | 1.234    | 1234    |
-      | abc      | 0       |
-      | € 5      | 0       |
-      |          | 0       |
-
-  Scenario: Locale specified on the input element directly
-    Given the HTML element has a lang attribute set to "de"
-    And the element "textfield" has a lang attribute set to "en"
-    When I fill in "textfield" with "1,234.56"
-    Then the numeric value of "textfield" should be "1234.56"
-
-  Scenario: Reading value from non-input elements
-    Then the numeric value of "non_input_element_english" should be "1234.56"
-    Given the HTML element has a lang attribute set to "de"
-    Then the numeric value of "non_input_element_german" should be "5678.9"
-    
-  Scenario Outline: Ignoring the currency sign
-    When I fill in "textfield" with "<String>"
-    Then the numeric value (ignoring currency sign) of "textfield" should be "<Value>"
-    Examples:
-      | String   | Value   |
-      | € 1      | 1       |
-      | $123.45  | 123.45  |
-      | $$ 3     | 0       |
-      | €$ 7     | 0       |
-      
-  Scenario Outline: Using `nullOnError`
-    When I fill in "textfield" with "<String>"
-    Then the numeric value (using `nullOnError: true`) of "textfield" should be "<Value>"
-    Examples:
-      | String   | Value   |
-      | 1,234    | 1234    |
-      | abc      | null    |
-      | € 5      | null    |