Merge pull request #41 from alxndr/backbone-update

Region.ensureEl() -> Region._ensureElement()
awkward · Oct 14, 2014 · 3bd480b · 3bd480b
2 parents 150ce50 + ea9cd36
commit 3bd480b
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 11 deletions.
diff --git a/backbone.marionette.modals-min.js b/backbone.marionette.modals-min.js
diff --git a/backbone.marionette.modals.js b/backbone.marionette.modals.js
diff --git a/backbone.modal-bundled-min.js b/backbone.modal-bundled-min.js
diff --git a/backbone.modal-bundled.js b/backbone.modal-bundled.js
diff --git a/backbone.modal-min.js b/backbone.modal-min.js
diff --git a/examples/vendor/backbone.marionette.modals.js b/examples/vendor/backbone.marionette.modals.js
diff --git a/examples/vendor/marionette.js b/examples/vendor/marionette.js
@@ -897,7 +897,7 @@ _.extend(Marionette.Region.prototype, Backbone.Events, {
   // or just before closing the view, respectively.
   show: function(view){
 
-    this.ensureEl();
+    this._ensureElement();
 
     if (view !== this.currentView) {
       this.close();
@@ -913,7 +913,7 @@ _.extend(Marionette.Region.prototype, Backbone.Events, {
     this.currentView = view;
   },
 
-  ensureEl: function(){
+  _ensureElement: function(){
     if (!this.$el || this.$el.length === 0){
       this.$el = this.getEl(this.el);
     }
@@ -2337,4 +2337,4 @@ _.extend(Marionette.Module, {
 
 
   return Marionette;
-})(this, Backbone, _);
+})(this, Backbone, _);
diff --git a/src/backbone.marionette.modals.coffee b/src/backbone.marionette.modals.coffee
@@ -6,7 +6,7 @@ class Backbone.Marionette.Modals extends Backbone.Marionette.Region
   zIndex: 0
 
   show: (modal, options = {}) ->
-    @ensureEl()
+    @_ensureElement()
 
     if @modals.length > 0
       lastModal = _.last(@modals)
@@ -64,4 +64,4 @@ class Backbone.Marionette.Modals extends Backbone.Marionette.Region
     Marionette.triggerMethod.call(this, "close")
 
   closeAll: ->
-    @close() for modal in @modals
+    @close() for modal in @modals