diff options
Diffstat (limited to 'js/controllers/elements/element-controller.js')
-rwxr-xr-x | js/controllers/elements/element-controller.js | 53 |
1 files changed, 27 insertions, 26 deletions
diff --git a/js/controllers/elements/element-controller.js b/js/controllers/elements/element-controller.js index 39efcf0c..7bb607c3 100755 --- a/js/controllers/elements/element-controller.js +++ b/js/controllers/elements/element-controller.js | |||
@@ -1,24 +1,25 @@ | |||
1 | /* <copyright> | 1 | /* <copyright> |
2 | Copyright (c) 2012, Motorola Mobility, Inc | 2 | Copyright (c) 2012, Motorola Mobility LLC. |
3 | All Rights Reserved. | 3 | All Rights Reserved. |
4 | BSD License. | ||
5 | 4 | ||
6 | Redistribution and use in source and binary forms, with or without | 5 | Redistribution and use in source and binary forms, with or without |
7 | modification, are permitted provided that the following conditions are met: | 6 | modification, are permitted provided that the following conditions are met: |
8 | 7 | ||
9 | - Redistributions of source code must retain the above copyright notice, | 8 | * Redistributions of source code must retain the above copyright notice, |
10 | this list of conditions and the following disclaimer. | 9 | this list of conditions and the following disclaimer. |
11 | - Redistributions in binary form must reproduce the above copyright | 10 | |
12 | notice, this list of conditions and the following disclaimer in the | 11 | * Redistributions in binary form must reproduce the above copyright notice, |
13 | documentation and/or other materials provided with the distribution. | 12 | this list of conditions and the following disclaimer in the documentation |
14 | - Neither the name of Motorola Mobility nor the names of its contributors | 13 | and/or other materials provided with the distribution. |
15 | may be used to endorse or promote products derived from this software | 14 | |
16 | without specific prior written permission. | 15 | * Neither the name of Motorola Mobility LLC nor the names of its |
16 | contributors may be used to endorse or promote products derived from this | ||
17 | software without specific prior written permission. | ||
17 | 18 | ||
18 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | 19 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
19 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 20 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
20 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | 21 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
21 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE | 22 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE |
22 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | 23 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
23 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | 24 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
24 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | 25 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
@@ -36,22 +37,22 @@ exports.ElementController = Montage.create(Component, { | |||
36 | 37 | ||
37 | addElement: { | 38 | addElement: { |
38 | value: function(el, styles) { | 39 | value: function(el, styles) { |
39 | 40 | ||
40 | if (el.getAttribute) el.setAttribute('data-ninja-node', 'true'); | 41 | if (el.getAttribute) el.setAttribute('data-ninja-node', 'true'); |
41 | 42 | ||
42 | // Updated to use new methods in TimelinePanel. JR. | 43 | // Updated to use new methods in TimelinePanel. JR. |
43 | var insertionIndex = this.application.ninja.timeline.getInsertionIndex(); | 44 | var insertionIndex = this.application.ninja.timeline.getInsertionIndex(); |
44 | if (insertionIndex === false) { | 45 | if (insertionIndex === false) { |
45 | this.application.ninja.currentDocument.model.domContainer.appendChild(el); | 46 | this.application.ninja.currentDocument.model.domContainer.appendChild(el); |
46 | } else { | 47 | } else { |
47 | if (insertionIndex === 0) { | 48 | if (insertionIndex === 0) { |
48 | this.application.ninja.currentDocument.model.domContainer.appendChild(el); | 49 | this.application.ninja.currentDocument.model.domContainer.appendChild(el); |
49 | } else { | 50 | } else { |
50 | var element = this.application.ninja.timeline.arrLayers[insertionIndex].layerData.stageElement; | 51 | var element = this.application.ninja.timeline.arrLayers[insertionIndex].layerData.stageElement; |
51 | element.parentNode.insertBefore(el, element.nextSibling); | 52 | element.parentNode.insertBefore(el, element.nextSibling); |
52 | } | 53 | } |
53 | } | 54 | } |
54 | 55 | ||
55 | if(styles) { | 56 | if(styles) { |
56 | this.application.ninja.stylesController.setElementStyles(el, styles); | 57 | this.application.ninja.stylesController.setElementStyles(el, styles); |
57 | } | 58 | } |
@@ -67,7 +68,7 @@ exports.ElementController = Montage.create(Component, { | |||
67 | el.parentNode.removeChild(el); | 68 | el.parentNode.removeChild(el); |
68 | } | 69 | } |
69 | }, | 70 | }, |
70 | 71 | ||
71 | getProperty: { | 72 | getProperty: { |
72 | value: function(el, prop, fallbackOnComputed, isStageElement) { | 73 | value: function(el, prop, fallbackOnComputed, isStageElement) { |
73 | if(el.nodeType !== 3){ | 74 | if(el.nodeType !== 3){ |