romo 0.14.3 → 0.14.4

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
 SHA1: 
-  metadata.gz: 47f8c4ca85051034b71a1caab70990e0ab810fad
-  data.tar.gz: 6a2117a093e9ed6b831403e2a0e3681559ddb10b
+  metadata.gz: 3d8167ef081b58a9375eb1f6b42a000b04590e2d
+  data.tar.gz: f5c6c2e803b1a9ef5f1a97e4ab979f35705bc936
 SHA512: 
-  metadata.gz: e9f0145616e5fc018339c21f183d2754a5bf55b2fd843dcb9f3158996f7d95deef6473af8fcf2b201c49359a86fc0fecfc8638d42203d4a94f7e6e1200eeeb7f
-  data.tar.gz: 496d1f1de0ca5b8076074ae385f7565e991f3c699de1a4ff85bae738a0b2c992082d25e558085b8cc17ab29ca4e3e8f684c71aaa8c08325e0bba013be452294f
+  metadata.gz: 005eab4ae4efc9c48eb17ca3e7c0679eddcac66a639c885267d00279279f80b417d9a021cb6ee95658dd3894bf731d1bc00a7c09f337378bd893e4e5ffba0ecb
+  data.tar.gz: a24be3401a228beb391a488590eda3e59e470ad3c9528ad483c5f7c832bd13af838298fb519e84aca437ae7ed079126459d6ff0f252b67f3071043d7ead334e8

data/assets/js/romo/dropdown.js

@@ -8,20 +8,26 @@ var RomoDropdown = function(element) {
   this.elem = $(element);
   this.doInitPopup();
   this.romoInvoke = this.elem.romoInvoke()[0];
+  this.romoInvoke.doUnBindInvoke(); // disable auto invoke on click
 
-  this.elem.unbind('click');
-  this.elem.on('click', $.proxy(this.onToggleClick, this));
+  if (this.elem.data('romo-dropdown-disable-click-invoke') !== true) {
+    this.elem.unbind('click');
+    this.elem.on('click', $.proxy(this.onToggleClick, this));
+  }
   this.elem.on('dropdown:triggerToggle', $.proxy(this.onToggleClick, this));
   this.elem.on('dropdown:triggerPopupOpen', $.proxy(this.onPopupOpen, this));
   this.elem.on('dropdown:triggerPopupClose', $.proxy(this.onPopupClose, this));
   this.elem.on('invoke:loadStart', $.proxy(function(e, invoke) {
     this.doLoadBodyStart();
+    return false;
   }, this));
   this.elem.on('invoke:loadSuccess', $.proxy(function(e, data, invoke) {
     this.doLoadBodySuccess(data);
+    return false;
   }, this));
   this.elem.on('invoke:loadError', $.proxy(function(e, xhr, invoke) {
     this.doLoadBodyError(xhr);
+    return false;
   }, this));
 
   this.doBindElemKeyUp();
@@ -197,7 +203,12 @@ RomoDropdown.prototype.onPopupOpen = function(e) {
 }
 
 RomoDropdown.prototype.doPopupOpen = function() {
-  this.romoInvoke.doInvoke();
+  if (this.elem.data('romo-dropdown-content-elem') !== undefined) {
+    this.doLoadBodySuccess($(this.elem.data('romo-dropdown-content-elem')).html())
+  } else {
+    this.romoInvoke.doInvoke();
+  }
+
   this.popupElem.addClass('romo-dropdown-open');
   this.doPlacePopupElem();
 

data/assets/js/romo/dropdown_form.js

@@ -19,6 +19,7 @@ var RomoDropdownForm = function(element) {
   this.doBindForm();
   this.elem.on('dropdown:loadBodySuccess', $.proxy(function(e, data, dropdown) {
     this.doBindForm();
+    this.elem.trigger('dropdownForm:formReady', [this.form, this]);
   }, this));
 
   this.doInit();
@@ -69,6 +70,9 @@ RomoDropdownForm.prototype.doBindForm = function() {
   formElem.on('form:ready', $.proxy(function(e, form) {
     this.elem.trigger('dropdownForm:form:ready', [form, this]);
   }, this));
+  formElem.on('form:confirmSubmit', $.proxy(function(e, form) {
+    this.elem.trigger('dropdownForm:form:confirmSubmit', [form, this]);
+  }, this));
   formElem.on('form:beforeSubmit', $.proxy(function(e, form) {
     this.elem.trigger('dropdownForm:form:beforeSubmit', [form, this]);
   }, this));
@@ -88,7 +92,7 @@ RomoDropdownForm.prototype.doBindForm = function() {
     this.elem.trigger('dropdownForm:form:browserSubmit', [form, this]);
   }, this));
 
-  var submitElement = this.dropdown.popupElem.find('[data-romo-form-submit="true"]')[0];
+  var submitElement = this.dropdown.popupElem.find('[data-romo-form-submit]')[0];
   var indicatorElements = this.dropdown.popupElem.find('[data-romo-indicator-auto="true"]');
   this.form = formElem.romoForm(submitElement, indicatorElements)[0];
 }

data/assets/js/romo/form.js

@@ -6,7 +6,7 @@ $.fn.romoForm = function(givenSubmitElement, givenIndicatorElements) {
 
 var RomoForm = function(element, givenSubmitElement, givenIndicatorElements) {
   this.elem = $(element);
-  this.defaultSubmitElem = this.elem.find('button[type="submit"], input[type="submit"], [data-romo-form-submit="true"]');
+  this.defaultSubmitElem = this.elem.find('button[type="submit"], input[type="submit"], [data-romo-form-submit]');
   this.submitElem = $(givenSubmitElement || this.defaultSubmitElem);
   this.defaultIndicatorElems = this.elem.find('[data-romo-indicator-auto="true"]');
   this.indicatorElems = $(givenIndicatorElements || this.defaultIndicatorElems);
@@ -80,7 +80,9 @@ RomoForm.prototype.onSubmitClick = function(e) {
     e.preventDefault();
   }
 
-  if (this.submitElem.hasClass('disabled') === false) {
+  if (this.submitElem.data('romo-form-submit') === 'confirm') {
+    this.elem.trigger('form:confirmSubmit', [this]);
+  } else if (this.submitElem.hasClass('disabled') === false) {
     this.doSubmit();
   }
 }

data/assets/js/romo/inline.js

@@ -5,20 +5,30 @@ $.fn.romoInline = function() {
 }
 
 var RomoInline = function(element) {
-  this.elem = $(element);
-  this.toggleElem = $(this.elem.data('romo-inline-toggle'));
+  this.elem        = $(element);
+  this.toggleElem  = $(this.elem.data('romo-inline-toggle'));
+  this.dismissElem = undefined;
+
+  this.elem.on('inline:triggerDismiss', $.proxy(this.onDismissClick, this));
+  this.elem.on('inline:triggerInvoke',  $.proxy(function(e) {
+    this.doInvoke();
+  }, this));
 
   this.elem.on('invoke:invoke', $.proxy(function(e, invoke) {
     this.doInvoke();
+    return false;
   }, this));
   this.elem.on('invoke:loadStart', $.proxy(function(e, invoke) {
     this.doLoadStart();
+    return false;
   }, this));
   this.elem.on('invoke:loadSuccess', $.proxy(function(e, data, invoke) {
     this.doLoadSuccess(data);
+    return false;
   }, this));
   this.elem.on('invoke:loadError', $.proxy(function(e, xhr, invoke) {
     this.doLoadError(xhr);
+    return false;
   }, this));
 
   this.doBindDismiss();
@@ -52,9 +62,9 @@ RomoInline.prototype.doLoadError = function(xhr) {
 }
 
 RomoInline.prototype.doBindDismiss = function() {
-  var dismissElem = this.elem.find('[data-romo-inline-dismiss="true"]');
-  dismissElem.unbind('click');
-  dismissElem.on('click', $.proxy(this.onDismissClick, this));
+  this.dismissElem = this.elem.find('[data-romo-inline-dismiss]');
+  this.dismissElem.unbind('click');
+  this.dismissElem.on('click', $.proxy(this.onDismissClick, this));
 }
 
 RomoInline.prototype.onDismissClick = function(e) {
@@ -62,7 +72,11 @@ RomoInline.prototype.onDismissClick = function(e) {
     e.preventDefault();
   }
 
-  this.doDismiss();
+  if (this.dismissElem.data('romo-inline-dismiss') === 'confirm') {
+    this.elem.trigger('inline:confirmDismiss', [this]);
+  } else if (this.dismissElem.hasClass('disabled') === false) {
+    this.doDismiss();
+  }
 }
 
 RomoInline.prototype.doDismiss = function() {

data/assets/js/romo/inline_form.js

@@ -16,9 +16,16 @@ var RomoInlineForm = function(element) {
       this.form.elem.trigger('form:triggerSubmit', []);
     }
   }, this));
+  this.elem.on('inlineForm:inline:triggerInvoke', $.proxy(function(e) {
+    this.inline.elem.trigger('inline:triggerInvoke', []);
+  }, this));
+  this.elem.on('inlineForm:inline:triggerDismiss', $.proxy(function(e) {
+    this.inline.elem.trigger('inline:triggerDismiss', []);
+  }, this));
   this.doBindForm();
   this.elem.on('inline:loadSuccess', $.proxy(function(e, data, inline) {
     this.doBindForm();
+    this.elem.trigger('inlineForm:formReady', [this.form, this]);
   }, this));
 
   this.doInit();
@@ -48,6 +55,9 @@ RomoInlineForm.prototype.doBindInline = function() {
   this.elem.on('inline:dismiss', $.proxy(function(e, inline) {
     this.elem.trigger('inlineForm:inline:dismiss', [inline, this]);
   }, this));
+  this.elem.on('inline:confirmDismiss', $.proxy(function(e, inline) {
+    this.elem.trigger('inlineForm:inline:confirmDismiss', [inline, this]);
+  }, this));
 }
 
 RomoInlineForm.prototype.doBindForm = function() {
@@ -59,6 +69,9 @@ RomoInlineForm.prototype.doBindForm = function() {
   formElem.on('form:ready', $.proxy(function(e, form) {
     this.elem.trigger('inlineForm:form:ready', [form, this]);
   }, this));
+  formElem.on('form:confirmSubmit', $.proxy(function(e, form) {
+    this.elem.trigger('inlineForm:form:confirmSubmit', [form, this]);
+  }, this));
   formElem.on('form:beforeSubmit', $.proxy(function(e, form) {
     this.elem.trigger('inlineForm:form:beforeSubmit', [form, this]);
   }, this));
@@ -75,7 +88,7 @@ RomoInlineForm.prototype.doBindForm = function() {
     this.elem.trigger('inlineForm:form:submitError', [xhr, form, this]);
   }, this));
 
-  var submitElement = this.elem.find('[data-romo-form-submit="true"]')[0];
+  var submitElement = this.elem.find('[data-romo-form-submit]')[0];
   var indicatorElements = this.elem.find('[data-romo-indicator-auto="true"]');
   this.form = formElem.romoForm(submitElement, indicatorElements)[0];
 }

data/assets/js/romo/invoke.js

@@ -6,11 +6,13 @@ $.fn.romoInvoke = function() {
 
 var RomoInvoke = function(element) {
   this.elem = $(element);
-  this.targetElem = $(this.elem.data('romo-invoke-target'));
-  this.invokeOn = this.elem.data('romo-invoke-on') || 'click';
-  this.invokeAttr = this.elem.data('romo-invoke-attr') || 'href';
-  this.invokeMethod = this.elem.data('romo-invoke-method') || 'GET';
-  this.loadOnlyOnce = this.elem.data('romo-invoke-load-once') === true;
+  this.targetElem    = $(this.elem.data('romo-invoke-target'));
+  this.invokeOn      = this.elem.data('romo-invoke-on') || 'click';
+  this.invokeAttr    = this.elem.data('romo-invoke-attr') || 'href';
+  this.invokeMethod  = this.elem.data('romo-invoke-method') || 'GET';
+  this.loadOnlyOnce  = this.elem.data('romo-invoke-load-once') === true;
+  this.invokeQueued  = false;
+  this.invokeRunning = false;
 
   this.elem.unbind(this.invokeOn);
 
@@ -45,14 +47,9 @@ RomoInvoke.prototype.onInvoke = function(e) {
 }
 
 RomoInvoke.prototype.doInvoke = function() {
-  var loadHref = this.elem.attr(this.invokeAttr);
-  if (this.loadOnlyOnce === true) {
-    this.elem.removeAttr(this.invokeAttr);
-  }
-  if (loadHref !== undefined) {
-    this.doLoad(loadHref);
-  } else {
-    this._trigger('invoke:invoke', [this]);
+  this.invokeQueued = true;
+  if (this.invokeRunning === false) {
+    this._doInvoke();
   }
 }
 
@@ -68,13 +65,38 @@ RomoInvoke.prototype.doLoad = function(href) {
 }
 
 RomoInvoke.prototype.onLoadAjaxSuccess = function(data, status, xhr) {
-  this._trigger('invoke:invoke', [this]);
   this._trigger('invoke:loadSuccess', [data, this]);
+  this._doCompleteInvoke();
 }
 
 RomoInvoke.prototype.onLoadAjaxError = function(xhr, errorType, error) {
-  this._trigger('invoke:invoke', [this]);
   this._trigger('invoke:loadError', [xhr, this]);
+  this._doCompleteInvoke();
+}
+
+// private
+
+RomoInvoke.prototype._doCompleteInvoke = function() {
+  this._trigger('invoke:invoke', [this]);
+  if (this.invokeQueued === true) {
+    this._doInvoke();
+  } else {
+    this.invokeRunning = false;
+  }
+}
+
+RomoInvoke.prototype._doInvoke = function() {
+  this.invokeQueued  = false;
+  this.invokeRunning = true;
+  var loadHref = this.elem.attr(this.invokeAttr);
+  if (this.loadOnlyOnce === true) {
+    this.elem.removeAttr(this.invokeAttr);
+  }
+  if (loadHref !== undefined) {
+    this.doLoad(loadHref);
+  } else {
+    this._doCompleteInvoke();
+  }
 }
 
 RomoInvoke.prototype._trigger = function(event_name, event_data) {

data/assets/js/romo/modal.js

@@ -8,20 +8,26 @@ var RomoModal = function(element) {
   this.elem = $(element);
   this.doInitPopup();
   this.romoInvoke = this.elem.romoInvoke()[0];
+  this.romoInvoke.doUnBindInvoke(); // disable auto invoke on click
 
-  this.elem.unbind('click');
-  this.elem.on('click', $.proxy(this.onToggleClick, this));
+  if (this.elem.data('romo-modal-disable-click-invoke') !== true) {
+    this.elem.unbind('click');
+    this.elem.on('click', $.proxy(this.onToggleClick, this));
+  }
   this.elem.on('modal:triggerToggle', $.proxy(this.onToggleClick, this));
   this.elem.on('modal:triggerPopupOpen', $.proxy(this.onPopupOpen, this));
   this.elem.on('modal:triggerPopupClose', $.proxy(this.onPopupClose, this));
   this.elem.on('invoke:loadStart', $.proxy(function(e, invoke) {
     this.doLoadBodyStart();
+    return false;
   }, this));
   this.elem.on('invoke:loadSuccess', $.proxy(function(e, data, invoke) {
     this.doLoadBodySuccess(data);
+    return false;
   }, this));
   this.elem.on('invoke:loadError', $.proxy(function(e, xhr, invoke) {
     this.doLoadBodyError(xhr);
+    return false;
   }, this));
 
   this.doBindElemKeyUp();
@@ -164,7 +170,12 @@ RomoModal.prototype.onPopupOpen = function(e) {
 }
 
 RomoModal.prototype.doPopupOpen = function() {
-  this.romoInvoke.doInvoke();
+  if (this.elem.data('romo-modal-content-elem') !== undefined) {
+    this.doLoadBodySuccess($(this.elem.data('romo-modal-content-elem')).html())
+  } else {
+    this.romoInvoke.doInvoke();
+  }
+
   this.popupElem.addClass('romo-modal-open');
   this.doPlacePopupElem();
 

data/assets/js/romo/modal_form.js

@@ -19,6 +19,7 @@ var RomoModalForm = function(element) {
   this.doBindForm();
   this.elem.on('modal:loadBodySuccess', $.proxy(function(e, data, modal) {
     this.doBindForm();
+    this.elem.trigger('modalForm:formReady', [this.form, this]);
   }, this));
 
   this.doInit();
@@ -78,6 +79,9 @@ RomoModalForm.prototype.doBindForm = function() {
   formElem.on('form:ready', $.proxy(function(e, form) {
     this.elem.trigger('modalForm:form:ready', [form, this]);
   }, this));
+  formElem.on('form:confirmSubmit', $.proxy(function(e, form) {
+    this.elem.trigger('modalForm:form:confirmSubmit', [form, this]);
+  }, this));
   formElem.on('form:beforeSubmit', $.proxy(function(e, form) {
     this.elem.trigger('modalForm:form:beforeSubmit', [form, this]);
   }, this));
@@ -97,7 +101,7 @@ RomoModalForm.prototype.doBindForm = function() {
     this.elem.trigger('modalForm:form:browserSubmit', [form, this]);
   }, this));
 
-  var submitElement = this.modal.popupElem.find('[data-romo-form-submit="true"]')[0];
+  var submitElement = this.modal.popupElem.find('[data-romo-form-submit]')[0];
   var indicatorElements = this.modal.popupElem.find('[data-romo-indicator-auto="true"]');
   this.form = formElem.romoForm(submitElement, indicatorElements)[0];
 }

data/assets/js/romo/tooltip.js

@@ -108,12 +108,15 @@ RomoTooltip.prototype.doBindInvoke = function() {
 
   this.elem.on('invoke:loadStart', $.proxy(function(e, invoke) {
     this.doLoadBodyStart();
+    return false;
   }, this));
   this.elem.on('invoke:loadSuccess', $.proxy(function(e, data, invoke) {
     this.doLoadBodySuccess(data);
+    return false;
   }, this));
   this.elem.on('invoke:loadError', $.proxy(function(e, xhr, invoke) {
     this.doLoadBodyError(xhr);
+    return false;
   }, this));
 }
 

data/lib/romo/version.rb

@@ -1,3 +1,3 @@
 module Romo
-  VERSION = "0.14.3"
+  VERSION = "0.14.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: romo
 version: !ruby/object:Gem::Version 
-  version: 0.14.3
+  version: 0.14.4
 platform: ruby
 authors: 
 - Kelly Redding
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2016-01-18 00:00:00 Z
+date: 2016-01-25 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: assert