aboutsummaryrefslogtreecommitdiff
path: root/js/controllers/elements
diff options
context:
space:
mode:
authorKris Kowal2012-07-06 11:52:06 -0700
committerKris Kowal2012-07-06 15:01:48 -0700
commit648ee61ae84216d0236e0dbc211addc13b2cfa3a (patch)
tree8f0f55557bd0c47a84e49c1977c950645d284607 /js/controllers/elements
parentaedd14b18695d031f695d27dfbd94df5614495bb (diff)
downloadninja-648ee61ae84216d0236e0dbc211addc13b2cfa3a.tar.gz
Expand tabs
Diffstat (limited to 'js/controllers/elements')
-rwxr-xr-xjs/controllers/elements/controller-factory.js2
-rwxr-xr-xjs/controllers/elements/element-controller.js26
-rwxr-xr-xjs/controllers/elements/shapes-controller.js2
3 files changed, 15 insertions, 15 deletions
diff --git a/js/controllers/elements/controller-factory.js b/js/controllers/elements/controller-factory.js
index 2bf3eae0..eb8e977c 100755
--- a/js/controllers/elements/controller-factory.js
+++ b/js/controllers/elements/controller-factory.js
@@ -33,7 +33,7 @@ var Montage = require("montage/core/core").Montage;
33var BodyController = require("js/controllers/elements/body-controller").BodyController, 33var BodyController = require("js/controllers/elements/body-controller").BodyController,
34 BlockController = require("js/controllers/elements/block-controller").BlockController, 34 BlockController = require("js/controllers/elements/block-controller").BlockController,
35 ShapesController = require("js/controllers/elements/shapes-controller").ShapesController, 35 ShapesController = require("js/controllers/elements/shapes-controller").ShapesController,
36 ImageController = require("js/controllers/elements/image-controller").ImageController, 36 ImageController = require("js/controllers/elements/image-controller").ImageController,
37 VideoController = require("js/controllers/elements/video-controller").VideoController, 37 VideoController = require("js/controllers/elements/video-controller").VideoController,
38 ComponentController = require("js/controllers/elements/component-controller").ComponentController, 38 ComponentController = require("js/controllers/elements/component-controller").ComponentController,
39 CanvasController = require("js/controllers/elements/canvas-controller").CanvasController; 39 CanvasController = require("js/controllers/elements/canvas-controller").CanvasController;
diff --git a/js/controllers/elements/element-controller.js b/js/controllers/elements/element-controller.js
index 39efcf0c..646fa455 100755
--- a/js/controllers/elements/element-controller.js
+++ b/js/controllers/elements/element-controller.js
@@ -37,21 +37,21 @@ exports.ElementController = Montage.create(Component, {
37 addElement: { 37 addElement: {
38 value: function(el, styles) { 38 value: function(el, styles) {
39 39
40 if (el.getAttribute) el.setAttribute('data-ninja-node', 'true'); 40 if (el.getAttribute) el.setAttribute('data-ninja-node', 'true');
41 41
42 // Updated to use new methods in TimelinePanel. JR. 42 // Updated to use new methods in TimelinePanel. JR.
43 var insertionIndex = this.application.ninja.timeline.getInsertionIndex(); 43 var insertionIndex = this.application.ninja.timeline.getInsertionIndex();
44 if (insertionIndex === false) { 44 if (insertionIndex === false) {
45 this.application.ninja.currentDocument.model.domContainer.appendChild(el); 45 this.application.ninja.currentDocument.model.domContainer.appendChild(el);
46 } else { 46 } else {
47 if (insertionIndex === 0) { 47 if (insertionIndex === 0) {
48 this.application.ninja.currentDocument.model.domContainer.appendChild(el); 48 this.application.ninja.currentDocument.model.domContainer.appendChild(el);
49 } else { 49 } else {
50 var element = this.application.ninja.timeline.arrLayers[insertionIndex].layerData.stageElement; 50 var element = this.application.ninja.timeline.arrLayers[insertionIndex].layerData.stageElement;
51 element.parentNode.insertBefore(el, element.nextSibling); 51 element.parentNode.insertBefore(el, element.nextSibling);
52 } 52 }
53 } 53 }
54 54
55 if(styles) { 55 if(styles) {
56 this.application.ninja.stylesController.setElementStyles(el, styles); 56 this.application.ninja.stylesController.setElementStyles(el, styles);
57 } 57 }
diff --git a/js/controllers/elements/shapes-controller.js b/js/controllers/elements/shapes-controller.js
index a0d3c0d6..bef315ba 100755
--- a/js/controllers/elements/shapes-controller.js
+++ b/js/controllers/elements/shapes-controller.js
@@ -28,7 +28,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
28POSSIBILITY OF SUCH DAMAGE. 28POSSIBILITY OF SUCH DAMAGE.
29</copyright> */ 29</copyright> */
30 30
31var Montage = require("montage/core/core").Montage, 31var Montage = require("montage/core/core").Montage,
32 CanvasController = require("js/controllers/elements/canvas-controller").CanvasController, 32 CanvasController = require("js/controllers/elements/canvas-controller").CanvasController,
33 njModule = require("js/lib/NJUtils"), 33 njModule = require("js/lib/NJUtils"),
34 World = require("js/lib/drawing/world").World, 34 World = require("js/lib/drawing/world").World,