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/clipboard | |
| 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/clipboard')
| -rw-r--r-- | js/clipboard/external-apps-clipboard-agent.js | 23 | ||||
| -rw-r--r-- | js/clipboard/internal-ops/component-clipboard-agent.js | 23 | ||||
| -rw-r--r-- | js/clipboard/internal-ops/css-clipboard-agent.js | 23 | ||||
| -rw-r--r-- | js/clipboard/internal-ops/elements-clipboard-agent.js | 23 | ||||
| -rw-r--r-- | js/clipboard/internal-ops/timeline-clipboard-agent.js | 23 | ||||
| -rw-r--r-- | js/clipboard/util.js | 23 |
6 files changed, 72 insertions, 66 deletions
diff --git a/js/clipboard/external-apps-clipboard-agent.js b/js/clipboard/external-apps-clipboard-agent.js index c5412a5d..cd093d6f 100644 --- a/js/clipboard/external-apps-clipboard-agent.js +++ b/js/clipboard/external-apps-clipboard-agent.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 |
diff --git a/js/clipboard/internal-ops/component-clipboard-agent.js b/js/clipboard/internal-ops/component-clipboard-agent.js index 31b53474..702e2a37 100644 --- a/js/clipboard/internal-ops/component-clipboard-agent.js +++ b/js/clipboard/internal-ops/component-clipboard-agent.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 |
diff --git a/js/clipboard/internal-ops/css-clipboard-agent.js b/js/clipboard/internal-ops/css-clipboard-agent.js index e93077a8..54ac44b6 100644 --- a/js/clipboard/internal-ops/css-clipboard-agent.js +++ b/js/clipboard/internal-ops/css-clipboard-agent.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 |
diff --git a/js/clipboard/internal-ops/elements-clipboard-agent.js b/js/clipboard/internal-ops/elements-clipboard-agent.js index 4f6e8195..3129b644 100644 --- a/js/clipboard/internal-ops/elements-clipboard-agent.js +++ b/js/clipboard/internal-ops/elements-clipboard-agent.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 |
diff --git a/js/clipboard/internal-ops/timeline-clipboard-agent.js b/js/clipboard/internal-ops/timeline-clipboard-agent.js index 4e5cfe30..752c91ba 100644 --- a/js/clipboard/internal-ops/timeline-clipboard-agent.js +++ b/js/clipboard/internal-ops/timeline-clipboard-agent.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 | ||