diff options
author | Valerio Virgillito | 2012-02-08 11:33:42 -0800 |
---|---|---|
committer | Valerio Virgillito | 2012-02-08 11:33:42 -0800 |
commit | 10cdeb52403f16d5d4be43a516e8cdfbc866a2a2 (patch) | |
tree | c37e41683d633263271d5c1e574f067dab6c34e8 /js | |
parent | 24f9717f2714f0497382436c4602736283247cf1 (diff) | |
parent | 9a404b8a717d0aac0eabb828a4d3cdc8c9c3eed8 (diff) | |
download | ninja-10cdeb52403f16d5d4be43a516e8cdfbc866a2a2.tar.gz |
Merge pull request #21 from mencio/pi_bugs
Pi bugs fixes for 964, 616, 1084
Diffstat (limited to 'js')
-rw-r--r-- | js/components/tools-properties/tag-properties.reel/tag-properties.html | 6 | ||||
-rw-r--r-- | js/mediators/drag-drop-mediator.js | 2 | ||||
-rw-r--r-- | js/tools/TagTool.js | 12 |
3 files changed, 9 insertions, 11 deletions
diff --git a/js/components/tools-properties/tag-properties.reel/tag-properties.html b/js/components/tools-properties/tag-properties.reel/tag-properties.html index c7588b9e..2b81bb71 100644 --- a/js/components/tools-properties/tag-properties.reel/tag-properties.html +++ b/js/components/tools-properties/tag-properties.reel/tag-properties.html | |||
@@ -56,9 +56,9 @@ | |||
56 | <label class="label"> Tag Name:</label> | 56 | <label class="label"> Tag Name:</label> |
57 | 57 | ||
58 | <select id="customTagCB" class="nj-skinned"> | 58 | <select id="customTagCB" class="nj-skinned"> |
59 | <option>Article</option> | 59 | <option>article</option> |
60 | <option>Aside</option> | 60 | <option>aside</option> |
61 | <option>Section</option> | 61 | <option>section</option> |
62 | </select> | 62 | </select> |
63 | </div> | 63 | </div> |
64 | 64 | ||
diff --git a/js/mediators/drag-drop-mediator.js b/js/mediators/drag-drop-mediator.js index aacb228c..ede71383 100644 --- a/js/mediators/drag-drop-mediator.js +++ b/js/mediators/drag-drop-mediator.js | |||
@@ -122,7 +122,7 @@ exports.DragDropMediator = Montage.create(Component, { | |||
122 | 122 | ||
123 | NJUtils.makeElementModel(domElem, "SVG", "block"); | 123 | NJUtils.makeElementModel(domElem, "SVG", "block"); |
124 | } else { // treat as a regular image | 124 | } else { // treat as a regular image |
125 | domElem = NJUtils.makeNJElement("image", "Image", "block"); | 125 | domElem = NJUtils.makeNJElement("image", "image", "image"); |
126 | domElem.src = evt2.currentTarget.result; | 126 | domElem.src = evt2.currentTarget.result; |
127 | } | 127 | } |
128 | 128 | ||
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") { |