glib-web 0.11.10 → 0.11.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d4968b1b18a9b99cc1451f33acaff156293cf8e90eea4f51f8db2a71d0606eb
-  data.tar.gz: 2c93eb68a4d5ab07a0df6ae61ad83746b9f8ed851350b45a0d36a61b929873ef
+  metadata.gz: 85abe76e3d1977c064f2e86fdbb94762e1876847a81fca85846c7081f6ccb863
+  data.tar.gz: '0192085bf3a998491f3090afc395a953d31d4c66d8199e6754fd9f0e1c71c430'
 SHA512:
-  metadata.gz: 5da158f07169d49350f0ec3bf800c1eda26a5b294c3e488f9e0716a8c73ceae9ce25910e4e5c3e960f1ea630295029f1eecfdd87b1fd65c789fa462eb40f81d5
-  data.tar.gz: 9cc6fa9b6dea847e117f1829354f9728541136dca16adcb4ed1be581ccd237f01712f799ce1cef9377a1d73d9d7d197295f89b9f84223d62ee8f54f4761f475c
+  metadata.gz: 030c770a4d216aa32c5ca2f01d662112de29646adbe92777bdf4eed1e3b027896c4bbf9fe201780190c9d964f1c0a500cb7f3aaded8d337565b7ad249dc96d00
+  data.tar.gz: 191d5d6e515722fdf0bb53f84c4c689dba91c5fb4112c850d9b6540ab5b3e376b8c7eda433a80e2b577efd74c838459cbe900cca27590557473b4a952942c09c

data/app/helpers/glib/json_ui/action_builder/dialogs.rb

@@ -37,6 +37,7 @@ class Glib::JsonUi::ActionBuilder
     end
 
     class Reload < Action
+      panels_builder :content, :body
       string :url, cache: true
       bool :showClose
     end

data/app/views/json_ui/garage/actions/_dialogs.json.jbuilder

@@ -54,34 +54,8 @@ section.rows builder: ->(template) do
     end
   end
 
-  markdown = '## Emphasis' + "\n" +
-    '**This is bold text**' + "\n" +
-    "\n" +
-    '*This is italic text*' + "\n" +
-    "\n" +
-    '~~Strikethrough~~' + "\n"
   template.thumbnail title: 'dialogs/show', onClick: ->(action) do
-    action.dialogs_show showClose: true, content: ->(dialog) do
-      dialog.body padding: glib_json_padding_body, childViews: ->(body) do
-        body.markdown text: markdown
-
-        body.panels_split width: 'matchParent', content: ->(split) do
-          split.left childViews: ->(left) do
-            left.panels_horizontal height: 'matchParent', align: 'middle', childViews: ->(horizontal) do
-              horizontal.label text: 'Open current', onClick: ->(subaction) do
-                subaction.dialogs_reload url: json_ui_garage_url(path: 'forms/basic', mode: 'dialog')
-              end
-            end
-          end
-
-          split.right childViews: ->(right) do
-            right.button text: 'Open New', onClick: ->(subaction) do
-              subaction.dialogs_open url: json_ui_garage_url(path: 'forms/basic', mode: 'dialog')
-            end
-          end
-        end
-      end
-    end
+    render 'json_ui/garage/actions/dialogs_show', json: json, action: action, dialog_mode: :show
   end
 
   template.thumbnail title: 'dialogs/open', onClick: ->(action) do

data/app/views/json_ui/garage/actions/_dialogs_show.json.jbuilder

@@ -0,0 +1,28 @@
+markdown = '## Emphasis' + "\n" +
+  '**This is bold text**' + "\n" +
+  "\n" +
+  '*This is italic text*' + "\n" +
+  "\n" +
+  '~~Strikethrough~~' + "\n"
+
+action.send "dialogs_#{dialog_mode}", showClose: true, content: ->(dialog) do
+  dialog.body padding: glib_json_padding_body, childViews: ->(body) do
+    body.markdown text: markdown
+
+    body.panels_split width: 'matchParent', content: ->(split) do
+      split.left childViews: ->(left) do
+        left.panels_horizontal height: 'matchParent', align: 'middle', childViews: ->(horizontal) do
+          horizontal.label text: 'Open current', onClick: ->(subaction) do
+            subaction.dialogs_reload url: json_ui_garage_url(path: 'forms/basic', mode: 'dialog_reload')
+          end
+        end
+      end
+
+      split.right childViews: ->(right) do
+        right.button text: 'Open New', onClick: ->(subaction) do
+          subaction.dialogs_open url: json_ui_garage_url(path: 'forms/basic', mode: 'dialog')
+        end
+      end
+    end
+  end
+end

data/app/views/json_ui/garage/forms/basic.json.jbuilder

@@ -10,8 +10,13 @@ page.form url: json_ui_garage_url(path: 'forms/basic_post'), method: 'post', pad
   form.panels_split width: 'matchParent', content: ->(split) do
     split.left childViews: ->(left) do
       left.panels_horizontal height: 'matchParent', align: 'middle', childViews: ->(horizontal) do
-        if params[:mode] == 'dialog'
+        case params[:mode]
+        when 'dialog'
           horizontal.button styleClass: 'link', text: 'cancel', onClick: ->(action) { action.dialogs_close }
+        when 'dialog_reload'
+          horizontal.button styleClass: 'link', text: 'back', onClick: ->(action) do
+            render 'json_ui/garage/actions/dialogs_show', json: json, action: action, dialog_mode: :reload
+          end
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glib-web
 version: !ruby/object:Gem::Version
-  version: 0.11.10
+  version: 0.11.11
 platform: ruby
 authors:
 - ''
@@ -129,6 +129,7 @@ files:
 - app/views/json_ui/garage/_nav_menu.json.jbuilder
 - app/views/json_ui/garage/actions/_commands.json.jbuilder
 - app/views/json_ui/garage/actions/_dialogs.json.jbuilder
+- app/views/json_ui/garage/actions/_dialogs_show.json.jbuilder
 - app/views/json_ui/garage/actions/_http.json.jbuilder
 - app/views/json_ui/garage/actions/_panels.json.jbuilder
 - app/views/json_ui/garage/actions/_reload.json.jbuilder
@@ -296,7 +297,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubyforge_project: 
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: ''