From e28eb9158a50d7e6d97dbc68066e591ac600c241 Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Tue, 5 Jun 2012 21:40:44 -0700
Subject: removing all model creators.
The elementModel is now a getter that will create a new model when needed.
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
js/lib/NJUtils.js | 120 ------------------------------------------------------
1 file changed, 120 deletions(-)
(limited to 'js/lib/NJUtils.js')
diff --git a/js/lib/NJUtils.js b/js/lib/NJUtils.js
index 7dd4c9e8..0dec6345 100755
--- a/js/lib/NJUtils.js
+++ b/js/lib/NJUtils.js
@@ -90,30 +90,6 @@ exports.NJUtils = Montage.create(Component, {
}
},
- createModel: {
- value: function(el) {
- el.elementModel = Montage.create(ElementModel).initialize(el);
- }
- },
-
- createModelWithShape: {
- value: function(el, selection) {
- el.elementModel = Montage.create(ElementModel).initialize(el, true, selection);
- }
- },
-
- createModelWithSelection: {
- value: function(el, selection) {
- el.elementModel = Montage.create(ElementModel).initialize(el, false, selection);
- }
- },
-
- createModelForComponent: {
- value: function(el, selection) {
- el.elementModel = Montage.create(ElementModel).initialize(el, false, selection, true);
- }
- },
-
// TODO: Find a better place for this method
stylesFromDraw: {
value: function(element, width, height, drawData, pos) {
@@ -166,102 +142,6 @@ exports.NJUtils = Montage.create(Component, {
}
},
- ///// Element Model creation for existing elements
- ///// TODO: find a different place for this function
- makeElementModel: {
- value: function(el, selection, controller, isShape) {
- var p3d = Montage.create(Properties3D);
-
- var shapeProps = null;
- var pi = controller + "Pi";
-
- if(isShape) {
- shapeProps = Montage.create(ShapeModel);
- }
-
- if(el.controller) {
-
- var componentInfo = Montage.getInfoForObject(el.controller);
- var componentName = componentInfo.objectName.toLowerCase();
-
- controller = "component";
- isShape = false;
-
- switch(componentName) {
- case "feedreader":
- selection = "Feed Reader";
- pi = "FeedReaderPi";
- break;
- case "map":
- selection = "Map";
- pi = "MapPi";
- break;
- case "youtubechannel":
- selection = "Youtube Channel";
- pi = "YoutubeChannelPi";
- break;
- case "picasacarousel":
- selection = "Picasa Carousel";
- pi = "PicasaCarouselPi";
- break;
- }
- }
-
- el.elementModel = Montage.create(ElementModel, {
- type: { value: el.nodeName},
- selection: { value: selection},
- controller: { value: ControllerFactory.getController(controller)},
- pi: { value: pi},
- props3D: { value: p3d},
- shapeModel: { value: shapeProps},
- isShape: { value: isShape}
- });
-
-
- }
- },
-
- ///// Element Model creation for existing elements based on element type.
- ///// TODO: Selection and model should be based on the element type
- makeModelFromElement: {
- value: function(el) {
- var selection = "div",
- controller = "block",
- isShape = false;
- switch(el.nodeName.toLowerCase())
- {
- case "div":
- break;
- case "img":
- selection = "image";
- controller = "image";
- break;
- case "video":
- selection = "video";
- controller = "video";
- break;
- case "canvas":
- isShape = el.getAttribute("data-RDGE-id");
- if(isShape) {
- // TODO - Need more info about the shape
- selection = "canvas";
- controller = "shape";
- isShape = true;
- } else {
- selection = "canvas";
- controller = "canvas";
- }
- break;
- case "shape":
- break;
- }
- this.makeElementModel(el, selection, controller, isShape);
- if(el.elementModel && el.elementModel.props3D) {
- el.elementModel.props3D.init(el, (selection === "Stage"));
- }
- }
- },
-
///// Removes all child nodes and returns node
///// Accepts a single node, or an array of dom nodes
empty : {
--
cgit v1.2.3
From 806974142d44afdd23534bf2d18eff0a8e701e0c Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Fri, 8 Jun 2012 16:59:59 -0700
Subject: rewrite: currentSelectedContainer -> domContainer
Fixed the currentSelectedContainer by removing bindings and using property change on the current document
added the red outline back.
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
js/lib/NJUtils.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'js/lib/NJUtils.js')
diff --git a/js/lib/NJUtils.js b/js/lib/NJUtils.js
index 0dec6345..b35e29bc 100755
--- a/js/lib/NJUtils.js
+++ b/js/lib/NJUtils.js
@@ -96,8 +96,8 @@ exports.NJUtils = Montage.create(Component, {
var styles = {};
styles['position'] = pos ? pos: "absolute";
- styles['left'] = (Math.round(drawData.midPt[0] - 0.5 * width)) - this.application.ninja.currentSelectedContainer.offsetLeft + 'px';
- styles['top'] = (Math.round(drawData.midPt[1] - 0.5 * height)) - this.application.ninja.currentSelectedContainer.offsetTop + 'px';
+ styles['left'] = (Math.round(drawData.midPt[0] - 0.5 * width)) - this.application.ninja.currentDocument.model.domContainer.offsetLeft + 'px';
+ styles['top'] = (Math.round(drawData.midPt[1] - 0.5 * height)) - this.application.ninja.currentDocument.model.domContainer.offsetTop + 'px';
styles['width'] = width + 'px';
styles['height'] = height + 'px';
--
cgit v1.2.3