From c7b8d5d07834f85c530baf041ec2c818e86cc3a3 Mon Sep 17 00:00:00 2001 From: Nivesh Rajbhandari Date: Fri, 24 Feb 2012 09:24:00 -0800 Subject: Removing duplicate get/setElementPlanes method. Signed-off-by: Nivesh Rajbhandari --- js/helper-classes/3D/LinePlaneIntersectRec.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/js/helper-classes/3D/LinePlaneIntersectRec.js b/js/helper-classes/3D/LinePlaneIntersectRec.js index e075dd3d..cb172bf7 100755 --- a/js/helper-classes/3D/LinePlaneIntersectRec.js +++ b/js/helper-classes/3D/LinePlaneIntersectRec.js @@ -42,9 +42,6 @@ var LinePlaneIntersectRec = exports.LinePlaneIntersectRec = Object.create(Object setDeltaVis: { value: function(d) { this._deltaVis = d; } }, getDeltaVis: { value: function() { return this._deltaVis; } }, - getElementPlanes: { value: function() { return this._deltaVis; } }, - setElementPlanes: { value: function(p) { this._elementPlanes = p; } }, - setNext: { value: function(n) { this._next = n; } }, getNext: { value: function() { return this._next; } }, -- cgit v1.2.3 From 2f2472efe0ca55d52fcdf4934bfa52008b68e1de Mon Sep 17 00:00:00 2001 From: Nivesh Rajbhandari Date: Fri, 24 Feb 2012 09:40:16 -0800 Subject: Javascript does not evaluate a return with its expression in a new line. The return expression must begin on the same line as the return keyword. Signed-off-by: Nivesh Rajbhandari --- js/helper-classes/3D/hit-record.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/js/helper-classes/3D/hit-record.js b/js/helper-classes/3D/hit-record.js index 5546cc5a..2c60adc6 100755 --- a/js/helper-classes/3D/hit-record.js +++ b/js/helper-classes/3D/hit-record.js @@ -139,12 +139,10 @@ var HitRecord = exports.HitRecord = Object.create(Object.prototype, isSomeGridTypeSnap : { value: function() { - return - ( - (this._type == this.SNAP_TYPE_GRID_VERTEX) || + return ((this._type == this.SNAP_TYPE_GRID_VERTEX) || (this._type == this.SNAP_TYPE_GRID_HORIZONTAL) || (this._type == this.SNAP_TYPE_GRID_VERTICAL) - ) + ); } }, -- cgit v1.2.3 From d4a110bf2c7a949c627966ed01db7a4d32d62757 Mon Sep 17 00:00:00 2001 From: Nivesh Rajbhandari Date: Fri, 24 Feb 2012 10:04:19 -0800 Subject: Adding back Ink Bottle tool in the tool bar so QE can test ink bottle functionality without having to wait for the new icon and location of the tool. Signed-off-by: Nivesh Rajbhandari --- js/data/tools-data.js | 22 +++++++++++----------- js/mediators/keyboard-mediator.js | 4 ++-- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/js/data/tools-data.js b/js/data/tools-data.js index 00de9236..96367203 100755 --- a/js/data/tools-data.js +++ b/js/data/tools-data.js @@ -157,17 +157,17 @@ exports.ToolsData = Montage.create(Montage, { "container": false, "selected": false }, -// { -// "id": "InkBottleTool", -// "properties": "inkbottleProperties", -// "spriteSheet": true, -// "action": "InkBottleTool", -// "toolTip": "Ink Bottle Tool", -// "cursor": "url('images/tools/inkbottle_down.png'), default", -// "lastInGroup": false, -// "container": false, -// "selected": false -// }, + { + "id": "InkBottleTool", + "properties": "inkbottleProperties", + "spriteSheet": true, + "action": "InkBottleTool", + "toolTip": "Ink Bottle Tool", + "cursor": "url('images/tools/inkbottle_down.png'), default", + "lastInGroup": false, + "container": false, + "selected": false + }, { "id": "EyedropperTool", "properties": "eyedropperProperties", diff --git a/js/mediators/keyboard-mediator.js b/js/mediators/keyboard-mediator.js index a4bf9baa..5b044f8a 100755 --- a/js/mediators/keyboard-mediator.js +++ b/js/mediators/keyboard-mediator.js @@ -165,14 +165,14 @@ exports.KeyboardMediator = Montage.create(Component, { // Hand tool if(evt.keyCode === Keyboard.H ) { evt.preventDefault(); - this.application.ninja.handleSelectTool({"detail": this.application.ninja.toolsData.defaultToolsData[13]}); + this.application.ninja.handleSelectTool({"detail": this.application.ninja.toolsData.defaultToolsData[14]}); return; } // Zoom tool if(evt.keyCode === Keyboard.Z ) { evt.preventDefault(); - this.application.ninja.handleSelectTool({"detail": this.application.ninja.toolsData.defaultToolsData[14]}); + this.application.ninja.handleSelectTool({"detail": this.application.ninja.toolsData.defaultToolsData[15]}); return; } -- cgit v1.2.3 From 6ad427c4975b9a30f87dfb8ad53614cd4b6e65b9 Mon Sep 17 00:00:00 2001 From: Nivesh Rajbhandari Date: Fri, 24 Feb 2012 10:12:16 -0800 Subject: Marking inkbottle as the final tool in the set. Signed-off-by: Nivesh Rajbhandari --- js/data/tools-data.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/data/tools-data.js b/js/data/tools-data.js index 96367203..cf48757d 100755 --- a/js/data/tools-data.js +++ b/js/data/tools-data.js @@ -153,7 +153,7 @@ exports.ToolsData = Montage.create(Montage, { "action": "FillTool", "toolTip": "Fill Tool", "cursor": "url('images/tools/bucket_down.png'), default", - "lastInGroup": true, + "lastInGroup": false, "container": false, "selected": false }, @@ -164,7 +164,7 @@ exports.ToolsData = Montage.create(Montage, { "action": "InkBottleTool", "toolTip": "Ink Bottle Tool", "cursor": "url('images/tools/inkbottle_down.png'), default", - "lastInGroup": false, + "lastInGroup": true, "container": false, "selected": false }, -- cgit v1.2.3 From 5de5dc6454fe6ca097ce4baf34768c9174a827d9 Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Fri, 24 Feb 2012 10:20:04 -0800 Subject: Adding some missing copyrights Signed-off-by: Valerio Virgillito --- js/components/editable.reel/editable.js | 6 ++++++ js/components/hintable.reel/hintable.js | 6 ++++++ js/components/layout/bread-crumb.reel/bread-crumb.js | 5 +++++ js/panels/Timeline/Collapser.js | 6 ++++++ js/panels/Timeline/Keyframe.reel/Keyframe.html | 5 +++++ js/panels/Timeline/Keyframe.reel/Keyframe.js | 6 ++++++ js/panels/Timeline/Keyframe.reel/css/Keyframe.css | 6 ++++++ js/panels/Timeline/Layer.reel/Layer.html | 5 +++++ js/panels/Timeline/Layer.reel/Layer.js | 6 ++++++ js/panels/Timeline/Layer.reel/css/Layer.css | 6 ++++++ js/panels/Timeline/Layer.reel/scss/Layer.scss | 6 ++++++ js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html | 5 +++++ js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js | 6 ++++++ js/panels/Timeline/PropertyTrack.reel/css/PropertyTrack.css | 6 ++++++ js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss | 6 ++++++ js/panels/Timeline/Span.reel/Span.html | 5 +++++ js/panels/Timeline/Span.reel/Span.js | 6 ++++++ js/panels/Timeline/Span.reel/css/Span.css | 6 ++++++ js/panels/Timeline/Style.reel/Style.html | 5 +++++ js/panels/Timeline/Style.reel/Style.js | 6 ++++++ js/panels/Timeline/Style.reel/scss/Style.scss | 6 ++++++ js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | 5 +++++ js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | 6 ++++++ js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css | 6 ++++++ js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html | 5 +++++ js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | 6 ++++++ js/panels/Timeline/TimelineTrack.reel/css/TimelineTrack.css | 7 +++++++ js/panels/Timeline/TimelineTrack.reel/scss/TimelineTrack.scss | 6 ++++++ js/panels/Timeline/Track.reel/Track.html | 5 +++++ js/panels/Timeline/Track.reel/Track.js | 6 ++++++ js/panels/Timeline/Track.reel/css/Track.css | 6 ++++++ js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html | 5 +++++ js/panels/Timeline/TrackSpacer.reel/TrackSpacer.js | 6 ++++++ js/panels/Timeline/TrackSpacer.reel/css/TrackSpacer.css | 6 ++++++ js/panels/Timeline/Tween.reel/Tween.html | 5 +++++ js/panels/Timeline/Tween.reel/Tween.js | 6 ++++++ js/panels/Timeline/Tween.reel/css/Tween.css | 6 ++++++ js/panels/presets/content.reel/content.css | 6 ++++++ js/panels/presets/style-presets.reel/style-presets.css | 5 +++++ js/panels/presets/transitions-presets.reel/transitions-presets.css | 5 +++++ 40 files changed, 228 insertions(+) diff --git a/js/components/editable.reel/editable.js b/js/components/editable.reel/editable.js index 1d0ad776..9c8946c4 100644 --- a/js/components/editable.reel/editable.js +++ b/js/components/editable.reel/editable.js @@ -1,3 +1,9 @@ +/* + This file contains proprietary software owned by Motorola Mobility, Inc.
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.
+ (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. +
*/ + /* ComputedStyleSubPanel.js */ var Montage = require("montage").Montage, Component = require("montage/ui/component").Component; diff --git a/js/components/hintable.reel/hintable.js b/js/components/hintable.reel/hintable.js index 79813c92..5ed46b3c 100644 --- a/js/components/hintable.reel/hintable.js +++ b/js/components/hintable.reel/hintable.js @@ -1,3 +1,9 @@ +/* + This file contains proprietary software owned by Motorola Mobility, Inc.
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.
+ (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. +
*/ + /* ComputedStyleSubPanel.js */ var Montage = require("montage").Montage, Component = require("montage/ui/component").Component, diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.js b/js/components/layout/bread-crumb.reel/bread-crumb.js index 1290aaac..1824c7c3 100755 --- a/js/components/layout/bread-crumb.reel/bread-crumb.js +++ b/js/components/layout/bread-crumb.reel/bread-crumb.js @@ -1,3 +1,8 @@ +/* + This file contains proprietary software owned by Motorola Mobility, Inc.
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.
+ (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. +
*/ var Montage = require("montage/core/core").Montage, Component = require("montage/ui/component").Component; diff --git a/js/panels/Timeline/Collapser.js b/js/panels/Timeline/Collapser.js index d286d84c..5de884a9 100644 --- a/js/panels/Timeline/Collapser.js +++ b/js/panels/Timeline/Collapser.js @@ -1,3 +1,9 @@ +/* + This file contains proprietary software owned by Motorola Mobility, Inc.
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.
+ (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. +
*/ + /* * Collapser: Takes two elements and creates a visual "expando:" clicking on one element expands/collapses the other. * Required properties: diff --git a/js/panels/Timeline/Keyframe.reel/Keyframe.html b/js/panels/Timeline/Keyframe.reel/Keyframe.html index 72da49d5..7e917b5a 100644 --- a/js/panels/Timeline/Keyframe.reel/Keyframe.html +++ b/js/panels/Timeline/Keyframe.reel/Keyframe.html @@ -1,4 +1,9 @@ + diff --git a/js/panels/Timeline/Keyframe.reel/Keyframe.js b/js/panels/Timeline/Keyframe.reel/Keyframe.js index bb2acee0..859cdfb1 100644 --- a/js/panels/Timeline/Keyframe.reel/Keyframe.js +++ b/js/panels/Timeline/Keyframe.reel/Keyframe.js @@ -1,3 +1,9 @@ +/* + This file contains proprietary software owned by Motorola Mobility, Inc.
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.
+ (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. +
*/ + var Montage = require("montage/core/core").Montage; var Component = require("montage/ui/component").Component; diff --git a/js/panels/Timeline/Keyframe.reel/css/Keyframe.css b/js/panels/Timeline/Keyframe.reel/css/Keyframe.css index 4afc1180..ff5dae7a 100644 --- a/js/panels/Timeline/Keyframe.reel/css/Keyframe.css +++ b/js/panels/Timeline/Keyframe.reel/css/Keyframe.css @@ -1,3 +1,9 @@ +/* + This file contains proprietary software owned by Motorola Mobility, Inc.
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.
+ (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. +
*/ + .tween_keyframe{ position: absolute; height: 16px; diff --git a/js/panels/Timeline/Layer.reel/Layer.html b/js/panels/Timeline/Layer.reel/Layer.html index e262afe2..a3fbd5b1 100644 --- a/js/panels/Timeline/Layer.reel/Layer.html +++ b/js/panels/Timeline/Layer.reel/Layer.html @@ -1,4 +1,9 @@ + diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js index 2e9a8f1a..f62c0b90 100644 --- a/js/panels/Timeline/Layer.reel/Layer.js +++ b/js/panels/Timeline/Layer.reel/Layer.js @@ -1,3 +1,9 @@ +/* + This file contains proprietary software owned by Motorola Mobility, Inc.
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.
+ (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. +
*/ + var Montage = require("montage/core/core").Montage; var Component = require("montage/ui/component").Component; var Collapser = require("js/panels/Timeline/Collapser").Collapser; diff --git a/js/panels/Timeline/Layer.reel/css/Layer.css b/js/panels/Timeline/Layer.reel/css/Layer.css index 3547a15e..833c921c 100644 --- a/js/panels/Timeline/Layer.reel/css/Layer.css +++ b/js/panels/Timeline/Layer.reel/css/Layer.css @@ -1,4 +1,10 @@ @charset "UTF-8"; +/* + This file contains proprietary software owned by Motorola Mobility, Inc.
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.
+ (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. +
*/ + /* Layer.scss * Main SCSS file for Layer component, compiled by SASS into the file css/Layer.css. */ diff --git a/js/panels/Timeline/Layer.reel/scss/Layer.scss b/js/panels/Timeline/Layer.reel/scss/Layer.scss index c66a6267..dda0c951 100644 --- a/js/panels/Timeline/Layer.reel/scss/Layer.scss +++ b/js/panels/Timeline/Layer.reel/scss/Layer.scss @@ -1,5 +1,11 @@ @charset "UTF-8"; +/* + This file contains proprietary software owned by Motorola Mobility, Inc.
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.
+ (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. +
*/ + /* Layer.scss * Main SCSS file for Layer component, compiled by SASS into the file css/Layer.css. */ diff --git a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html index 7781af11..01cad6cb 100644 --- a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html +++ b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html @@ -1,4 +1,9 @@ + diff --git a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js index 1b0035cd..175b77f9 100644 --- a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js +++ b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js @@ -1,3 +1,9 @@ +/* + This file contains proprietary software owned by Motorola Mobility, Inc.
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.
+ (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. +
*/ + var Montage = require("montage/core/core").Montage; var Component = require("montage/ui/component").Component; diff --git a/js/panels/Timeline/PropertyTrack.reel/css/PropertyTrack.css b/js/panels/Timeline/PropertyTrack.reel/css/PropertyTrack.css index 9c27e705..8e45305a 100644 --- a/js/panels/Timeline/PropertyTrack.reel/css/PropertyTrack.css +++ b/js/panels/Timeline/PropertyTrack.reel/css/PropertyTrack.css @@ -1,3 +1,9 @@ +/* + This file contains proprietary software owned by Motorola Mobility, Inc.
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.
+ (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. +
*/ + /* PropertyTrack.scss * Main SCSS file for PropertyTrack component, compiled by SASS into the file css/PropertyTrack.css. */ diff --git a/js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss b/js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss index ef8e1ec2..273e3d77 100644 --- a/js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss +++ b/js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss @@ -1,3 +1,9 @@ +/* + This file contains proprietary software owned by Motorola Mobility, Inc.
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.
+ (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. +
*/ + /* PropertyTrack.scss * Main SCSS file for PropertyTrack component, compiled by SASS into the file css/PropertyTrack.css. */ diff --git a/js/panels/Timeline/Span.reel/Span.html b/js/panels/Timeline/Span.reel/Span.html index 24b2bd10..f7e05982 100644 --- a/js/panels/Timeline/Span.reel/Span.html +++ b/js/panels/Timeline/Span.reel/Span.html @@ -1,4 +1,9 @@ + diff --git a/js/panels/Timeline/Span.reel/Span.js b/js/panels/Timeline/Span.reel/Span.js index 8114e74a..bfa6aab8 100644 --- a/js/panels/Timeline/Span.reel/Span.js +++ b/js/panels/Timeline/Span.reel/Span.js @@ -1,3 +1,9 @@ +/* + This file contains proprietary software owned by Motorola Mobility, Inc.
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.
+ (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. +
*/ + var Montage = require("montage/core/core").Montage; var Component = require("montage/ui/component").Component; diff --git a/js/panels/Timeline/Span.reel/css/Span.css b/js/panels/Timeline/Span.reel/css/Span.css index f239454d..198d71f3 100644 --- a/js/panels/Timeline/Span.reel/css/Span.css +++ b/js/panels/Timeline/Span.reel/css/Span.css @@ -1,3 +1,9 @@ +/* + This file contains proprietary software owned by Motorola Mobility, Inc.
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.
+ (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. +
*/ + .tween_span{ position: absolute; height: 16px; diff --git a/js/panels/Timeline/Style.reel/Style.html b/js/panels/Timeline/Style.reel/Style.html index c6f29626..48714432 100644 --- a/js/panels/Timeline/Style.reel/Style.html +++ b/js/panels/Timeline/Style.reel/Style.html @@ -1,4 +1,9 @@ + diff --git a/js/panels/Timeline/Style.reel/Style.js b/js/panels/Timeline/Style.reel/Style.js index e6e03901..027f3a40 100644 --- a/js/panels/Timeline/Style.reel/Style.js +++ b/js/panels/Timeline/Style.reel/Style.js @@ -1,3 +1,9 @@ +/* + This file contains proprietary software owned by Motorola Mobility, Inc.
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.
+ (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. +
*/ + /* * Style component: Edits and manages a single style rule for a Layer in the Timeline. * Public Properties: diff --git a/js/panels/Timeline/Style.reel/scss/Style.scss b/js/panels/Timeline/Style.reel/scss/Style.scss index 827a0c43..30bf43fe 100644 --- a/js/panels/Timeline/Style.reel/scss/Style.scss +++ b/js/panels/Timeline/Style.reel/scss/Style.scss @@ -1,3 +1,9 @@ +/* + This file contains proprietary software owned by Motorola Mobility, Inc.
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.
+ (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. +
*/ + /* Layer.scss * Main SCSS file for Layer component, compiled by SASS into the file css/Layer.css. */ diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html index 33145028..0c302436 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html @@ -1,4 +1,9 @@ + diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js index 62ae625f..a5cde00f 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js @@ -1,3 +1,9 @@ +/* + This file contains proprietary software owned by Motorola Mobility, Inc.
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.
+ (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. +
*/ + var Montage = require("montage/core/core").Montage; var Component = require("montage/ui/component").Component; var Layer = require("js/panels/Timeline/Layer.reel").Layer; diff --git a/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css b/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css index 26dd272c..c122b18f 100644 --- a/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css +++ b/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css @@ -1,3 +1,9 @@ +/* + This file contains proprietary software owned by Motorola Mobility, Inc.
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.
+ (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. +
*/ + .tl_container{ display: -webkit-box; -webkit-box-orient: vertical; diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html index cabd92c0..158d666e 100644 --- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html +++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html @@ -1,4 +1,9 @@ + diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js index 61da9e36..0c5121cd 100644 --- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js +++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js @@ -1,3 +1,9 @@ +/* + This file contains proprietary software owned by Motorola Mobility, Inc.
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.
+ (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. +
*/ + var Montage = require("montage/core/core").Montage; var Component = require("montage/ui/component").Component; var Collapser = require("js/panels/Timeline/Collapser").Collapser; diff --git a/js/panels/Timeline/TimelineTrack.reel/css/TimelineTrack.css b/js/panels/Timeline/TimelineTrack.reel/css/TimelineTrack.css index 7a778e25..57e4dce6 100644 --- a/js/panels/Timeline/TimelineTrack.reel/css/TimelineTrack.css +++ b/js/panels/Timeline/TimelineTrack.reel/css/TimelineTrack.css @@ -1,4 +1,11 @@ @charset "UTF-8"; + +/* + This file contains proprietary software owned by Motorola Mobility, Inc.
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.
+ (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. +
*/ + /* TimelineTrack.scss * Main SCSS file for TimelineTrack component, compiled by SASS into the file css/TimelineTrack.css. */ diff --git a/js/panels/Timeline/TimelineTrack.reel/scss/TimelineTrack.scss b/js/panels/Timeline/TimelineTrack.reel/scss/TimelineTrack.scss index 43d5f438..1b025c74 100644 --- a/js/panels/Timeline/TimelineTrack.reel/scss/TimelineTrack.scss +++ b/js/panels/Timeline/TimelineTrack.reel/scss/TimelineTrack.scss @@ -1,5 +1,11 @@ @charset "UTF-8"; +/* + This file contains proprietary software owned by Motorola Mobility, Inc.
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.
+ (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. +
*/ + /* TimelineTrack.scss * Main SCSS file for TimelineTrack component, compiled by SASS into the file css/TimelineTrack.css. */ diff --git a/js/panels/Timeline/Track.reel/Track.html b/js/panels/Timeline/Track.reel/Track.html index c4deab9d..39b387e2 100644 --- a/js/panels/Timeline/Track.reel/Track.html +++ b/js/panels/Timeline/Track.reel/Track.html @@ -1,4 +1,9 @@ + diff --git a/js/panels/Timeline/Track.reel/Track.js b/js/panels/Timeline/Track.reel/Track.js index a60c7cd1..cfc2541b 100644 --- a/js/panels/Timeline/Track.reel/Track.js +++ b/js/panels/Timeline/Track.reel/Track.js @@ -1,3 +1,9 @@ +/* + This file contains proprietary software owned by Motorola Mobility, Inc.
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.
+ (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. +
*/ + var Montage = require("montage/core/core").Montage; var Component = require("montage/ui/component").Component; var defaultEventManager = require("montage/core/event/event-manager").defaultEventManager; diff --git a/js/panels/Timeline/Track.reel/css/Track.css b/js/panels/Timeline/Track.reel/css/Track.css index c2353bac..b717acf1 100644 --- a/js/panels/Timeline/Track.reel/css/Track.css +++ b/js/panels/Timeline/Track.reel/css/Track.css @@ -1,3 +1,9 @@ +/* + This file contains proprietary software owned by Motorola Mobility, Inc.
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.
+ (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. +
*/ + .tracklane{ height: 19px; width: 100%; diff --git a/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html b/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html index e6494d79..94f5c278 100644 --- a/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html +++ b/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html @@ -1,4 +1,9 @@ + diff --git a/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.js b/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.js index b3b8133a..f1b5407a 100644 --- a/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.js +++ b/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.js @@ -1,3 +1,9 @@ +/* + This file contains proprietary software owned by Motorola Mobility, Inc.
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.
+ (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. +
*/ + var Montage = require("montage/core/core").Montage; var Component = require("montage/ui/component").Component; diff --git a/js/panels/Timeline/TrackSpacer.reel/css/TrackSpacer.css b/js/panels/Timeline/TrackSpacer.reel/css/TrackSpacer.css index 7a571fe8..b98b555d 100644 --- a/js/panels/Timeline/TrackSpacer.reel/css/TrackSpacer.css +++ b/js/panels/Timeline/TrackSpacer.reel/css/TrackSpacer.css @@ -1,3 +1,9 @@ +/* + This file contains proprietary software owned by Motorola Mobility, Inc.
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.
+ (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. +
*/ + .trackspacer{ height:22px; width: 100%; diff --git a/js/panels/Timeline/Tween.reel/Tween.html b/js/panels/Timeline/Tween.reel/Tween.html index b5353b1b..ce51cb70 100644 --- a/js/panels/Timeline/Tween.reel/Tween.html +++ b/js/panels/Timeline/Tween.reel/Tween.html @@ -1,4 +1,9 @@ + diff --git a/js/panels/Timeline/Tween.reel/Tween.js b/js/panels/Timeline/Tween.reel/Tween.js index af01deb2..f6dbf32c 100644 --- a/js/panels/Timeline/Tween.reel/Tween.js +++ b/js/panels/Timeline/Tween.reel/Tween.js @@ -1,3 +1,9 @@ +/* + This file contains proprietary software owned by Motorola Mobility, Inc.
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.
+ (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. +
*/ + var Montage = require("montage/core/core").Montage; var Component = require("montage/ui/component").Component; var ElementsMediator = require("js/mediators/element-mediator").ElementMediator; diff --git a/js/panels/Timeline/Tween.reel/css/Tween.css b/js/panels/Timeline/Tween.reel/css/Tween.css index 942f9fc9..81e00073 100644 --- a/js/panels/Timeline/Tween.reel/css/Tween.css +++ b/js/panels/Timeline/Tween.reel/css/Tween.css @@ -1,3 +1,9 @@ +/* + This file contains proprietary software owned by Motorola Mobility, Inc.
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.
+ (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. +
*/ + .tween_container{ height: 16px; position: absolute; diff --git a/js/panels/presets/content.reel/content.css b/js/panels/presets/content.reel/content.css index 08e1d53b..c0ccbad4 100644 --- a/js/panels/presets/content.reel/content.css +++ b/js/panels/presets/content.reel/content.css @@ -1,3 +1,9 @@ +/* + This file contains proprietary software owned by Motorola Mobility, Inc.
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.
+ (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. +
*/ + .presetsPanel { display: -webkit-box; text-shadow: 1px 1px 1px #000; diff --git a/js/panels/presets/style-presets.reel/style-presets.css b/js/panels/presets/style-presets.reel/style-presets.css index e69de29b..0441c1cf 100644 --- a/js/panels/presets/style-presets.reel/style-presets.css +++ b/js/panels/presets/style-presets.reel/style-presets.css @@ -0,0 +1,5 @@ +/* + This file contains proprietary software owned by Motorola Mobility, Inc.
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.
+ (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. +
*/ \ No newline at end of file diff --git a/js/panels/presets/transitions-presets.reel/transitions-presets.css b/js/panels/presets/transitions-presets.reel/transitions-presets.css index e69de29b..0441c1cf 100644 --- a/js/panels/presets/transitions-presets.reel/transitions-presets.css +++ b/js/panels/presets/transitions-presets.reel/transitions-presets.css @@ -0,0 +1,5 @@ +/* + This file contains proprietary software owned by Motorola Mobility, Inc.
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.
+ (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. +
*/ \ No newline at end of file -- cgit v1.2.3 From 86dc497278e0b6a3ce18666a9906ccefb359db94 Mon Sep 17 00:00:00 2001 From: John Mayhew Date: Fri, 24 Feb 2012 12:52:05 -0800 Subject: Removing tabs permissions until we make a final decision on whether or not we will require it. --- manifest.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/manifest.json b/manifest.json index 3d156d2b..be054798 100644 --- a/manifest.json +++ b/manifest.json @@ -1,7 +1,7 @@ { "name": "Motorola Ninja", - "description": "Motorola Ninja HTML5 Authoring Tool Pre-Alpha", - "version": "0.5.0.1", + "description": "Motorola Ninja HTML5 Authoring Tool - Alpha Release", + "version": "0.5.0.9", "app": { "launch": { "local_path": "index.html" @@ -11,7 +11,6 @@ "128": "ninja_icon_128.png" }, "permissions": [ - "tabs", "unlimitedStorage", "notifications", "webRequest", -- cgit v1.2.3