lazy_modal 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7cd07cd74daf198a1bf8fac0294a98c0f41adf2c
-  data.tar.gz: a7e1cb5a756aca1dd28b64caaa9fb280bad643bc
+  metadata.gz: 761ede6762db2ce4c45ba67b824d9e42b35c342a
+  data.tar.gz: fe33d8158a26acc5859bfa25838e91b70ec0ae62
 SHA512:
-  metadata.gz: 7643e29797117b6a155d87f0ef0efd1639482a4e6ee81cfd1290f8e3e9b6ec222f9833c1921a8a3248b6142fb097b2abe12f68e892984f50542378686dafd86f
-  data.tar.gz: 71550ab5d2040ee440a5fd6e5048db300998b8c21f65d27f581b7ca4bad5b8f951bbecfb70b6656ee075c7ce231acad0383671bb9755400caf03951415cc875f
+  metadata.gz: e22bf638afb91c073843b5ea06a7d04f95907589b82a0b783a3d32c33b97f8ab77f974279f72125a09477707594215816a60469d9f7340f728d58f10072c2c57
+  data.tar.gz: 94aff4f9609d041949d12a01c484ec4a50f6706042d068632c0eb4d4fc4c1677570366390c37ebeac381df54978a422401bc229ea43ca68526f2a1ede21e2bbf

data/README.md

@@ -1,16 +1,12 @@
 # lazy-modal
 
 Show **bootstrap** modal with lazy load. sometimes we have too many modals in html body. and you know always some modal not need rendered. the best pratice to show modal i think is lazy load modal. **bootstrap** modal plugin provide remote away the load modal content when needed.
-this gem provide way load **bootstrap** modal from remote server. so that we can load the modal when needed it. it's start!  
-
-
-##Example
-
-###**before**
+this gem provide way load **bootstrap** modal from remote server. so that we can load the modal when needed it. it's start!
 
+## Before
 app/views/profile/charges.erb
 
-``` ruby
+``` html
 #link_to
 <%=link_to 'charge', '#charge_modal', class: 'btn btn-default', data: {toggle: :modal}%>
 
@@ -28,18 +24,17 @@ app/views/profile/charges.erb
 <div class='modal fade' id='other_modal3'>
 	modal content ...
 </div>
-
 ```
+
 So you must render **modal-dom, modal-dom2, modal-dom3** with **link_to** in same place.
 sometimes we have mulitple modals and even some modal have much childrens dom. also maybe some modals no need at the same time like:(**modal-dom2, modal-dom3**).
 
 Now you can use **lazy_modal** lazy load modal when we need it!
 
-###**after**
-
+## After
 app/views/profile/charges.erb
 
-```ruby
+```html
 #link_to
 <%=link_to 'charge', '#charge_modal', class: 'btn btn-default', data: {lazy_modal: true, dir: 'profile'}%>
 
@@ -47,7 +42,7 @@ app/views/profile/charges.erb
 
 app/views/profile/charge_modal.erb
 
-```ruby
+```html
 #modal-dom
 <div class='modal fade' id='charge_modal'>
 	modal content ...
@@ -59,7 +54,6 @@ You can found out difference? yes we split **link_to** and **modal-dom** to diff
 It's us use **lazy_modal**
 
 ## Usage
-
 Use **lazy-modal** is simplest!  follow this steps:
 
 Add this line to your rails application's Gemfile:

data/app/assets/javascripts/lazy_modal/application.coffee

@@ -5,20 +5,29 @@ window.LM ||= {}
 
 LM.MODAL_CONTENT_LOADED = 'lm.modal.content.loaded'
 
-LM.loadRemoteModalByID = (modalID, modalOptions) ->
-  new LazyModalModal(modalID, modalOptions).show()
+LM.loadRemoteModalByID = (modalID, modalOptions={}) ->
+  lazyModal = new LazyModalModal(modalID, modalOptions)
+  lazyModal.show()
+  lazyModal
 
 LM.triggerLoadRemoteModal = (event) ->
   event.preventDefault()
   $target = $(event.currentTarget)
+  $target = $(event.currentTarget)
   modalOptions = $target.data('modal-options') || {}
-  modalID = $target.attr('href') || modalOptions.target || modalOptions.id
+  modalID = _parseModalIDFromHref($target) || modalOptions.target || modalOptions.id
   LM.loadRemoteModalByID modalID, modalOptions
 
+_parseModalIDFromHref = ($target)->
+  href = $target.attr('href')
+  return href if href != 'javascript:void(0)' and href != '#' and href
+  return null
+
 class LazyModalModal
   constructor: (@originModalID, @modalOptions) ->
+    @modalOptions.reload ||= false #force load remote modal
     @modalTitle = @modalOptions?.default_modal?.title || ''
-    alert('u must set modal ID with data-target or href attrs') unless @originModalID
+    alert('you must set modal ID in dom with data-target or attributes href') unless @originModalID
     if @originModalID.indexOf('#') !=-1
       @modalID = @originModalID?.split("#").pop()
     else
@@ -39,6 +48,11 @@ class LazyModalModal
       @_addModalEventListener()
 
   _showModal: ->
+    @modal.on 'hidden.bs.modal', =>
+      if @modalOptions.reload
+        @modal.remove()
+        @modal = null
+
     @modal?.modal 'show' unless @modal?.isShown
 
   _createModalDom: ->
@@ -51,7 +65,7 @@ class LazyModalModal
 	            <h4 class="modal-title">#{@modalTitle || ''}</h4>
 	          </div>
 	          <div class="modal-body clearfix">
-	            <h5 class="text-center">loading...</h5>
+	            <h5 class="text-center">loading…</h5>
 	          </div>
 	        </div>
         </div>
@@ -65,7 +79,7 @@ class LazyModalModal
       $.get("/lazy_modals/#{@modalID}", data)
         .done (response) => @_loadRemoteModalSuccessed response
         .fail (response, xhr, status) =>
-            @modal.find('.modal-body').html response.responseText
+          @modal.find('.modal-body').html response.responseText
 
   _loadRemoteModalSuccessed: (response)->
     @modal?.modal 'hide'

data/app/controllers/lazy_modal/lazy_modals_controller.rb

@@ -1,6 +1,7 @@
 module LazyModal
   class LazyModalsController < ActionController::Base
     protect_from_forgery with: :exception
+    helper Rails.application.helpers
 
     rescue_from ActionView::MissingTemplate do
       render plain: 'modal missing', status: :not_found

data/lib/lazy_modal/version.rb

@@ -1,3 +1,3 @@
 module LazyModal
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lazy_modal
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - MixBo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-19 00:00:00.000000000 Z
+date: 2017-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails