diff options
author | Armen Kesablyan | 2012-06-19 00:45:26 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-06-19 00:45:26 -0700 |
commit | c59eb371559a3061ce53223e249ca97daace5968 (patch) | |
tree | f9540e26c0f273d35f92010605da65dd85bbe70c /js/models/element-model.js | |
parent | 0f040acabfb7a4bf3138debec5aff869487ceb11 (diff) | |
parent | 918a4f5870e972b6e4e301c3237e065a1ffd26f5 (diff) | |
download | ninja-c59eb371559a3061ce53223e249ca97daace5968.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal
Diffstat (limited to 'js/models/element-model.js')
-rwxr-xr-x | js/models/element-model.js | 4 |
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 | } |