diff options
author | Valerio Virgillito | 2012-07-09 16:42:40 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-07-09 16:42:40 -0700 |
commit | 3489294afb739e75aa760eb45f1241cd2a14b8d0 (patch) | |
tree | 5b11abd0414e0a3ab50ec6276b6334fbd168db7e /js/ninja.reel/ninja.js | |
parent | 26d4b5ce30e6e0ea6e0fde870853c1e2a673a7b4 (diff) | |
parent | 7bee50379c1df86bb571e0e8d6c08e24d25231f5 (diff) | |
download | ninja-3489294afb739e75aa760eb45f1241cd2a14b8d0.tar.gz |
Merge pull request #379 from kriskowal/bsd-v0.7.0
BSD License for v0.7.0
Diffstat (limited to 'js/ninja.reel/ninja.js')
-rwxr-xr-x | js/ninja.reel/ninja.js | 37 |
1 files changed, 19 insertions, 18 deletions
diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js index 3fe39aa7..5ff35ce4 100755 --- a/js/ninja.reel/ninja.js +++ b/js/ninja.reel/ninja.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 |
@@ -381,8 +382,8 @@ exports.Ninja = Montage.create(Component, { | |||
381 | this.addPropertyChangeListener("appModel.debug", this.toggleDebug, false); | 382 | this.addPropertyChangeListener("appModel.debug", this.toggleDebug, false); |
382 | } | 383 | } |
383 | }, | 384 | }, |
384 | 385 | ||
385 | 386 | ||
386 | //////////////////////////////////////////////////////////////////// | 387 | //////////////////////////////////////////////////////////////////// |
387 | //////////////////////////////////////////////////////////////////// | 388 | //////////////////////////////////////////////////////////////////// |
388 | //TODO: Expand method to allow other browsers for preview | 389 | //TODO: Expand method to allow other browsers for preview |
@@ -409,7 +410,7 @@ exports.Ninja = Montage.create(Component, { | |||
409 | } | 410 | } |
410 | }, | 411 | }, |
411 | //////////////////////////////////////////////////////////////////// | 412 | //////////////////////////////////////////////////////////////////// |
412 | 413 | ||
413 | //TODO: Make into proper component | 414 | //TODO: Make into proper component |
414 | _saveOperationPopup: { | 415 | _saveOperationPopup: { |
415 | value: null | 416 | value: null |
@@ -418,11 +419,11 @@ exports.Ninja = Montage.create(Component, { | |||
418 | saveOperationScreen: { | 419 | saveOperationScreen: { |
419 | value: null | 420 | value: null |
420 | }, | 421 | }, |
421 | 422 | ||
422 | //////////////////////////////////////////////////////////////////// | 423 | //////////////////////////////////////////////////////////////////// |
423 | //////////////////////////////////////////////////////////////////// | 424 | //////////////////////////////////////////////////////////////////// |
424 | 425 | ||
425 | 426 | ||
426 | handleResize: { | 427 | handleResize: { |
427 | value: function() { | 428 | value: function() { |
428 | this.stage.resizeCanvases = true; | 429 | this.stage.resizeCanvases = true; |
@@ -444,7 +445,7 @@ exports.Ninja = Montage.create(Component, { | |||
444 | _didDraw: { | 445 | _didDraw: { |
445 | value: false | 446 | value: false |
446 | }, | 447 | }, |
447 | 448 | ||
448 | didDraw: { | 449 | didDraw: { |
449 | value: function() { | 450 | value: function() { |
450 | 451 | ||