diff options
| author | Kruti Shah | 2012-07-17 12:40:00 -0700 |
|---|---|---|
| committer | Kruti Shah | 2012-07-17 12:40:00 -0700 |
| commit | bf2d7bdb22c28089dc1067bc9094ebc590daac87 (patch) | |
| tree | 2156d9920ea1b7db49ed6460545fea7cda121bae /js/components/toolbar.reel/toolbar.html | |
| parent | 7e2c2dbd040ed79a3f0678f91bd4b6db9cf69231 (diff) | |
| parent | b4b3e45d6684e77d361b4f8ca5be4889428320c5 (diff) | |
| download | ninja-bf2d7bdb22c28089dc1067bc9094ebc590daac87.tar.gz | |
Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti
Diffstat (limited to 'js/components/toolbar.reel/toolbar.html')
| -rw-r--r-- | js/components/toolbar.reel/toolbar.html | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/js/components/toolbar.reel/toolbar.html b/js/components/toolbar.reel/toolbar.html index 6ab87048..89014ebb 100644 --- a/js/components/toolbar.reel/toolbar.html +++ b/js/components/toolbar.reel/toolbar.html | |||
| @@ -1,25 +1,26 @@ | |||
| 1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
| 2 | <!-- <copyright> | 2 | <!-- <copyright> |
| 3 | Copyright (c) 2012, Motorola Mobility, Inc | 3 | Copyright (c) 2012, Motorola Mobility LLC. |
| 4 | All Rights Reserved. | 4 | All Rights Reserved. |
| 5 | BSD License. | ||
| 6 | 5 | ||
| 7 | Redistribution and use in source and binary forms, with or without | 6 | Redistribution and use in source and binary forms, with or without |
| 8 | modification, are permitted provided that the following conditions are met: | 7 | modification, are permitted provided that the following conditions are met: |
| 9 | 8 | ||
| 10 | - Redistributions of source code must retain the above copyright notice, | 9 | * Redistributions of source code must retain the above copyright notice, |
| 11 | this list of conditions and the following disclaimer. | 10 | this list of conditions and the following disclaimer. |
| 12 | - Redistributions in binary form must reproduce the above copyright | 11 | |
| 13 | notice, this list of conditions and the following disclaimer in the | 12 | * Redistributions in binary form must reproduce the above copyright notice, |
| 14 | documentation and/or other materials provided with the distribution. | 13 | this list of conditions and the following disclaimer in the documentation |
| 15 | - Neither the name of Motorola Mobility nor the names of its contributors | 14 | and/or other materials provided with the distribution. |
| 16 | may be used to endorse or promote products derived from this software | 15 | |
| 17 | without specific prior written permission. | 16 | * Neither the name of Motorola Mobility LLC nor the names of its |
| 17 | contributors may be used to endorse or promote products derived from this | ||
| 18 | software without specific prior written permission. | ||
| 18 | 19 | ||
| 19 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | 20 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
| 20 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 21 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
| 21 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | 22 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
| 22 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE | 23 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE |
| 23 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | 24 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
| 24 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | 25 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
| 25 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | 26 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
| @@ -41,7 +42,7 @@ POSSIBILITY OF SUCH DAMAGE. | |||
| 41 | "repetition": {"@": "buttonList" } | 42 | "repetition": {"@": "buttonList" } |
| 42 | } | 43 | } |
| 43 | }, | 44 | }, |
| 44 | 45 | ||
| 45 | "buttonList": { | 46 | "buttonList": { |
| 46 | "prototype" : "montage/ui/repetition.reel", | 47 | "prototype" : "montage/ui/repetition.reel", |
| 47 | "properties": { | 48 | "properties": { |
| @@ -51,7 +52,7 @@ POSSIBILITY OF SUCH DAMAGE. | |||
| 51 | "objects": {"<-": "@owner.buttons"} | 52 | "objects": {"<-": "@owner.buttons"} |
| 52 | } | 53 | } |
| 53 | }, | 54 | }, |
| 54 | 55 | ||
| 55 | "button": { | 56 | "button": { |
| 56 | "prototype": "js/components/toolbar.reel/toolbar-button", | 57 | "prototype": "js/components/toolbar.reel/toolbar-button", |
| 57 | "properties": { | 58 | "properties": { |