diff options
author | Pushkar Joshi | 2012-06-13 10:56:14 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-06-13 10:56:14 -0700 |
commit | 03f48f8bdd18462a111032ea54fd21dabe9568b2 (patch) | |
tree | 1087824ad17fcffae4f566551b71b78dd51d9a61 /js/models | |
parent | 250d84a79d9f72c6a98cbbecfe4e21f2c0d53a19 (diff) | |
parent | 5a7774f6769a7a682e21bafe0e57007668f16153 (diff) | |
download | ninja-03f48f8bdd18462a111032ea54fd21dabe9568b2.tar.gz |
Merge branch 'master' into brushtool
Diffstat (limited to 'js/models')
-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 | } |