Merge branch 'develop' into implementing_issue_59

Author: jonasjabari

app/concepts/matestack/ui/core/async/async.js

@@ -18,8 +18,16 @@ const componentDef = {
   methods: {
     show: function(event_data){
       const self = this
+      if (this.showing === true){
+        return
+      }
       this.showing = true
       this.event.data = event_data
+      if(this.componentConfig["defer"] != undefined){
+        if(!isNaN(this.componentConfig["defer"])){
+          this.startDefer()
+        }
+      }
       if(this.componentConfig["hide_after"] != undefined){
         self.hide_after_timeout = setTimeout(function () {
           self.hide()
@@ -29,6 +37,12 @@ const componentDef = {
     hide: function(){
       this.showing = false
       this.event.data = {}
+    },
+    startDefer: function(){
+      const self = this
+      setTimeout(function () {
+        self.rerender()
+      }, parseInt(this.componentConfig["defer"]));
     }
   },
   created: function () {
@@ -39,8 +53,12 @@ const componentDef = {
     if(this.componentConfig["show_on"] != undefined){
       this.showing = false
     }
-    if(this.componentConfig["hide_on"] != undefined){
-      this.showing = true
+    if(this.componentConfig["defer"] != undefined){
+      if(!isNaN(this.componentConfig["defer"])){
+        if (this.componentConfig["show_on"] == undefined){
+          this.startDefer()
+        }
+      }
     }
   },
   beforeDestroy: function() {

app/concepts/matestack/ui/core/blockquote/blockquote.haml

@@ -0,0 +1,5 @@
+%blockquote{@tag_attributes}
+  - if options[:text].nil? && block_given?
+    = yield
+  - else
+    = options[:text]

app/concepts/matestack/ui/core/blockquote/blockquote.rb

@@ -0,0 +1,9 @@
+module Matestack::Ui::Core::Blockquote
+  class Blockquote < Matestack::Ui::Core::Component::Static
+    def setup
+      @tag_attributes.merge!({
+        "cite": options[:cite]
+      })
+    end
+  end
+end

app/concepts/matestack/ui/core/caption/caption.haml

@@ -0,0 +1,6 @@
+%caption{@tag_attributes}
+  - if options[:text].nil?
+    - if block_given?
+      = yield
+  - else
+    = options[:text]

app/concepts/matestack/ui/core/caption/caption.rb

@@ -0,0 +1,5 @@
+module Matestack::Ui::Core::Caption
+  class Caption < Matestack::Ui::Core::Component::Static
+
+  end
+end

app/concepts/matestack/ui/core/details/details.haml

@@ -0,0 +1,3 @@
+%details{@tag_attributes}
+  - if block_given?
+    = yield

app/concepts/matestack/ui/core/details/details.rb

@@ -0,0 +1,4 @@
+module Matestack::Ui::Core::Details
+  class Details < Matestack::Ui::Core::Component::Static
+  end
+end

app/concepts/matestack/ui/core/link/link.haml

@@ -1,6 +1,5 @@
-- if options[:text].nil?
-  = link_to link_path, @tag_attributes do
-    - if block_given?
-      = yield
-- else
-  = link_to options[:text], link_path, @tag_attributes
+%a{@tag_attributes}
+  - if options[:text].nil? && block_given?
+    = yield
+  - else
+    = options[:text]

app/concepts/matestack/ui/core/link/link.rb

@@ -4,10 +4,12 @@ class Link < Matestack::Ui::Core::Component::Static
     REQUIRED_KEYS = [:path]
 
     def setup
-      @tag_attributes.merge!({ "class": options[:class],
+      @tag_attributes.merge!({
+        "class": options[:class],
         "id": component_id,
         "method": options[:method],
-        "target": options[:target] ||= nil
+        "target": options[:target] ||= nil,
+        "href": link_path
       })
     end
 

app/concepts/matestack/ui/core/page/page.rb

@@ -48,7 +48,7 @@ def prepare
     end
 
     def components(&block)
-      @nodes = Matestack::Ui::Core::PageNode.build(self, nil, &block)
+      @nodes = Matestack::Ui::Core::PageNode.build(self, nil, context[:params], &block)
     end
 
     def nodes_to_cell
@@ -59,12 +59,10 @@ def nodes_to_cell
 
     def partial(&block)
       return block
-      # Matestack::Ui::Core::PageNode.build(self, included, &block)
     end
 
     def slot(&block)
-      # return block
-      Matestack::Ui::Core::PageNode.build(self, nil, &block)
+      Matestack::Ui::Core::PageNode.build(self, nil, context[:params], &block)
     end
 
 
@@ -82,25 +80,28 @@ def show(component_key=nil, only_page=false)
 
       when :only_page
         nodes_to_cell
-        # keys_array = ["div_2","components", "partial_1", "components", "form_1"]
-        # puts @nodes.dig(*keys_array)
         render :page
       when :render_page_with_app
         concept(@app_class).call(:show, @page_id, @nodes)
       when :render_component
-        if component_key.include?("__")
-          keys_array = component_key.gsub("__", "__components__").split("__").map {|k| k.to_s}
-          page_content_keys = keys_array.select{|key| key.match(/^page_content_/)}
-          if page_content_keys.any?
-            keys_array = keys_array.drop(keys_array.find_index(page_content_keys[0])+2)
+        begin
+          if component_key.include?("__")
+            keys_array = component_key.gsub("__", "__components__").split("__").map {|k| k.to_s}
+            page_content_keys = keys_array.select{|key| key.match(/^page_content_/)}
+            if page_content_keys.any?
+              keys_array = keys_array.drop(keys_array.find_index(page_content_keys[0])+2)
+            end
+            node = @nodes.dig(*keys_array)
+            cell = to_cell(component_key, node["component_name"], node["config"], node["argument"], node["components"], node["included_config"])
+            return cell.render_content
+          else
+            node = @nodes[component_key]
+            cell = to_cell(component_key, node["component_name"], node["config"], node["argument"], node["components"], node["included_config"])
+            return cell.render_content
           end
-          node = @nodes.dig(*keys_array)
-          cell = to_cell(component_key, node["component_name"], node["config"], node["argument"], node["components"], node["included_config"])
-          return cell.render_content
-        else
-          node = @nodes[component_key]
-          cell = to_cell(component_key, node["component_name"], node["config"], node["argument"], node["components"], node["included_config"])
-          return cell.render_content
+        rescue
+          raise "Component '#{component_key}' could not be resolved. Notice: Rerendering currently works only on page-level. \
+          You are therefore currently not able to use 'async' within a component for example!"
         end
       end
     end