glimmer-dsl-opal 0.25.2 → 0.25.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98f731b5aabef981ca377d64bbd87ca7a86a5f8edd4d0de428c81aeabe8680bf
-  data.tar.gz: 7f7cc811ff007c65a15749a53e4b51b5ae194ffc06714d7e07c101d2c40c5484
+  metadata.gz: 7730a7073849e1cb3cf05073368a974a7cc493fa44621b3fd58d180e76c25c89
+  data.tar.gz: 7588d6730c8f81b27e8aff908bfe3c7f4daff093c004661abbb0c4fb0a2b4756
 SHA512:
-  metadata.gz: c71b8149524cbcd0b44319f24eb22e50476a6891cf479245d2632c3a367b97828b8197132092d0dd1389b5b79e7bf1e3a2abb5b787ad18d62655663252645fce
-  data.tar.gz: 18328ff77046a9fa0fd42abffd15c9251c0a9eed4886071c048fcd2320c1828d7033237cc76abbb2548e52cdb3c4d5ed3f3e235eca66af2a49c8eadca6b0d20c
+  metadata.gz: f50d2e39e990b86392e4fc719737b19337083380c874e426186dbbfe9ad7b60445a76fa93a8f5cf6d5055576f60209423b940e5efce3fee28f5081a99a61c2a3
+  data.tar.gz: 70634d53b24b7a82fcc8ca50b6b502d8b8b4260d204e89682a953e9bdbae81c7688867c8552082f323b1526170cd40a7a85222f637f8d8fb765c2658ce306e29

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## 0.25.3
+
+- Fix `c_combo`'s data-binding of selection receiving model changes
+- Fix Hello, C Combo!'s reset button
+- Fix Login sample by removing unnecessary require statement at the top
+
 ## 0.25.2
 
 - Fix sizing of buttons with font height specified to fit text

data/README.md

@@ -143,7 +143,7 @@ Hello, Table! Game Booked
 
 NOTE: Glimmer DSL for Opal is an alpha project. Please help make better by contributing, adopting for small or low risk projects, and providing feedback. It is still an early alpha, so the more feedback and issues you report the better.
 
-**Alpha Version** 0.25.1 only supports bare-minimum capabilities for the included [samples](https://github.com/AndyObtiva/glimmer-dsl-opal#samples) (originally written for [glimmer-dsl-swt](https://github.com/AndyObtiva/glimmer-dsl-swt))
+**Alpha Version** 0.25.3 only supports bare-minimum capabilities for the included [samples](https://github.com/AndyObtiva/glimmer-dsl-opal#samples) (originally written for [glimmer-dsl-swt](https://github.com/AndyObtiva/glimmer-dsl-swt))
 
 Other [Glimmer](https://github.com/AndyObtiva/glimmer) DSL gems:
 - [glimmer-dsl-swt](https://github.com/AndyObtiva/glimmer-dsl-swt): Glimmer DSL for SWT (JRuby Desktop Development GUI Framework)
@@ -266,7 +266,7 @@ gem 'opal', '1.0.4'
 gem 'opal-rails', '1.1.2'
 gem 'opal-async', '~> 1.3.0'
 gem 'opal-jquery', '~> 0.4.4'
-gem 'glimmer-dsl-opal', '~> 0.25.1'
+gem 'glimmer-dsl-opal', '~> 0.25.3'
 gem 'glimmer-dsl-xml', '~> 1.2.0', require: false
 gem 'glimmer-dsl-css', '~> 1.2.0', require: false
 

data/VERSION

@@ -1 +1 @@
-0.25.2
+0.25.3

data/lib/glimmer-dsl-opal/samples/elaborate/login.rb

@@ -19,8 +19,6 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-require 'glimmer-dsl-swt'
-
 class LoginPresenter
 
   attr_accessor :user_name
@@ -64,10 +62,10 @@ end
 
 class Login
   include Glimmer::UI::CustomShell
-  
-  before_body {
+
+  before_body do
     @presenter = LoginPresenter.new
-  }
+  end
 
   body {
     shell {

data/lib/glimmer/dsl/opal/combo_selection_data_binding_expression.rb

@@ -6,17 +6,17 @@ require 'glimmer/swt/combo_proxy'
 module Glimmer
   module DSL
     module Opal
-      class ComboSelectionDataBindingExpression < Expression  
+      class ComboSelectionDataBindingExpression < Expression
         def can_interpret?(parent, keyword, *args, &block)
           keyword == 'selection' and
             block.nil? and
-            parent.is_a?(Glimmer::SWT::ComboProxy) and
+            (parent.is_a?(Glimmer::SWT::ComboProxy) || parent.is_a?(Glimmer::SWT::CComboProxy)) and
             args.size == 1 and
             args[0].is_a?(DataBinding::ModelBinding) and
             args[0].evaluate_options_property.is_a?(Array)
         end
   
-        def interpret(parent, keyword, *args, &block)          
+        def interpret(parent, keyword, *args, &block)
           model_binding = args[0]
   
           #TODO make this options observer dependent and all similar observers in element specific data binding handlers

data/lib/glimmer/swt/c_combo_proxy.rb

@@ -26,7 +26,7 @@ module Glimmer
   module SWT
     class CComboProxy < ComboProxy
       def post_add_content
-        `$(#{path}).selectmenu()`
+        dom_element.selectmenu
         c_combo_dom_element.css('width', 'initial')
       end
       
@@ -38,6 +38,11 @@ module Glimmer
         c_combo_dom_element.css('font-size', "#{@font.height}px") unless @font.nil?
       end
       
+      def text=(value)
+        super(value)
+        c_combo_text_element.text(value)
+      end
+      
       def c_combo_path
         "##{id}-button"
       end
@@ -45,6 +50,30 @@ module Glimmer
       def c_combo_dom_element
         Document.find(c_combo_path)
       end
+      
+      def c_combo_text_path
+        c_combo_path + ' .ui-selectmenu-text'
+      end
+      
+      def c_combo_text_element
+        Document.find(c_combo_text_path)
+      end
+      
+      def observation_request_to_event_mapping
+        super.merge(
+          'on_widget_selected' => [
+            {
+              event: 'selectmenuchange',
+              event_handler: -> (event_listener) {
+                -> (event) {
+                  self.text = event.target.value
+                  event_listener.call(event)
+                }
+              }
+            },
+          ],
+        )
+      end
     end
   end
   

data/lib/glimmer/swt/combo_proxy.rb

@@ -1,3 +1,4 @@
+
 require 'glimmer/data_binding/observable_element'
 require 'glimmer/swt/widget_proxy'
 
@@ -6,7 +7,6 @@ module Glimmer
     class ComboProxy < WidgetProxy
       include Glimmer::DataBinding::ObservableElement
       attr_reader :text, :items
-      attr_accessor :selection # virtual attribute just to pass the shine data-binding test (TODO THINK OF A BETTER WAY OF HANDLING THIS)
       
       def initialize(parent, args, block)
         super(parent, args, block)
@@ -19,7 +19,15 @@ module Glimmer
       
       def text=(value)
         @text = value
-        Document.find(path).value = value
+        dom_element.val(value)
+      end
+      
+      def selection
+        text
+      end
+      
+      def selection=(value)
+        self.text = value
       end
       
       def items=(the_items)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-opal
 version: !ruby/object:Gem::Version
-  version: 0.25.2
+  version: 0.25.3
 platform: ruby
 authors:
 - AndyMaleh