hyper-vis 1.0.0.lap30 → 1.0.0.lap31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7eb5eff15f82054481375b935135d9fa43680a9996385f54e53db7ad848bebf7
-  data.tar.gz: fae2fc15de0c8a4dc534c7243924e07fb68368ce07392a7c8911ddf7c970133e
+  metadata.gz: fb401bccbb9431f12af363d72266e579c316cb1b0c962604c81100d712c3793e
+  data.tar.gz: 530d4a7c7d21fac9cd687aeb2c3f8b116fee90688b2a704971832f7ec9dcbacd
 SHA512:
-  metadata.gz: 7a8db12d96b62a3076369336cd7c93ff650152aa8c7999b0aadfd406c71d2335be8d27adb2736a5fbfe7eb5adf6103453e4ef769946e6d78a5b3ea5a5829eb56
-  data.tar.gz: 13db992240ec099353a6e7879e2ee14e67921c78e4bab206f6e67b93253a793f89aa7ed8fd27eb795d61fb31c9051f6e5c02517e1d80503d47226ba33028bffd
+  metadata.gz: 7b81ce1718943cbbc5017d1de452fe0a99e534945341da8f8a33335d58545405510587374614039e42453e608a0b77dd6b88373e46bb61fb9ea6ee2c4c3886de
+  data.tar.gz: 716eea038fba08da0dbacea1f4b92f6bed0d557d848f423a65a870d4dd2c06291fd5e7d1dab03dde6c3432d9ddb4e0ff0b0d9a4116b033e8890d4c2a45808d4e

data/lib/hyperloop/vis/version.rb

@@ -1,5 +1,5 @@
 module Hyperloop
   module Vis
-    VERSION = '1.0.0.lap30'
+    VERSION = '1.0.0.lap31'
   end
-end
+end

data/lib/vis/utilities.rb

@@ -43,15 +43,17 @@ module Vis
 
     def options_to_native(options)
       return unless options
-      _rubyfy_configure_options(options) if options.has_key?(:configure)
-      _rubyfy_edges_options(options) if options.has_key?(:edges)
-      _rubyfy_manipulation_options(options) if options.has_key?(:manipulation)
-      _rubyfy_nodes_options(options) if options.has_key?(:nodes)
-      
-      if options.has_key?(:join_condition)
-        block = options[:join_condition]
+      # options must be duplicated, so callbacks dont get wrapped twice
+      new_opts = options.dup
+      _rubyfy_configure_options(new_opts) if new_opts.has_key?(:configure)
+      _rubyfy_edges_options(new_opts) if new_opts.has_key?(:edges)
+      _rubyfy_manipulation_options(new_opts) if new_opts.has_key?(:manipulation)
+      _rubyfy_nodes_options(new_opts) if new_opts.has_key?(:nodes)
+
+      if new_opts.has_key?(:join_condition)
+        block = new_opts[:join_condition]
         if `typeof block === "function"`
-          options[:join_condition] = %x{
+          new_opts[:join_condition] = %x{
             function(node_options, child_options) {
               if (child_options !== undefined && child_options !== null) {
                 return #{block.call(`Opal.Hash.$new(node_options)`, `Opal.Hash.$new(child_options)`)};
@@ -63,10 +65,10 @@ module Vis
         end
       end
 
-      if options.has_key?(:process_properties)
-        block = options[:process_properties]
+      if new_opts.has_key?(:process_properties)
+        block = new_opts[:process_properties]
         if `typeof block === "function"`
-          options[:process_properties] = %x{
+          new_opts[:process_properties] = %x{
             function(item) {
               var res = #{block.call(`Opal.Hash.$new(item)`)};
               return res.$to_n();
@@ -75,10 +77,10 @@ module Vis
         end
       end
 
-      if options.has_key?(:filter)
-        block = options[:filter]
+      if new_opts.has_key?(:filter)
+        block = new_opts[:filter]
         if `typeof block === "function"`
-          options[:filter] = %x{
+          new_opts[:filter] = %x{
             function(item) {
               return #{block.call(`Opal.Hash.$new(item)`)};
             }
@@ -86,7 +88,7 @@ module Vis
         end
       end
 
-      lower_camelize_hash(options).to_n
+      lower_camelize_hash(new_opts).to_n
     end
 
     def _rubyfy_configure_options(options)
@@ -146,30 +148,30 @@ module Vis
 
     def _rubyfy_manipulation_options(options)
       [:add_edge, :add_node, :edit_edge, :edit_node].each do |key|
-        if options[:manipulation].has_key?(key)
-          block = options[:manipulation][key]
-          if `typeof block === "function"`
-            options[:manipulation][key] = %x{
-              function(nodeData, callback) {
-                var wrapped_callback = #{ proc { |new_node_data| `callback(new_node_data.$to_n())` }}
-                return block.$call(Opal.Hash.$new(nodeData), wrapped_callback);
-              }
+        next unless options[:manipulation].has_key?(key)
+        block = options[:manipulation][key]
+        if `typeof block === "function"`
+          options[:manipulation][key] = %x{
+            function(nodeData, callback) {
+              console.log("callback got nodeData 1", nodeData);
+              console.log(key);
+              var wrapped_callback = #{ proc { |new_node_data| `callback(new_node_data.$to_n());` }};
+              block.$call(Opal.Hash.$new(nodeData), wrapped_callback);
             }
-          end
+          }
         end
       end
       # for delete the order of args for the callback is not clear
       [:delete_edge, :delete_node].each do |key|
-        if options[:manipulation].has_key?(key)
-          block = options[:manipulation][key]
-          if `typeof block === "function"`
-            options[:manipulation][key] = %x{
-              function(nodeData, callback) {
-                var wrapped_callback = #{ proc { |new_node_data| `callback(new_node_data.$to_n())` }}
-                return block.$call(Opal.Hash.$new(nodeData), wrapped_callback);
-              }
+        next unless options[:manipulation].has_key?(key)
+        block = options[:manipulation][key]
+        if `typeof block === "function"`
+          options[:manipulation][key] = %x{
+            function(nodeData, callback) {
+              var wrapped_callback = #{ proc { |new_node_data| `callback(new_node_data.$to_n());` }};
+              block.$call(Opal.Hash.$new(nodeData), wrapped_callback);
             }
-          end
+          }
         end
       end
     end
@@ -204,4 +206,4 @@ module Vis
       end
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hyper-vis
 version: !ruby/object:Gem::Version
-  version: 1.0.0.lap30
+  version: 1.0.0.lap31
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-28 00:00:00.000000000 Z
+date: 2018-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal