modal_logic 0.0.6 → 0.0.7

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: a414771edc95819b29e9b892f618db4298ecdb5b
+  data.tar.gz: 3a9becac0400be64929e15b4589f947d536701b1
+SHA512:
+  metadata.gz: 6330b9756963d54245cffb95f7bfe8894f71f42d68cc22dc15795c661d9a493b5823399e9f0231223ced936249b6170e19e3f8bcdb579555fb2918c3135049a7
+  data.tar.gz: 4376115b3132139119c0cb117267d47cf90ac193973e000d007fec1935f1053f9436a5d4cc972f849fd03d8258d7fdb2ef8224d305a00c687048f7ab643d64a7

data/app/assets/javascripts/modal_logic.coffee

@@ -3,8 +3,9 @@ exports = exports ? window
 exports.ModalLogic = class ModalLogic
   constructor: ->
     that = @
-    $('a[data-remote][modal],form[data-remote][modal]').live 'ajax:complete', (jq_event, xhr) ->
+    $('a[data-remote][modal]').on 'ajax:complete', (jq_event, xhr) ->
       response = JSON.parse(xhr.responseText)
+
       if response?      
         if response.close?
           window.location = if response.redirect_location? then response.redirect_location else window.location
@@ -15,13 +16,33 @@ exports.ModalLogic = class ModalLogic
           title: 'Error'
           body: 'There was an error.  Please reload the page and try again'
 
+  processResponse: (jq_event, xhr) ->
+    that = @
+    response = JSON.parse(xhr.responseText)
+
+    if response?      
+      if response.close?
+        window.location = if response.redirect_location? then response.redirect_location else window.location
+      else
+        that.createOrUpdateModalContent(response)
+    else
+      that.createOrUpdateModalContent
+        title: 'Error'
+        body: 'There was an error.  Please reload the page and try again'
+
   createOrUpdateModalContent: (context) =>
     html = HandlebarsTemplates['modal/crud']( modal: context )
     $modal = $('.modal.modal-logic')
+
     if $modal.length > 0
       $modal.modal('hide').replaceWith html
     else
       $('body').append html
+
+    that = @
+    $('form[data-remote][modal]').on 'ajax:complete', (jq_event, xhr) ->
+      that.processResponse(jq_event, xhr)
+
     @showModal()
 
   showModal: =>

data/app/assets/javascripts/modal_logic.js

@@ -1,54 +1,73 @@
-// Generated by CoffeeScript 1.6.3
-(function() {
-  var ModalLogic, exports,
-    __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; };
+// Generated by CoffeeScript 1.7.1
+var ModalLogic, exports,
+  __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; };
 
-  exports = exports != null ? exports : window;
+exports = exports != null ? exports : window;
 
-  exports.ModalLogic = ModalLogic = (function() {
-    function ModalLogic() {
-      this.showModal = __bind(this.showModal, this);
-      this.createOrUpdateModalContent = __bind(this.createOrUpdateModalContent, this);
-      var that;
-      that = this;
-      $('a[data-remote][modal],form[data-remote][modal]').live('ajax:complete', function(jq_event, xhr) {
-        var response;
-        response = JSON.parse(xhr.responseText);
-        if (response != null) {
-          if (response.close != null) {
-            return window.location = response.redirect_location != null ? response.redirect_location : window.location;
-          } else {
-            return that.createOrUpdateModalContent(response);
-          }
+exports.ModalLogic = ModalLogic = (function() {
+  function ModalLogic() {
+    this.showModal = __bind(this.showModal, this);
+    this.createOrUpdateModalContent = __bind(this.createOrUpdateModalContent, this);
+    var that;
+    that = this;
+    $('a[data-remote][modal]').on('ajax:complete', function(jq_event, xhr) {
+      var response;
+      response = JSON.parse(xhr.responseText);
+      if (response != null) {
+        if (response.close != null) {
+          return window.location = response.redirect_location != null ? response.redirect_location : window.location;
         } else {
-          return that.createOrUpdateModalContent({
-            title: 'Error',
-            body: 'There was an error.  Please reload the page and try again'
-          });
+          return that.createOrUpdateModalContent(response);
         }
-      });
-    }
+      } else {
+        return that.createOrUpdateModalContent({
+          title: 'Error',
+          body: 'There was an error.  Please reload the page and try again'
+        });
+      }
+    });
+  }
 
-    ModalLogic.prototype.createOrUpdateModalContent = function(context) {
-      var $modal, html;
-      html = HandlebarsTemplates['modal/crud']({
-        modal: context
-      });
-      $modal = $('.modal.modal-logic');
-      if ($modal.length > 0) {
-        $modal.modal('hide').replaceWith(html);
+  ModalLogic.prototype.processResponse = function(jq_event, xhr) {
+    var response, that;
+    that = this;
+    response = JSON.parse(xhr.responseText);
+    if (response != null) {
+      if (response.close != null) {
+        return window.location = response.redirect_location != null ? response.redirect_location : window.location;
       } else {
-        $('body').append(html);
+        return that.createOrUpdateModalContent(response);
       }
-      return this.showModal();
-    };
+    } else {
+      return that.createOrUpdateModalContent({
+        title: 'Error',
+        body: 'There was an error.  Please reload the page and try again'
+      });
+    }
+  };
 
-    ModalLogic.prototype.showModal = function() {
-      return $('.modal.modal-logic').modal('show');
-    };
+  ModalLogic.prototype.createOrUpdateModalContent = function(context) {
+    var $modal, html, that;
+    html = HandlebarsTemplates['modal/crud']({
+      modal: context
+    });
+    $modal = $('.modal.modal-logic');
+    if ($modal.length > 0) {
+      $modal.modal('hide').replaceWith(html);
+    } else {
+      $('body').append(html);
+    }
+    that = this;
+    $('form[data-remote][modal]').on('ajax:complete', function(jq_event, xhr) {
+      return that.processResponse(jq_event, xhr);
+    });
+    return this.showModal();
+  };
 
-    return ModalLogic;
+  ModalLogic.prototype.showModal = function() {
+    return $('.modal.modal-logic').modal('show');
+  };
 
-  })();
+  return ModalLogic;
 
-}).call(this);
+})();

data/app/assets/javascripts/templates/modal/crud.hbs

@@ -1,4 +1,4 @@
-<div class="modal modal-logic hide">
+<div class="modal modal-logic">
   <div class="modal-header">
     <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
     <h3 class='modal-title'>{{modal.title}}</h3>

data/lib/modal_logic/version.rb

@@ -1,3 +1,3 @@
 module ModalLogic
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,36 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: modal_logic
 version: !ruby/object:Gem::Version
-  version: 0.0.6
-  prerelease: 
+  version: 0.0.7
 platform: ruby
 authors:
 - Adam Hallett
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-07 00:00:00.000000000 Z
+date: 2014-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: handlebars_assets
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -93,27 +88,26 @@ files:
 - test/test_helper.rb
 homepage: http://github.com/atomical/modal_logic
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: The simplicity of Rails forms coupled with Bootstrap modal
 test_files:
 - test/dummy/app/assets/javascripts/application.js