diff options
| author | Jose Antonio Marquez | 2012-07-09 16:39:17 -0700 |
|---|---|---|
| committer | Valerio Virgillito | 2012-07-09 16:46:43 -0700 |
| commit | cee0deca695359ab468bd06d0e05ed3b2010b338 (patch) | |
| tree | 9d04b6728d5192b2f030669bd41969cbd7db3761 /js/ninja.reel | |
| parent | a1c0c873e7ede1848a7aa090fb214af4765dbfaf (diff) | |
| parent | a5296ddf26a5d8ab7e99643dd1324b6a1f9b4f18 (diff) | |
| download | ninja-cee0deca695359ab468bd06d0e05ed3b2010b338.tar.gz | |
Merge branch 'refs/heads/Ninja-Internal' into Analytics
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/ninja.reel')
| -rwxr-xr-x | js/ninja.reel/ninja.css | 23 | ||||
| -rwxr-xr-x | js/ninja.reel/ninja.html | 25 | ||||
| -rwxr-xr-x | js/ninja.reel/ninja.js | 23 |
3 files changed, 37 insertions, 34 deletions
diff --git a/js/ninja.reel/ninja.css b/js/ninja.reel/ninja.css index 46e53078..ab62db84 100755 --- a/js/ninja.reel/ninja.css +++ b/js/ninja.reel/ninja.css | |||
| @@ -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 |
diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html index a279ece9..f80acdca 100755 --- a/js/ninja.reel/ninja.html +++ b/js/ninja.reel/ninja.html | |||
| @@ -1,26 +1,27 @@ | |||
| 1 | <!doctype html> | 1 | <!doctype html> |
| 2 | 2 | ||
| 3 | <!-- <copyright> | 3 | <!-- <copyright> |
| 4 | Copyright (c) 2012, Motorola Mobility, Inc | 4 | Copyright (c) 2012, Motorola Mobility LLC. |
| 5 | All Rights Reserved. | 5 | All Rights Reserved. |
| 6 | BSD License. | ||
| 7 | 6 | ||
| 8 | Redistribution and use in source and binary forms, with or without | 7 | Redistribution and use in source and binary forms, with or without |
| 9 | modification, are permitted provided that the following conditions are met: | 8 | modification, are permitted provided that the following conditions are met: |
| 10 | 9 | ||
| 11 | - Redistributions of source code must retain the above copyright notice, | 10 | * Redistributions of source code must retain the above copyright notice, |
| 12 | this list of conditions and the following disclaimer. | 11 | this list of conditions and the following disclaimer. |
| 13 | - Redistributions in binary form must reproduce the above copyright | 12 | |
| 14 | notice, this list of conditions and the following disclaimer in the | 13 | * Redistributions in binary form must reproduce the above copyright notice, |
| 15 | documentation and/or other materials provided with the distribution. | 14 | this list of conditions and the following disclaimer in the documentation |
| 16 | - Neither the name of Motorola Mobility nor the names of its contributors | 15 | and/or other materials provided with the distribution. |
| 17 | may be used to endorse or promote products derived from this software | 16 | |
| 18 | without specific prior written permission. | 17 | * Neither the name of Motorola Mobility LLC nor the names of its |
| 18 | contributors may be used to endorse or promote products derived from this | ||
| 19 | software without specific prior written permission. | ||
| 19 | 20 | ||
| 20 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | 21 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
| 21 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 22 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
| 22 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | 23 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
| 23 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE | 24 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE |
| 24 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | 25 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
| 25 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | 26 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
| 26 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | 27 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
| @@ -419,7 +420,7 @@ POSSIBILITY OF SUCH DAMAGE. | |||
| 419 | "ioMediator": {"@": "ioMediator"}, | 420 | "ioMediator": {"@": "ioMediator"}, |
| 420 | "timeline": {"@": "timeline"}, | 421 | "timeline": {"@": "timeline"}, |
| 421 | "mainMenuController": {"@": "mainMenuController"}, | 422 | "mainMenuController": {"@": "mainMenuController"}, |
| 422 | "codeEditorWrapper": {"@": "codeEditorWrapper"}, | 423 | "codeEditorWrapper": {"@": "codeEditorWrapper"}, |
| 423 | "objectsController": {"@": "objectsController"}, | 424 | "objectsController": {"@": "objectsController"}, |
| 424 | "rightPanelContainer": {"#": "rightPanelContainer" }, | 425 | "rightPanelContainer": {"#": "rightPanelContainer" }, |
| 425 | "panelSplitter": {"@": "splitter3"}, | 426 | "panelSplitter": {"@": "splitter3"}, |
diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js index 6de15490..9fd71b1c 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 |