diff options
author | hwc487 | 2012-07-09 09:31:29 -0700 |
---|---|---|
committer | hwc487 | 2012-07-09 09:31:29 -0700 |
commit | d9f7793442f49582afdd06c7f01095df1d15dfdf (patch) | |
tree | 5de15c3c3fa95bba2bb9e38b33770b2224dd0d9a /js/components/textfield.reel/textfield.html | |
parent | e95aadc605cfe57067e98a247d4e2fd6e2d76895 (diff) | |
parent | aedd14b18695d031f695d27dfbd94df5614495bb (diff) | |
download | ninja-d9f7793442f49582afdd06c7f01095df1d15dfdf.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes
Diffstat (limited to 'js/components/textfield.reel/textfield.html')
-rwxr-xr-x | js/components/textfield.reel/textfield.html | 34 |
1 files changed, 29 insertions, 5 deletions
diff --git a/js/components/textfield.reel/textfield.html b/js/components/textfield.reel/textfield.html index f3f8ac53..120d3c9b 100755 --- a/js/components/textfield.reel/textfield.html +++ b/js/components/textfield.reel/textfield.html | |||
@@ -1,9 +1,33 @@ | |||
1 | <!DOCTYPE HTML> | 1 | <!DOCTYPE HTML> |
2 | <!-- <copyright> | 2 | <!-- <copyright> |
3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | 3 | Copyright (c) 2012, Motorola Mobility, Inc |
4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | 4 | All Rights Reserved. |
5 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | 5 | BSD License. |
6 | </copyright> --> | 6 | |
7 | Redistribution and use in source and binary forms, with or without | ||
8 | modification, are permitted provided that the following conditions are met: | ||
9 | |||
10 | - Redistributions of source code must retain the above copyright notice, | ||
11 | this list of conditions and the following disclaimer. | ||
12 | - Redistributions in binary form must reproduce the above copyright | ||
13 | notice, this list of conditions and the following disclaimer in the | ||
14 | documentation and/or other materials provided with the distribution. | ||
15 | - Neither the name of Motorola Mobility nor the names of its contributors | ||
16 | may be used to endorse or promote products derived from this software | ||
17 | without specific prior written permission. | ||
18 | |||
19 | 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 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
22 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE | ||
23 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | ||
24 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | ||
25 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | ||
26 | INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | ||
27 | CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
28 | ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | ||
29 | POSSIBILITY OF SUCH DAMAGE. | ||
30 | </copyright> --> | ||
7 | <html> | 31 | <html> |
8 | <head> | 32 | <head> |
9 | <script type="text/montage-serialization"> | 33 | <script type="text/montage-serialization"> |
@@ -20,4 +44,4 @@ | |||
20 | <body> | 44 | <body> |
21 | <input data-montage-id="textfield" class="nj-skinned" type="text"> | 45 | <input data-montage-id="textfield" class="nj-skinned" type="text"> |
22 | </body> | 46 | </body> |
23 | </html> \ No newline at end of file | 47 | </html> |