bootbox_crud 0.1.1.4 → 0.1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2151d8412c22e57b5db6843096a39f506488ee2e
-  data.tar.gz: acf811760e07a07c9412785c43f2ee79b00f4420
+  metadata.gz: ec83d2ca42f15ef6aff838d2ee691eba56a354db
+  data.tar.gz: 85d6d3a8d032b34b750c50c3655f26cec36141e0
 SHA512:
-  metadata.gz: e85e6b4f5dca7a58ff176156ead11422f59ff16134aa5ee9332fa839a3ba20340c585c9e3530a5d74d80ed6d61ee1328fb0690dc546deb906e941e54600f7516
-  data.tar.gz: 4f55f8e0c2551fb184ffbb51e60cf2b24f588f2f0306140dcab533e4b5233f4f25e994d72aae14151da8835270b6c65d3eabc20fb56e8710361451b6cf9d950b
+  metadata.gz: 5cf5f589dc362c27a96ec89921ffbb34e754393d64114171fe4143a3686926e0f3235cfb838571f0658c7dd7dd8c5dc2c42031aeda91887f4f12b48b41d371c1
+  data.tar.gz: 8cc9dccba596aa9c57a54ba5485c84c494b8585b9f0961435a82751a58fb39676b5fef00021ec7fc810ccba2fa130912843d34528baa9bb2bcbb098f8e819cd5

data/app/views/modals/_form.js.erb

@@ -12,5 +12,5 @@ var modal = $('.bootbox.modal');
     BBCrud.Alert.show('<%= success_alert %>');
     modal.modal('hide');
     var path = '<%= defined?(visit_path) ? visit_path : nil %>';
-    Turbolinks.visit(path === '' ? null : path);
+    if (path !== false) Turbolinks.visit(path === '' ? null : path);
 <%- end %>

data/lib/bootbox_crud/version.rb

@@ -1,5 +1,5 @@
 module BootboxCrud
   module Rails
-    VERSION = "0.1.1.4"
+    VERSION = "0.1.1.5"
   end
 end

data/vendor/assets/javascripts/bootbox_crud_modals.js

@@ -4,6 +4,7 @@ BBCrud.Modals = function () {
 
     var modals = {
         form: function(id, title, btnLabel, url, exec, timeout, timeoutExec, options) {
+            options = $.extend({ data: {} }, options);
             var buttons = {
                 close: {
                     "label" : "Close"
@@ -12,7 +13,7 @@ BBCrud.Modals = function () {
                     "label" : btnLabel,
                     "className" : "btn-success",
                     "callback": function() {
-                        if (options.dontSubmit !== true) {
+                        if (options.data.bbDontSubmit !== true) {
                             $('.bootbox.modal').find('input[type="submit"]').closest('form').submit();
                         }
                         if (timeoutExec !== null && typeof timeoutExec != 'undefined') { setTimeout(timeoutExec, timeout); }
@@ -20,7 +21,7 @@ BBCrud.Modals = function () {
                     }
                 }
             };
-            if (id !== -1 && options.showDeleteBtn !== false) {
+            if (id !== -1 && options.data.bbShowDelete !== false) {
                 $.extend(buttons, {
                     delete: {
                         "label" : "Delete",
@@ -33,7 +34,16 @@ BBCrud.Modals = function () {
                 })
             }
 
-            var modal = bootbox.dialog({
+            var bbOptions = Object.keys(options.data).reduce(function (result, key) {
+                if (key.indexOf('bb') != -1) {
+                    var cleanKey = key.replace('bb', '');
+                    cleanKey = cleanKey[0].toLowerCase() + cleanKey.slice(1);
+                    result[cleanKey] = options.data[key];
+                }
+                return result;
+            }, {});
+
+            var modal = bootbox.dialog($.extend(bbOptions || {}, {
                 message  : "Loading form...",
                 title    : title,
                 backdrop : "static",
@@ -41,8 +51,16 @@ BBCrud.Modals = function () {
                 show     : true,
                 header   : title,
                 buttons: buttons
-            });
-            $.get(url, options.data, function(data) {
+            }));
+
+            var reqParams = Object.keys(options.data).reduce(function (result, key) {
+                if (key.indexOf('bb') == -1) {
+                    result[key] = options.data[key];
+                }
+                return result;
+            }, {});
+
+            $.get(url, reqParams, function(data) {
                 var result = $(data);
                 var content = result.attr('id') === 'content' ? result : result.find('#content');
                 modal.find('.modal-body').html(content);
@@ -62,7 +80,7 @@ BBCrud.Modals = function () {
         other: function (id, title, baseUrl, actionName, exec, timeout, timeoutExec, data) {
             if (typeof id === 'object') id = id.id;
             var url = baseUrl + id + '/' + actionName;
-            modals.form(id, title, actionName.charAt(0).toUpperCase() + actionName.slice(1), url, exec, timeout, timeoutExec, { baseUrl: baseUrl, data: data, showDeleteBtn: false });
+            modals.form(id, title, actionName.charAt(0).toUpperCase() + actionName.slice(1), url, exec, timeout, timeoutExec, { baseUrl: baseUrl, data: $.extend({'bb-show-delete': false}, data) });
         },
         delete: function (id, baseUrl, exec) {
             bootbox.confirm('Are you sure?', function(result) {
@@ -73,16 +91,16 @@ BBCrud.Modals = function () {
                         dataType: 'script',
                         type: 'DELETE'
                     }).success(function () {
-                            if (typeof exec != 'undefined') { exec(); }
-                            BBCrud.Alert.show('Deleted');
-                        }).error(function () {
-                            BBCrud.Alert.show('Something went wrong!');
-                        });
+                        if (typeof exec != 'undefined') { exec(); }
+                        BBCrud.Alert.show('Deleted');
+                    }).error(function () {
+                        BBCrud.Alert.show('Something went wrong!');
+                    });
                 }
             });
         },
-        show: function(id, title, baseUrl) {
-            var modal = bootbox.dialog({
+        show: function(id, title, baseUrl, data) {
+            var modal = bootbox.dialog($.extend(data.bb, {
                 message  : "Loading form...",
                 title    : title,
                 backdrop : "static",
@@ -94,17 +112,17 @@ BBCrud.Modals = function () {
                         "label" : "Close"
                     }
                 }
-            });
-            $.get(baseUrl + id, function(data) {
-                handleResponse(data);
+            }));
+            $.get(baseUrl + id, function(result) {
+                handleResponse(result);
             }).error(function (response) {
                 if (response.status === 200) {
                     handleResponse(response.responseText);
                 }
                 console.log(response);
             });
-            function handleResponse(data) {
-                var result = $(data);
+            function handleResponse(response) {
+                var result = $(response);
                 var content = result.attr('id') === 'content' ? result : result.find('#content');
                 modal.find('.modal-body').html(content);
             }
@@ -134,7 +152,7 @@ BBCrud.Models = function () {
             $.extend(BBCrud[modelName], actions);
         }
     }
-    
+
     var models = {
         add: function(modelName, url, titleName) {
             var modelCRUD = function () {
@@ -145,10 +163,10 @@ BBCrud.Models = function () {
                         BBCrud.Modals.create('Create ' + titleName, baseUrl, null, data);
                     },
                     update: function (data) {
-                        BBCrud.Modals.update(data.id, 'Edit ' + titleName, baseUrl);
+                        BBCrud.Modals.update(data.id, 'Edit ' + titleName, baseUrl, undefined, false, undefined, undefined, data);
                     },
                     show: function (data) {
-                        BBCrud.Modals.show(data.id, titleName.charAt(0).toUpperCase() + titleName.slice(1) + ' detail', baseUrl);
+                        BBCrud.Modals.show(data.id, titleName.charAt(0).toUpperCase() + titleName.slice(1) + ' detail', baseUrl, data);
                     }
                 };
                 return methods;
@@ -202,5 +220,5 @@ BBCrud.Alert = function() {
 }();
 
 $(function() {
-   BBCrud.Alert.init({selector: '.bb-alert'});
+    BBCrud.Alert.init({selector: '.bb-alert'});
 });

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootbox_crud
 version: !ruby/object:Gem::Version
-  version: 0.1.1.4
+  version: 0.1.1.5
 platform: ruby
 authors:
 - Jiri Kaipr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-24 00:00:00.000000000 Z
+date: 2015-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties