aboutsummaryrefslogtreecommitdiff
path: root/js/controllers/elements/controller-factory.js
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-05-04 15:33:29 -0700
committerNivesh Rajbhandari2012-05-04 15:33:29 -0700
commitad94ec51c81badeba2b0f870cad8a0eec7878ebd (patch)
tree35c52d44d2c5399ea4019582af3fb55a53ee05c8 /js/controllers/elements/controller-factory.js
parent3ad9024bcfce76e28816daa02bac14fc8985ca62 (diff)
parent3ebed34665fa73b0ce613b400f3029ebf4476439 (diff)
downloadninja-ad94ec51c81badeba2b0f870cad8a0eec7878ebd.tar.gz
Merge branch 'refs/heads/dom-architecture-master' into Dom-Architecture
Diffstat (limited to 'js/controllers/elements/controller-factory.js')
-rwxr-xr-xjs/controllers/elements/controller-factory.js2
1 files changed, 2 insertions, 0 deletions
diff --git a/js/controllers/elements/controller-factory.js b/js/controllers/elements/controller-factory.js
index 1bbbbce0..3ac3fe14 100755
--- a/js/controllers/elements/controller-factory.js
+++ b/js/controllers/elements/controller-factory.js
@@ -42,6 +42,8 @@ exports.ControllerFactory = Montage.create(Montage, {
42 return ImageController; 42 return ImageController;
43 } else if(value.indexOf("video") !== -1) { 43 } else if(value.indexOf("video") !== -1) {
44 return VideoController; 44 return VideoController;
45 } else {
46 return BlockController;
45 } 47 }
46 } catch (err) { 48 } catch (err) {
47 console.log("Could not create Controller Factory " + err); 49 console.log("Could not create Controller Factory " + err);