aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValerio Virgillito2012-06-12 16:51:43 -0700
committerValerio Virgillito2012-06-12 16:51:43 -0700
commitadc7c64c862445580b3cb2b76a7f937c0a3f5715 (patch)
tree5fe8ef30b4f98307e94810d0f0adf8351d6aa3b7
parentfcbb9a2e42b665766e0a38982a3c450fbaa1fdf4 (diff)
parent81cc4087588e12b851ead25a16368ec4dc846203 (diff)
downloadninja-adc7c64c862445580b3cb2b76a7f937c0a3f5715.tar.gz
Merge branch 'refs/heads/master' into montage-v10-integration
-rwxr-xr-xjs/models/element-model.js4
1 files changed, 4 insertions, 0 deletions
diff --git a/js/models/element-model.js b/js/models/element-model.js
index 76f15b21..e5a0f33a 100755
--- a/js/models/element-model.js
+++ b/js/models/element-model.js
@@ -91,6 +91,8 @@ var elementNameToController = function(name) {
91 return "block"; 91 return "block";
92 } else if(name === "img") { 92 } else if(name === "img") {
93 return "image"; 93 return "image";
94 } else if(name === "embed") {
95 return "image";
94 } else { 96 } else {
95 return name; 97 return name;
96 } 98 }
@@ -174,6 +176,8 @@ var elmo = exports.ElementModel = Montage.create(Montage, {
174 return "block"; 176 return "block";
175 } else if(name === "img") { 177 } else if(name === "img") {
176 return "image"; 178 return "image";
179 } else if(name === "embed") {
180 return "image";
177 } else { 181 } else {
178 return name; 182 return name;
179 } 183 }