aboutsummaryrefslogtreecommitdiff
path: root/js/tools
diff options
context:
space:
mode:
authorJohn Mayhew2012-02-08 14:39:16 -0800
committerJohn Mayhew2012-02-08 14:39:16 -0800
commitb6bc8b0bb91382991e6e43ad341304c813124882 (patch)
tree9ab504c981d2cf3be96a9f80ce638a85300489db /js/tools
parentc7b5edf0351d678d26b17eb5e2f995a140e209bb (diff)
parentab12be4e9a0d9fee4450795077b0107983b5682e (diff)
downloadninja-b6bc8b0bb91382991e6e43ad341304c813124882.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch
Diffstat (limited to 'js/tools')
-rw-r--r--js/tools/TagTool.js12
1 files changed, 5 insertions, 7 deletions
diff --git a/js/tools/TagTool.js b/js/tools/TagTool.js
index c527edf3..e3f49bbe 100644
--- a/js/tools/TagTool.js
+++ b/js/tools/TagTool.js
@@ -158,19 +158,17 @@ exports.TagTool = Montage.create(DrawingTool, {
158 selectedTag = this.options.selectedElement; 158 selectedTag = this.options.selectedElement;
159 159
160 if(selectedTag === "divTool") { 160 if(selectedTag === "divTool") {
161 newTag = NJUtils.makeNJElement("div", "Div", "block"); 161 newTag = NJUtils.makeNJElement("div", "div", "block");
162 } else if(selectedTag === "imageTool") { 162 } else if(selectedTag === "imageTool") {
163 newTag = NJUtils.makeNJElement("image", "Image", "image"); 163 newTag = NJUtils.makeNJElement("image", "image", "image");
164 } else if(selectedTag === "videoTool") { 164 } else if(selectedTag === "videoTool") {
165 newTag = NJUtils.makeNJElement("video", "Video", "video", { 165 newTag = NJUtils.makeNJElement("video", "video", "video", {
166 innerHTML: "Your browser does not support the VIDEO element." 166 innerHTML: "Your browser does not support the VIDEO element."
167 }); 167 });
168 } else if(selectedTag === "canvasTool") { 168 } else if(selectedTag === "canvasTool") {
169 newTag = NJUtils.makeNJElement("canvas", "Canvas", "canvas"); 169 newTag = NJUtils.makeNJElement("canvas", "canvas", "canvas");
170 } else if(selectedTag === "customTool") { 170 } else if(selectedTag === "customTool") {
171 newTag = document.createElement(this.options.customName.value); 171 newTag = NJUtils.makeNJElement(this.options.customName.value, this.options.customName.value, "block");
172 newTag.Ninja = {};
173 newTag.Ninja.selectionType = this.options.customName.value;
174 } 172 }
175 /* SWF Tag tool - Not used for now. Will revisit this at a later time. 173 /* SWF Tag tool - Not used for now. Will revisit this at a later time.
176 else if(selectedTag === "flashTool") { 174 else if(selectedTag === "flashTool") {