htmlgrid 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ff89d7ef9b327cfe5f71794afc0e08acabe92ae
-  data.tar.gz: 6669995c93c30107c4b20b207950fa3f7229ec0d
+  metadata.gz: c5d30addff4506799b90228f01a9c910f6231967
+  data.tar.gz: d96e8a7d27da7aab4acaf1458a334bbf89c76af2
 SHA512:
-  metadata.gz: 3a659474980dc94623435c3ede8307cf0249888ccb644187de53a29333936823780a4c3ae8a44a425d9bc15dc8b47865ca633a47ec1d31628ec7e7bffb44f6de
-  data.tar.gz: fd7d0cd908342a8fc1c48ee087f985dad3bd33ef5ca86cbcc43bde20b6213baff3290cdbdf2db86fe872a32c00f832bb0ee31540474863fc6d031640f47342b2
+  metadata.gz: 7be2249769ff2f267ff89af97188e897c89e87d79403e71cb24658f315cf09d25211f756db822aec048da2ecf6fdc166c74a82b1c734b570b0cae68bec642754
+  data.tar.gz: b6995921b53ae767df96a8fabdd97e3d7de0396e1a5a3626e88e7ed7d5259c9c84cd97de5e1f54ec26c00b3e7898499fa17f242cf31fb60fef9d9f7e98f86a8a

data/History.txt

@@ -1,3 +1,7 @@
+=== 1.1.1 / 07.07.2016
+
+* Improve dojotoolkit.rb
+
 === 1.1.0 / 06.07.2016
 
 * Rename djConfig to dojoConfig

data/lib/htmlgrid/dojotoolkit.rb

@@ -7,10 +7,9 @@ require 'htmlgrid/component'
 require 'htmlgrid/div'
 
 module HtmlGrid
-	class Component
+  class Component
     @@msie_ptrn = /MSIE\s*(\d)/
-		attr_accessor :dojo_tooltip
-    # FIXME
+    attr_accessor :dojo_tooltip
     # DOJO_VERSION >= 1.7.0 only (removed old version support)
     def dojo_tag(widget, args={}, inner_html='')
       div = HtmlGrid::Div.new(@model, @session, self)
@@ -29,50 +28,58 @@ module HtmlGrid
       tooltip.value = value
       self.dojo_tooltip = tooltip
     end
-		def dojo_parse_widgets
-			if(@container.respond_to?(:dojo_parse_widgets))
-				@container.dojo_parse_widgets
-			end
-		end
-    unless(method_defined?(:dojo_dynamic_html))
+    def dojo_parse_on_load
+      if @container.respond_to?(:dojo_parse_on_load)
+        @container.dojo_parse_on_load
+      end
+    end
+    unless method_defined?(:dojo_dynamic_html)
       alias :dojo_dynamic_html :dynamic_html
       def dynamic_html(context)
         html = ''
         attrs = {
-        'data-dojo-type' => 'dijit/Tooltip',
-        'data-dojo-props' => "connectId:'#{css_id}'",
-          'id'             =>  "#{css_id}_widget",
-          'style'          =>  'display: none',
+          # NOTE:
+          #   DOJO >= 1.8 has support for type name separated by '/'
+          #   but, <= 1.7 must be separated with '.'
+          'data-dojo-type'  => 'dijit.Tooltip',
+          'data-dojo-props' => "connectId:'#{css_id}'",
+          'id'              => "#{css_id}_widget",
+          'style'           => 'display: none',
         }
-        unless((match = @@msie_ptrn.match(@session.user_agent)) \
-               && match[1].to_i < 7)
+        unless match = @@msie_ptrn.match(@session.user_agent) \
+               && match[1].to_i < 7
           attrs.update({
             'toggle'         => 'fade',
             'toggleDuration' => '500',
           })
         end
-        if(@dojo_tooltip.is_a?(String))
-          attrs.store('href', "'#@dojo_tooltip'")
+        if @dojo_tooltip.is_a?(String)
+          if @dojo_tooltip !~ /^http/ # e.g. javascript
+            attrs.store('href', "'#@dojo_tooltip'")
+          else
+            attrs.store('href', @dojo_tooltip)
+          end
           html << context.div(attrs)
-        elsif(@dojo_tooltip.respond_to?(:to_html))
+        elsif @dojo_tooltip.respond_to?(:to_html)
           @dojo_tooltip.attributes.update(attrs)
           html << @dojo_tooltip.to_html(context).force_encoding('utf-8')
         end
-        unless(html.empty? || dojo_parse_widgets)
+        unless html.empty? || dojo_parse_on_load
           html << context.script('type' => 'text/javascript') {
             "dojoConfig.searchIds.push('#{css_id}')"
           }
         end
+        # call original dynamic_html
         dojo_dynamic_html(context) << html
       end
     end
-	end
+  end
 	module DojoToolkit
 		module DojoTemplate
 			DOJO_DEBUG = false
 			DOJO_BACK_BUTTON = false
       DOJO_ENCODING = nil
-			DOJO_PARSE_WIDGETS = true
+      DOJO_PARSE_ON_LOAD = true
 			DOJO_PREFIX = []
 			DOJO_REQUIRE = []
       def dynamic_html_headers(context)
@@ -89,7 +96,7 @@ module HtmlGrid
           }.join(",")
         end
         config = [
-          "parseOnLoad:          true",
+          "parseOnLoad:          #{self.class::DOJO_PARSE_ON_LOAD}",
           "isDebug:              #{self.class::DOJO_DEBUG}",
           "preventBackButtonFix: #{!self.class::DOJO_BACK_BUTTON}",
           "bindEncoding:         '#{encoding}'",
@@ -131,15 +138,15 @@ module HtmlGrid
         }
         dojo_dir = File.dirname(dojo_path)
         headers << context.style(:type => "text/css") { <<-EOS
-            @import "#{File.join(dojo_dir, "/resources/dojo.css")}";
-            @import "#{File.join(dojo_dir, "../dijit/themes/tundra/tundra.css")}";
-          EOS
+          @import "#{File.join(dojo_dir, "/resources/dojo.css")}";
+          @import "#{File.join(dojo_dir, "../dijit/themes/tundra/tundra.css")}";
+        EOS
         }
         headers
       end
-			def dojo_parse_widgets
-				self.class::DOJO_PARSE_WIDGETS
-			end
+      def dojo_parse_on_load
+        self.class::DOJO_PARSE_ON_LOAD
+      end
 			def onload=(script)
 				(@dojo_onloads ||= []).push(script)
 			end

data/lib/htmlgrid/version.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 # encoding: utf-8
 module HtmlGrid
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: htmlgrid
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Masaomi Hatakeyama, Zeno R.R. Davatz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-06 00:00:00.000000000 Z
+date: 2016-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sbsm