htmlgrid 1.0.9 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc2a221d74e06626ae58d60dedfddd2b02bf9604
-  data.tar.gz: 8623a7bd39724e206e54b956e478d9cfb9197c6b
+  metadata.gz: 5ff89d7ef9b327cfe5f71794afc0e08acabe92ae
+  data.tar.gz: 6669995c93c30107c4b20b207950fa3f7229ec0d
 SHA512:
-  metadata.gz: adc1e28727ad07bacee6b850c5d86534827382ccc33a65cef2d81f2dbfa29667cd83836bf39f3462af8e10fffc010864ef02f867e0001222fc18881a1848f5b7
-  data.tar.gz: f8572317835cd5136d8ed8abe4ec209da35e2d31a47c65332fbc83ae327b245d2c1f8a1bc99469eb156109c8f31fed8bb833be16d25ca3ebe1c73d6d94ad2d08
+  metadata.gz: 3a659474980dc94623435c3ede8307cf0249888ccb644187de53a29333936823780a4c3ae8a44a425d9bc15dc8b47865ca633a47ec1d31628ec7e7bffb44f6de
+  data.tar.gz: fd7d0cd908342a8fc1c48ee087f985dad3bd33ef5ca86cbcc43bde20b6213baff3290cdbdf2db86fe872a32c00f832bb0ee31540474863fc6d031640f47342b2

data/History.txt

@@ -1,3 +1,10 @@
+=== 1.1.0 / 06.07.2016
+
+* Rename djConfig to dojoConfig
+* Rename dojoType to data-dojo-type
+* Remove duplicated dojoConfig (use only data-dojo-config)
+* Add package support for onload script
+
 === 1.0.9 / 05.07.2016
 
 * Made tooltip work with dojo 1.11

data/lib/htmlgrid/dojotoolkit.rb

@@ -14,11 +14,10 @@ module HtmlGrid
     # DOJO_VERSION >= 1.7.0 only (removed old version support)
     def dojo_tag(widget, args={}, inner_html='')
       div = HtmlGrid::Div.new(@model, @session, self)
-      div.set_attribute('dojoType', widget)
-      lim = ","
+      div.set_attribute('data-dojo-type', widget)
       args.each { |key, value|
-        if(value.is_a?(Array))
-          value = value.join(lim)
+        if value.is_a?(Array)
+          value = value.join(',')
         end
         div.set_attribute(key, value)
       }
@@ -61,7 +60,7 @@ module HtmlGrid
         end
         unless(html.empty? || dojo_parse_widgets)
           html << context.script('type' => 'text/javascript') {
-            "djConfig.searchIds.push('#{css_id}')"
+            "dojoConfig.searchIds.push('#{css_id}')"
           }
         end
         dojo_dynamic_html(context) << html
@@ -83,16 +82,6 @@ module HtmlGrid
         dojo_path = @lookandfeel.resource_global(:dojo_js)
         dojo_path ||= '/resources/dojo/dojo/dojo.js'
         args = { 'type' => 'text/javascript'}
-        headers << context.script(args.dup) {
-          "djConfig = {
-            isDebug:              #{self.class::DOJO_DEBUG},
-            parseWidgets:         #{dojo_parse_widgets},
-            preventBackButtonFix: #{!self.class::DOJO_BACK_BUTTON},
-            bindEncoding:         '#{encoding}',
-            searchIds:            [],
-            urchin:               ''
-          };"
-        }
         packages = ""
         unless(self.class::DOJO_PREFIX.empty?)
           packages = self.class::DOJO_PREFIX.collect { |prefix, path|
@@ -115,27 +104,28 @@ module HtmlGrid
         ].join(',')
         args.store('data-dojo-config', config)
         args.store('src', dojo_path)
-
         headers << context.script(args)
         args = { 'type' => 'text/javascript' }
         headers << context.script(args) {
-          script = ''
-          self.class::DOJO_REQUIRE.uniq.each { |req|
-            script << "'#{req}',"
-          }
-          if(@dojo_onloads)
+          package_paths = self.class::DOJO_REQUIRE.map { |req|
+            "'#{req}'"
+          }.join(',')
+          package_names = self.class::DOJO_REQUIRE.map { |req|
+            req.split('/').last
+          }.join(',')
+          if @dojo_onloads
             onloads = ''
             @dojo_onloads.each { |onload|
               onloads << "#{onload}\n"
             }
             script =
-            "require([#{script.chomp(',')}], function(ready, parser) {" \
+            "require([#{package_paths}], function(#{package_names}) {" \
               "ready(function() {" \
                 "#{onloads}" \
               "});" \
             "});"
           else
-            script = "require([#{script.chomp(',')}]);"
+            script = "require([#{package_paths}]);"
           end
           script
         }

data/lib/htmlgrid/version.rb

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

metadata

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