diff options
author | Valerio Virgillito | 2012-05-04 15:31:40 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-05-04 15:31:40 -0700 |
commit | 3ebed34665fa73b0ce613b400f3029ebf4476439 (patch) | |
tree | 09a3c592035030bda7bb62d1f908ce263377d74c /js/controllers/elements/controller-factory.js | |
parent | 8dcbac5d4c30e9dfbc543a5f997939111e9c9f89 (diff) | |
parent | 526e423e4a2734c2b139af23911e912452a4443f (diff) | |
download | ninja-3ebed34665fa73b0ce613b400f3029ebf4476439.tar.gz |
Merge branch 'refs/heads/master' into dom-architecture
Diffstat (limited to 'js/controllers/elements/controller-factory.js')
-rwxr-xr-x | js/controllers/elements/controller-factory.js | 2 |
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); |