abstracted 0.4.13 → 0.4.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8356a5cae50252a773af6e9e9bc3d018f528b457
-  data.tar.gz: 6a9b34b1d54fe93e2247092b568a2bdf12cfeb30
+  metadata.gz: e94662b590205430d680f86c0c0dcaac7588d9b5
+  data.tar.gz: b89dceacbb970ccf25f2f1f695b9462ee5807dc1
 SHA512:
-  metadata.gz: c9b56efbf6988d4173710953b7dc4340536e7fef21ea8489d75383d847df1e355d6ebcbf70aba64992b1e468975cd72daf70205fc40cd4073d00a1a4e2541f37
-  data.tar.gz: b933343e8ace51e0ce9b172ee8f2ba5561f28a5bbd191546347ba2ef939e4f37d540ce0d8671b178dd16349d5e0988db1f7f22ec0166bbb418f75c21beab1e79
+  metadata.gz: 66f9faaff4a646fa1dc926413114a6ce6f197f49684d6ed3a5438d38dd1dc46d8f621b2e24c1489bd26824ad70850e90bd96e0790935b265f24c39fd3fc6c9d8
+  data.tar.gz: b35cbb3780b953daf5b6593187de5004ae6c37ed7d3d7653f145b44b5bfbaedc675c489b1ec6995fd6728386e31f5be968b3efbba7294797ec779a2223a646fe

data/app/assets/javascripts/abstracted/app.fab_delete.coffee

@@ -59,10 +59,11 @@ class App.fabDelete
     loaded_element = elem.closest('.fixed-action-btn')
 
     switch elem.data('action')
-      when 'new'    then App.shared.openNewWindow(elem)                    # data-action="new",    data-url="/endpoint", data-selector="#id.modal"
-      when 'submit' then App.shared.submitForm(elem)                       # data-action="submit", data-selector="form"
-      when 'ajax'   then App.shared.callAjax(elem,loaded_element)          # data-action="ajax",   data-url="/endpoint", data-selector="#id.modal", data-method="get", data-type="html"
-      when 'get'    then window.location.href = elem.data('url')           # data-action="get",    data-url="/endpoint"
+      when undefined  then alert 'Fejl!\n Kontakt ALCO på 9791 1470\n (fejlen er: handleFABLinks ikke sat)'
+      when 'new'      then App.shared.openNewWindow(elem)                    # data-action="new",    data-url="/endpoint", data-selector="#id.modal"
+      when 'submit'   then App.shared.submitForm(elem)                       # data-action="submit", data-selector="form"
+      when 'ajax'     then App.shared.callAjax(elem,loaded_element)          # data-action="ajax",   data-url="/endpoint", data-selector="#id.modal", data-method="get", data-type="html"
+      when 'get'      then window.location.href = elem.data('url')           # data-action="get",    data-url="/endpoint"
       else eval(elem.data('action'))                                       # data-action="$(document.body).trigger({ type: 'app:modal:state:changed', state: {print_format: 'record' }})"
 
 
@@ -118,5 +119,5 @@ class App.fabDelete
       $(document.body).on 'click.fab', 'a.fab-button', @handleFABLinks
 
     catch error
-      alert 'App.fabDelete did not prepare!'
+      alert 'Fejl!\nLuk din browser og start igen - hvis fejlen stadig opstår, ring så til ALCO på tlf 9791 1470\nFejl: App.fabDelete did not prepare!'
       console.log error

data/app/helpers/fab_button_helper.rb

@@ -62,6 +62,7 @@ LISTEND
     if !options[:items].nil?
       options[:items].each do |k,item|
         item[:ajax] ||= 'get'
+        item[:action] ||= item[:ajax]
         item[:oxremote] ||= 'false'
         item[:class] ||= ''
         item[:icon] ||= ''

data/app/views/abstract_resources/edit.html.haml

@@ -3,4 +3,6 @@
 		%h3= render partial: 'title'
 - @disabled = false
 = render 'form'
-= build_fab_button build_fab_options( resource, fab_button_options.merge!( action: params[:action] ))
+= render partial: 'edit'
+- unless params[:format] == 'js'
+	= build_fab_button build_fab_options( resource, fab_button_options.merge!( action: params[:action] ))

data/app/views/abstract_resources/new.html.haml

@@ -3,4 +3,6 @@
 		%h3= render partial: 'title'
 - @disabled = false
 = render 'form'
-= build_fab_button build_fab_options( resource, fab_button_options.merge!( action: params[:action] ))
+= render partial: 'new'
+- unless params[:format] == 'js'
+	= build_fab_button build_fab_options( resource, fab_button_options.merge!( action: params[:action] ))

data/app/views/abstract_resources/show.html.haml

@@ -3,6 +3,6 @@
 		%h3= render partial: 'title'
 - @disabled = true
 = render 'form'
+= render partial: 'show'
 - unless params[:format] == 'js'
 	= build_fab_button build_fab_options( resource, fab_button_options.merge!( action: params[:action] ))
-= render partial: 'show'

data/lib/abstracted/version.rb

@@ -1,3 +1,3 @@
 module Abstracted
-  VERSION = "0.4.13"
+  VERSION = "0.4.14"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: abstracted
 version: !ruby/object:Gem::Version
-  version: 0.4.13
+  version: 0.4.14
 platform: ruby
 authors:
 - Walther H Diechmann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-18 00:00:00.000000000 Z
+date: 2017-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails