aboutsummaryrefslogtreecommitdiff
path: root/js/document/templates/app
diff options
context:
space:
mode:
authorValerio Virgillito2012-07-09 14:35:44 -0700
committerValerio Virgillito2012-07-09 14:35:44 -0700
commit84b3327bd92faafab7954b5eb64c7abe24a3fe13 (patch)
tree3f56cbed2f08c5a81ea79eaf0bcb9bd031d8a627 /js/document/templates/app
parentc0a42c56f768a873ba637f5b86d5f6a84d4a3312 (diff)
parent40c6eb2c06b34f65a74d59ef9687251952858bab (diff)
downloadninja-84b3327bd92faafab7954b5eb64c7abe24a3fe13.tar.gz
Merge branch 'normalize' of https://github.com/kriskowal/ninja-internal
Conflicts: js/components/gradientpicker.reel/gradientpicker.js js/components/tools-properties/text-properties.reel/text-properties.js js/document/views/base.js js/document/views/design.js js/helper-classes/3D/StageLine.js js/helper-classes/3D/draw-utils.js js/lib/drawing/world.js js/lib/geom/circle.js js/lib/geom/line.js js/lib/geom/rectangle.js js/lib/geom/shape-primitive.js js/lib/rdge/materials/bump-metal-material.js js/lib/rdge/materials/flag-material.js js/lib/rdge/materials/fly-material.js js/lib/rdge/materials/julia-material.js js/lib/rdge/materials/keleidoscope-material.js js/lib/rdge/materials/mandel-material.js js/lib/rdge/materials/material.js js/lib/rdge/materials/plasma-material.js js/lib/rdge/materials/pulse-material.js js/lib/rdge/materials/radial-gradient-material.js js/lib/rdge/materials/taper-material.js js/lib/rdge/materials/twist-vert-material.js js/lib/rdge/materials/water-material.js js/panels/Materials/materials-library-panel.reel/materials-library-panel.html js/panels/Materials/materials-library-panel.reel/materials-library-panel.js js/panels/Materials/materials-popup.reel/materials-popup.html js/panels/Materials/materials-popup.reel/materials-popup.js js/tools/LineTool.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/document/templates/app')
-rw-r--r--js/document/templates/app/main.js10
1 files changed, 5 insertions, 5 deletions
diff --git a/js/document/templates/app/main.js b/js/document/templates/app/main.js
index 6b15bb24..4f1abcf3 100644
--- a/js/document/templates/app/main.js
+++ b/js/document/templates/app/main.js
@@ -27,10 +27,10 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
27ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 27ARISING 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> */
30var Montage = require("montage/core/core").Montage, 30var Montage = require("montage/core/core").Montage,
31 Component = require("montage/ui/component").Component, 31 Component = require("montage/ui/component").Component,
32 Template = require("montage/ui/template").Template, 32 Template = require("montage/ui/template").Template,
33 TemplateCreator = require("tools/template/template-creator").TemplateCreator; 33 TemplateCreator = require("tools/template/template-creator").TemplateCreator;
34 34
35 35
36//var njmodelGet = function njmodelGet() { 36//var njmodelGet = function njmodelGet() {
@@ -85,7 +85,7 @@ exports.Main = Montage.create(Component, {
85 var componentRequire = component[data.name]; 85 var componentRequire = component[data.name];
86 var componentInstance = componentRequire.create(); 86 var componentInstance = componentRequire.create();
87 87
88 componentInstance.identifier = data.identifier; 88 componentInstance.identifier = data.identifier;
89 componentInstance.addEventListener("firstDraw", self, false); 89 componentInstance.addEventListener("firstDraw", self, false);
90 90
91 componentInstance.element = element; 91 componentInstance.element = element;