From 65145cebdf4cde2767cbd0489ddcea5863c2ca9e Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Tue, 7 Feb 2012 14:53:46 -0800 Subject: IKNINJA-964 - Fixed inconsistent element name in PI/CSS panel. Signed-off-by: Valerio Virgillito --- js/tools/TagTool.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'js') diff --git a/js/tools/TagTool.js b/js/tools/TagTool.js index c527edf3..73a0ae5c 100644 --- a/js/tools/TagTool.js +++ b/js/tools/TagTool.js @@ -158,15 +158,15 @@ exports.TagTool = Montage.create(DrawingTool, { selectedTag = this.options.selectedElement; if(selectedTag === "divTool") { - newTag = NJUtils.makeNJElement("div", "Div", "block"); + newTag = NJUtils.makeNJElement("div", "div", "block"); } else if(selectedTag === "imageTool") { - newTag = NJUtils.makeNJElement("image", "Image", "image"); + newTag = NJUtils.makeNJElement("image", "image", "image"); } else if(selectedTag === "videoTool") { - newTag = NJUtils.makeNJElement("video", "Video", "video", { + newTag = NJUtils.makeNJElement("video", "video", "video", { innerHTML: "Your browser does not support the VIDEO element." }); } else if(selectedTag === "canvasTool") { - newTag = NJUtils.makeNJElement("canvas", "Canvas", "canvas"); + newTag = NJUtils.makeNJElement("canvas", "canvas", "canvas"); } else if(selectedTag === "customTool") { newTag = document.createElement(this.options.customName.value); newTag.Ninja = {}; -- cgit v1.2.3 From a930295dfebd7fe7b4db5324b2048e6e7366c6d8 Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Tue, 7 Feb 2012 16:12:23 -0800 Subject: IKNINJA-616 - Drag and drop images fix for the PI and source Signed-off-by: Valerio Virgillito --- js/mediators/drag-drop-mediator.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js') 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, { NJUtils.makeElementModel(domElem, "SVG", "block"); } else { // treat as a regular image - domElem = NJUtils.makeNJElement("image", "Image", "block"); + domElem = NJUtils.makeNJElement("image", "image", "image"); domElem.src = evt2.currentTarget.result; } -- cgit v1.2.3 From 9a404b8a717d0aac0eabb828a4d3cdc8c9c3eed8 Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Tue, 7 Feb 2012 17:42:04 -0800 Subject: IKNINJA - 1084: Fixing the custom tag. Signed-off-by: Valerio Virgillito --- .../tools-properties/tag-properties.reel/tag-properties.html | 6 +++--- js/tools/TagTool.js | 4 +--- 2 files changed, 4 insertions(+), 6 deletions(-) (limited to 'js') 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 @@ diff --git a/js/tools/TagTool.js b/js/tools/TagTool.js index 73a0ae5c..e3f49bbe 100644 --- a/js/tools/TagTool.js +++ b/js/tools/TagTool.js @@ -168,9 +168,7 @@ exports.TagTool = Montage.create(DrawingTool, { } else if(selectedTag === "canvasTool") { newTag = NJUtils.makeNJElement("canvas", "canvas", "canvas"); } else if(selectedTag === "customTool") { - newTag = document.createElement(this.options.customName.value); - newTag.Ninja = {}; - newTag.Ninja.selectionType = this.options.customName.value; + newTag = NJUtils.makeNJElement(this.options.customName.value, this.options.customName.value, "block"); } /* SWF Tag tool - Not used for now. Will revisit this at a later time. else if(selectedTag === "flashTool") { -- cgit v1.2.3