dorsale 2.7.0 → 2.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d0c8d98fd7be7ef03b8a68351173b79c3de55f1f
-  data.tar.gz: 78a4adf2df5a2d4fe03617f0e89dee62494018bb
+  metadata.gz: ba2dc02af38aca29571385066c9f7cb473ea8d20
+  data.tar.gz: 6815f363fbbe634def1f30cbdd6e9d451895d8dd
 SHA512:
-  metadata.gz: a21271b62e7c924f3a0b7da3b9bf075c3713907d37efd6564878dc0ecd8dbbf2b4b93409a754b5ba18c21c83b3020b6b3aac55fc423e1b96d7236466ef3f062e
-  data.tar.gz: 02856acd0a899beacacc78d16ac1c310e15775bcbf6fc5a3206992bd05a3aecd92ca8727d13939e3a4a1e02e4c0571768bfb62a8fedc23bde1f9a59c693ef751
+  metadata.gz: 37634eb562b34c2ca462c5bdcc98ac6d3a29e1de6a2f900609ba649afc1c231f66ed99d2536207cbb7791888457ae3705ee0c425de09d980b12e6e949373c26e
+  data.tar.gz: f0517e47e65df22bd1b6778d10ad4fadb51e204e0601cabd2a56ad2777b4a1ead80c087ce8c448401a6b06adb5409e114dada79b349041309a69eff40f924af1

data/app/assets/javascripts/dorsale/modals.coffee

@@ -4,10 +4,12 @@ window.modal =
     error: "Error."
 
   template: """
-    <div id='modal' class='modal'>
-      <div class='modal-overlay modal-close'></div>
-      <button class='modal-close'></button>
-      <div class='modal-body'>
+    <div id='modal' class='closable'>
+      <div id='modal-overlay'></div>
+
+      <button id='modal-close'>×</button>
+
+      <div id='modal-body'>
         {{content}}
       </div>
     </div>
@@ -17,17 +19,48 @@ window.modal =
     $(modal.template.replace("{{content}}", content))
 
   open: (content) ->
-    modal.close()
+    if modal.is_opened()
+      modal._update(content)
+    else
+      modal._create(content)
+    $(document).trigger("modal:open")
+
+  _create: (content) ->
     $("body").addClass("modal-open")
     $("body").append(modal._generateModalHTML(content))
-    $(document).trigger("modal:open")
+
+  _update: (content) ->
+    $("#modal-body").html(content)
 
   close: ->
-    $("#modal").remove()
     $("body").removeClass("modal-open")
+    $("#modal").remove()
     $(document).trigger("modal:close")
     return false
 
+  is_opened: ->
+    return $("#modal").length > 0
+
+  is_closed: ->
+    return $("#modal").length == 0
+
+  is_closable: ->
+    return $("#modal").hasClass("closable")
+
+  autoclose: ->
+    modal.close() if modal.is_closable()
+    return false
+
+  set_closable: ->
+    $("#modal").addClass("closable")
+
+  set_unclosable: ->
+    $("#modal").removeClass("closable")
+
+  _set_closable_for_element: (element) ->
+    return modal.set_closable()   if $(element).is("[data-modal-closable=1]")
+    return modal.set_unclosable() if $(element).is("[data-modal-closable=0]")
+
   openUrl: (url, type = "GET", data = {}) ->
     modal.open(modal.i18n.loading)
 
@@ -40,33 +73,42 @@ window.modal =
         modal.open(data)
       error: ->
         modal.open(modal.i18n.error)
+        modal.set_closable()
 
   _callbacks:
     links: ->
       modal.openUrl(this.href)
+      modal._set_closable_for_element(this)
       return false
 
     forms: ->
-      modal.openUrl(this.href, this.action, $(this).serialize())
+      modal.openUrl(this.action, this.method, $(this).serialize())
+      modal._set_closable_for_element(this)
       return false
 
     escape: (event) ->
-      modal.close() if event.keyCode == 27
+      modal.autoclose() if event.keyCode == 27
+      return true
 
   setup: ->
     $(document)
       .off("keyup", modal._callbacks.escape)
       .on("keyup", modal._callbacks.escape)
 
-    $(".modal-close")
-      .off("click", modal.close)
-      .on("click", modal.close)
+    $("#modal-overlay, #modal-close")
+      .off("click", modal.autoclose)
+      .on("click", modal.autoclose)
 
-    $("a[data-modal=1], .modal-body a:not([data-modal=0])")
+    $("a[data-modal=1], #modal-body a")
+      .not("[data-modal=0]")
+      .not("[data-method]")
+      .not("[data-remote]")
       .off("click", modal._callbacks.links)
       .on("click", modal._callbacks.links)
 
-    $("form[data-modal=1], .modal-body form:not([data-modal=0])")
+    $("form[data-modal=1], #modal-body form")
+      .not("[data-modal=0]")
+      .not("[data-remote]")
       .off("submit", modal._callbacks.forms)
       .on("submit", modal._callbacks.forms)
 

data/app/assets/stylesheets/dorsale/modals.sass

@@ -2,37 +2,39 @@ body.modal-open
   height: 100%
   overflow: hidden
 
-.modal
+#modal
   display: block !important // override bootstrap
 
-  &, .modal-overlay
-    position: fixed
-    top: 0
-    right: 0
-    bottom: 0
-    left: 0
-    overflow: auto
+#modal, #modal-overlay
+  position: fixed
+  top: 0
+  right: 0
+  bottom: 0
+  left: 0
+  overflow: auto
 
-  .modal-overlay
-    background: rgba(0, 0, 0, 0.85)
+#modal-overlay
+  background: rgba(0, 0, 0, 0.85)
 
-  .modal-body
-    position: relative
-    margin: 10vh auto
-    padding: 2em
-    width: auto
-    min-width: 50%
-    max-width: 980px
-    background: white
-    z-index: 9999
+#modal-body
+  position: relative
+  margin: 10vh auto
+  padding: 2em
+  width: auto
+  min-width: 50%
+  max-width: 980px
+  background: white
+  z-index: 9999
 
-  button.modal-close:after
-    content: "×"
-    color: white
-    position: absolute
-    font-size: 4em
-    line-height: 0.5em
-    top: 0.25em
-    right: 0.25em
-    border: none
-    background: none
+#modal-close
+  color: white
+  position: absolute
+  font-size: 4em
+  line-height: 0.5em
+  top: 0.25em
+  right: 0.25em
+  border: none
+  background: none
+
+#modal:not(.closable) #modal-close
+  display: none

data/lib/dorsale/version.rb

@@ -1,3 +1,3 @@
 module Dorsale
-  VERSION = "2.7.0"
+  VERSION = "2.7.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dorsale
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.7.1
 platform: ruby
 authors:
 - agilidée
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-09 00:00:00.000000000 Z
+date: 2016-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails