Merge branch 'master' of https://github.com/vash15/backbone.viewstack

# Conflicts: # package.json
vash15 · Oct 31, 2016 · 70d69a3 · 70d69a3
2 parents e2a1dde + 74403c1
commit 70d69a3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "backbone.viewstack",
-  "version": "2.1.1",
+  "version": "2.1.3",
   "homepage": "https://github.com/vash15/backbone.viewstack",
   "authors": [
     "Michele Belluco <[email protected]>",

diff --git a/lib/viewstack.js b/lib/viewstack.js
@@ -139,9 +139,10 @@
 		},
 
 		getFirstInstanceFromClassType: function getFirstInstanceFromClassType(classType) {
-			return _.find(this._stack, function (aView) {
-				return aView instanceof classType;
+			var r = _.find(this._stack, function (aItem) {
+				return _.isObject(aItem) && aItem.view instanceof classType;
 			});
+			return r ? r.view : null;
 		},
 
 		getZIndex: function () {