romo 0.14.4 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
 SHA1: 
-  metadata.gz: 3d8167ef081b58a9375eb1f6b42a000b04590e2d
-  data.tar.gz: f5c6c2e803b1a9ef5f1a97e4ab979f35705bc936
+  metadata.gz: 29038a7b155e52db93e90ea26efff083381caab7
+  data.tar.gz: 5002aeb2208a9c85108a12289f8c2802d4321e2a
 SHA512: 
-  metadata.gz: 005eab4ae4efc9c48eb17ca3e7c0679eddcac66a639c885267d00279279f80b417d9a021cb6ee95658dd3894bf731d1bc00a7c09f337378bd893e4e5ffba0ecb
-  data.tar.gz: a24be3401a228beb391a488590eda3e59e470ad3c9528ad483c5f7c832bd13af838298fb519e84aca437ae7ed079126459d6ff0f252b67f3071043d7ead334e8
+  metadata.gz: 44b0beb45e3d30f3ed2fd65807c1ff473fe2462dc8ea68d49067534016b4698f5ccb8ba745b3f555d8b5dc727a57ca8bf034bd4e627f286ea216da2f0db23744
+  data.tar.gz: beef77e14c6f677659082312d94a84c8bc1302f86d1e4f3149d6b1db6457ec05c9be1eb2a7e177efd4a5af8b691cf681e422137ace38c8c97f4ca6f81bfb0a97

data/assets/js/romo/inline.js

@@ -10,14 +10,10 @@ var RomoInline = function(element) {
   this.dismissElem = undefined;
 
   this.elem.on('inline:triggerDismiss', $.proxy(this.onDismissClick, this));
-  this.elem.on('inline:triggerInvoke',  $.proxy(function(e) {
-    this.doInvoke();
+  this.elem.on('inline:triggerShow',  $.proxy(function(e) {
+    this.doShow();
   }, 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;
@@ -40,24 +36,20 @@ RomoInline.prototype.doInit = function() {
   // override as needed
 }
 
-RomoInline.prototype.doInvoke = function() {
-  this.elem.show();
-  this.toggleElem.hide();
-  this.elem.trigger('inline:invoke', [this]);
-}
-
 RomoInline.prototype.doLoadStart = function() {
   this.elem.html('');
   this.elem.trigger('inline:loadStart', [this]);
 }
 
 RomoInline.prototype.doLoadSuccess = function(data) {
+  this.doShow();
   Romo.initHtml(this.elem, data);
   this.doBindDismiss();
   this.elem.trigger('inline:loadSuccess', [data, this]);
 }
 
 RomoInline.prototype.doLoadError = function(xhr) {
+  this.doShow();
   this.elem.trigger('inline:loadError', [xhr, this]);
 }
 
@@ -85,6 +77,12 @@ RomoInline.prototype.doDismiss = function() {
   this.elem.trigger('inline:dismiss', [this]);
 }
 
+RomoInline.prototype.doShow = function() {
+  this.elem.show();
+  this.toggleElem.hide();
+  this.elem.trigger('inline:show', [this]);
+}
+
 Romo.onInitUI(function(e) {
   Romo.initUIElems(e, '[data-romo-inline-auto="true"]').romoInline();
 });

data/lib/romo/version.rb

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

metadata

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