From dd432549597337d1c00a4c912891a1d5a0262aa2 Mon Sep 17 00:00:00 2001 From: alan bount Date: Tue, 26 Jan 2016 14:04:09 -0500 Subject: [PATCH 1/8] change to handlebars comment, so not rendered to DOM --- lib/reactive-modal.html | 2 +- package.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/reactive-modal.html b/lib/reactive-modal.html index 7c41839..e21f7af 100644 --- a/lib/reactive-modal.html +++ b/lib/reactive-modal.html @@ -7,7 +7,7 @@
- + {{!-- strange: {{> template}} works fine, but with the data context, template is searched inside the data context (the second variable) --}} {{> ../template doc}}
diff --git a/package.js b/package.js index 9807f96..28cdc23 100644 --- a/package.js +++ b/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Reactive bootstrap modals for meteor", - version: "1.0.2", + version: "1.0.3", git: "https://github.com/pahans/reactive-modal.git", name: "pahans:reactive-modal" }); From f9b7ce579a09cc1d5f23e95407972b8719b578ba Mon Sep 17 00:00:00 2001 From: alan bount Date: Tue, 26 Jan 2016 14:05:23 -0500 Subject: [PATCH 2/8] style: replaced double with single quotes --- lib/reactive-modal.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/reactive-modal.js b/lib/reactive-modal.js index 4504697..d930460 100644 --- a/lib/reactive-modal.js +++ b/lib/reactive-modal.js @@ -14,14 +14,14 @@ Template._reactiveModal.helpers({ }, disabled: function(){ if (this.button.disabled.get()) { - return "disabled" + return 'disabled' } else { return null; } }, dismiss: function(){ if(this.button.closeModalOnClick){ - return "modal"; + return 'modal'; } }, arrayify: function(obj){ @@ -38,9 +38,9 @@ Template._reactiveModal.events({ }); ReactiveModal.initDialog = function (info){ - var key = "rm-"+Meteor.uuid(); + var key = 'rm-'+Meteor.uuid(); if(!info || !info.template){ - console.error("you must define a template for " , key); + console.error('you must define a template for ' , key); } else { info.key = key; _modals[key] = info; @@ -54,7 +54,7 @@ ReactiveModal.initDialog = function (info){ newButton.disable = function () {newButton.disabled.set(true);}, newButton.enable = function () {newButton.disabled.set(false);} }; - + Blaze.renderWithData(Template._reactiveModal, info, document.body); } From 98e55395711e9bd53348f03dbc319381fc0fad0e Mon Sep 17 00:00:00 2001 From: alan bount Date: Tue, 26 Jan 2016 14:17:39 -0500 Subject: [PATCH 3/8] style: control spacing --- lib/reactive-modal.js | 41 +++++++++++++++++++++++------------------ package.js | 2 +- 2 files changed, 24 insertions(+), 19 deletions(-) diff --git a/lib/reactive-modal.js b/lib/reactive-modal.js index d930460..294115d 100644 --- a/lib/reactive-modal.js +++ b/lib/reactive-modal.js @@ -1,30 +1,30 @@ var _modals = {}; -ReactiveModal = function(){ +ReactiveModal = function() { // EV.call(this); this.buttons = {}; }; // _.extend(ReactiveModal.prototype, EV.prototype); Template._reactiveModal.helpers({ - class: function(){ + class: function() { var att; - if(this.class){ + if (this.class) { att = 'btn ' + this.class; } return att; }, - disabled: function(){ + disabled: function() { if (this.button.disabled.get()) { return 'disabled' } else { return null; } }, - dismiss: function(){ - if(this.button.closeModalOnClick){ + dismiss: function() { + if (this.button.closeModalOnClick) { return 'modal'; } }, - arrayify: function(obj){ + arrayify: function(obj) { result = []; for (var key in obj) result.push({name:key,button:obj[key]}); return result; @@ -32,39 +32,44 @@ Template._reactiveModal.helpers({ }); Template._reactiveModal.events({ - 'click .modal-footer .reactive-modal-btn.btn': function(e){ + 'click .modal-footer .reactive-modal-btn.btn': function(e) { this.button.emit('click', this.button); } }); -ReactiveModal.initDialog = function (info){ +ReactiveModal.initDialog = function (info) { var key = 'rm-'+Meteor.uuid(); - if(!info || !info.template){ + if (!info || !info.template) { console.error('you must define a template for ' , key); + return; } else { info.key = key; _modals[key] = info; - for(var button in info.buttons){ + for (var button in info.buttons) { var newButton = _.clone(info.buttons[button]); _.extend(newButton, new EV()); info.buttons[button] = newButton; newButton.closeModalOnClick = (info.buttons[button].closeModalOnClick === undefined || info.buttons[button].closeModalOnClick === true) ? true : false; newButton.disabled = new ReactiveVar((info.buttons[button].disabled === undefined || info.buttons[button].disabled === false || (info.buttons[button].disabled instanceof ReactiveVar && info.buttons[button].disabled.curValue===false)) ? false : true); - newButton.disable = function () {newButton.disabled.set(true);}, - newButton.enable = function () {newButton.disabled.set(false);} - }; + newButton.disable = function () { + newButton.disabled.set(true); + }, + newButton.enable = function () { + newButton.disabled.set(false); + }; + } Blaze.renderWithData(Template._reactiveModal, info, document.body); } var modalTarget = $('#' + key); - info.show = function(){ + info.show = function() { modalTarget.modal('show'); - } - info.hide = function(){ + }; + info.hide = function() { modalTarget.modal('hide'); - } + }; if (info.removeOnHide) { modalTarget.on('hidden.bs.modal', function() { diff --git a/package.js b/package.js index 28cdc23..21810ef 100644 --- a/package.js +++ b/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Reactive bootstrap modals for meteor", - version: "1.0.3", + version: "1.0.4", git: "https://github.com/pahans/reactive-modal.git", name: "pahans:reactive-modal" }); From 42094721786462729788609df693dfea311ff0f3 Mon Sep 17 00:00:00 2001 From: alan bount Date: Tue, 26 Jan 2016 14:40:05 -0500 Subject: [PATCH 4/8] support for HTML in button.label (icons) --- lib/reactive-modal.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/reactive-modal.html b/lib/reactive-modal.html index e21f7af..96e7948 100644 --- a/lib/reactive-modal.html +++ b/lib/reactive-modal.html @@ -12,7 +12,7 @@
{{#each arrayify buttons}} - + {{/each}}
From 132f410634c29eb9144ee755029d4d1e1027d3df Mon Sep 17 00:00:00 2001 From: alan bount Date: Tue, 26 Jan 2016 14:40:31 -0500 Subject: [PATCH 5/8] support for strings as info.template, lookup Template --- lib/reactive-modal.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/reactive-modal.js b/lib/reactive-modal.js index 294115d..caa35a6 100644 --- a/lib/reactive-modal.js +++ b/lib/reactive-modal.js @@ -59,6 +59,9 @@ ReactiveModal.initDialog = function (info) { newButton.disabled.set(false); }; } + if (typeof info.template === 'string') { + info.template = Template[info.template]; + } Blaze.renderWithData(Template._reactiveModal, info, document.body); } From 8a9411c431f52546dee1b8a2b0016a7d75e31bb5 Mon Sep 17 00:00:00 2001 From: alan bount Date: Wed, 27 Jan 2016 00:32:06 -0500 Subject: [PATCH 6/8] additional params for easier event callbacks on modal --- lib/reactive-modal.js | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/lib/reactive-modal.js b/lib/reactive-modal.js index caa35a6..155b406 100644 --- a/lib/reactive-modal.js +++ b/lib/reactive-modal.js @@ -74,6 +74,18 @@ ReactiveModal.initDialog = function (info) { modalTarget.modal('hide'); }; + if (info.onShow) { + modalTarget.on('show.bs.modal', info.onShow); + } + if (info.onShown) { + modalTarget.on('shown.bs.modal', info.onShown); + } + if (info.onHide) { + modalTarget.on('hide.bs.modal', info.onHide); + } + if (info.onHidden) { + modalTarget.on('hidden.bs.modal', info.onHidden); + } if (info.removeOnHide) { modalTarget.on('hidden.bs.modal', function() { $(this).remove(); From 6d73906904218426b7bb620b5ee80f18530e07e7 Mon Sep 17 00:00:00 2001 From: alan bount Date: Fri, 18 Mar 2016 11:42:21 -0400 Subject: [PATCH 7/8] add modalContainerClass --- README.md | 3 ++- lib/reactive-modal.html | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index fefb506..92f0caf 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,8 @@ Meteor.startup(function(){ var shareDialogInfo = { template: Template.appShareDialog, title: "Share the app", - modalDialogClass: "share-modal-dialog", //optional + modalContainerClass: "share-modal", //optional + modalDialogClass: "share-modal-dialog modal-lg", //optional modalBodyClass: "share-modal-body", //optional modalFooterClass: "share-modal-footer",//optional removeOnHide: true, //optional. If this is true, modal will be removed from DOM upon hiding diff --git a/lib/reactive-modal.html b/lib/reactive-modal.html index 96e7948..7bbc74f 100644 --- a/lib/reactive-modal.html +++ b/lib/reactive-modal.html @@ -1,5 +1,5 @@