Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

switched license to apache, fixed refs to camera constants in manual …

…test, added tests for constants to autotest
  • Loading branch information...
commit ce12dfcad4b676923f1784e3a17f6c8eed1567e4 1 parent 46ba34e
Fil Maj authored January 18, 2012
226  LICENSE
... ...
@@ -1,22 +1,208 @@
1 1
 The MIT License
2 2
 
3  
-Copyright (c) 2009-2011 Rob Ellis, Brock Whitten, Brian LeRoux
4  
-Copyright (c) 2010-2011, IBM Corporation
5  
-
6  
-Permission is hereby granted, free of charge, to any person obtaining a copy
7  
-of this software and associated documentation files (the "Software"), to deal
8  
-in the Software without restriction, including without limitation the rights
9  
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10  
-copies of the Software, and to permit persons to whom the Software is
11  
-furnished to do so, subject to the following conditions:
12  
-
13  
-The above copyright notice and this permission notice shall be included in
14  
-all copies or substantial portions of the Software.
15  
-
16  
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17  
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18  
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19  
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20  
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21  
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
22  
-THE SOFTWARE.
  3
+
  4
+                                 Apache License
  5
+                           Version 2.0, January 2004
  6
+                        http://www.apache.org/licenses/
  7
+
  8
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
  9
+
  10
+   1. Definitions.
  11
+
  12
+      "License" shall mean the terms and conditions for use, reproduction,
  13
+      and distribution as defined by Sections 1 through 9 of this document.
  14
+
  15
+      "Licensor" shall mean the copyright owner or entity authorized by
  16
+      the copyright owner that is granting the License.
  17
+
  18
+      "Legal Entity" shall mean the union of the acting entity and all
  19
+      other entities that control, are controlled by, or are under common
  20
+      control with that entity. For the purposes of this definition,
  21
+      "control" means (i) the power, direct or indirect, to cause the
  22
+      direction or management of such entity, whether by contract or
  23
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
  24
+      outstanding shares, or (iii) beneficial ownership of such entity.
  25
+
  26
+      "You" (or "Your") shall mean an individual or Legal Entity
  27
+      exercising permissions granted by this License.
  28
+
  29
+      "Source" form shall mean the preferred form for making modifications,
  30
+      including but not limited to software source code, documentation
  31
+      source, and configuration files.
  32
+
  33
+      "Object" form shall mean any form resulting from mechanical
  34
+      transformation or translation of a Source form, including but
  35
+      not limited to compiled object code, generated documentation,
  36
+      and conversions to other media types.
  37
+
  38
+      "Work" shall mean the work of authorship, whether in Source or
  39
+      Object form, made available under the License, as indicated by a
  40
+      copyright notice that is included in or attached to the work
  41
+      (an example is provided in the Appendix below).
  42
+
  43
+      "Derivative Works" shall mean any work, whether in Source or Object
  44
+      form, that is based on (or derived from) the Work and for which the
  45
+      editorial revisions, annotations, elaborations, or other modifications
  46
+      represent, as a whole, an original work of authorship. For the purposes
  47
+      of this License, Derivative Works shall not include works that remain
  48
+      separable from, or merely link (or bind by name) to the interfaces of,
  49
+      the Work and Derivative Works thereof.
  50
+
  51
+      "Contribution" shall mean any work of authorship, including
  52
+      the original version of the Work and any modifications or additions
  53
+      to that Work or Derivative Works thereof, that is intentionally
  54
+      submitted to Licensor for inclusion in the Work by the copyright owner
  55
+      or by an individual or Legal Entity authorized to submit on behalf of
  56
+      the copyright owner. For the purposes of this definition, "submitted"
  57
+      means any form of electronic, verbal, or written communication sent
  58
+      to the Licensor or its representatives, including but not limited to
  59
+      communication on electronic mailing lists, source code control systems,
  60
+      and issue tracking systems that are managed by, or on behalf of, the
  61
+      Licensor for the purpose of discussing and improving the Work, but
  62
+      excluding communication that is conspicuously marked or otherwise
  63
+      designated in writing by the copyright owner as "Not a Contribution."
  64
+
  65
+      "Contributor" shall mean Licensor and any individual or Legal Entity
  66
+      on behalf of whom a Contribution has been received by Licensor and
  67
+      subsequently incorporated within the Work.
  68
+
  69
+   2. Grant of Copyright License. Subject to the terms and conditions of
  70
+      this License, each Contributor hereby grants to You a perpetual,
  71
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
  72
+      copyright license to reproduce, prepare Derivative Works of,
  73
+      publicly display, publicly perform, sublicense, and distribute the
  74
+      Work and such Derivative Works in Source or Object form.
  75
+
  76
+   3. Grant of Patent License. Subject to the terms and conditions of
  77
+      this License, each Contributor hereby grants to You a perpetual,
  78
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
  79
+      (except as stated in this section) patent license to make, have made,
  80
+      use, offer to sell, sell, import, and otherwise transfer the Work,
  81
+      where such license applies only to those patent claims licensable
  82
+      by such Contributor that are necessarily infringed by their
  83
+      Contribution(s) alone or by combination of their Contribution(s)
  84
+      with the Work to which such Contribution(s) was submitted. If You
  85
+      institute patent litigation against any entity (including a
  86
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
  87
+      or a Contribution incorporated within the Work constitutes direct
  88
+      or contributory patent infringement, then any patent licenses
  89
+      granted to You under this License for that Work shall terminate
  90
+      as of the date such litigation is filed.
  91
+
  92
+   4. Redistribution. You may reproduce and distribute copies of the
  93
+      Work or Derivative Works thereof in any medium, with or without
  94
+      modifications, and in Source or Object form, provided that You
  95
+      meet the following conditions:
  96
+
  97
+      (a) You must give any other recipients of the Work or
  98
+          Derivative Works a copy of this License; and
  99
+
  100
+      (b) You must cause any modified files to carry prominent notices
  101
+          stating that You changed the files; and
  102
+
  103
+      (c) You must retain, in the Source form of any Derivative Works
  104
+          that You distribute, all copyright, patent, trademark, and
  105
+          attribution notices from the Source form of the Work,
  106
+          excluding those notices that do not pertain to any part of
  107
+          the Derivative Works; and
  108
+
  109
+      (d) If the Work includes a "NOTICE" text file as part of its
  110
+          distribution, then any Derivative Works that You distribute must
  111
+          include a readable copy of the attribution notices contained
  112
+          within such NOTICE file, excluding those notices that do not
  113
+          pertain to any part of the Derivative Works, in at least one
  114
+          of the following places: within a NOTICE text file distributed
  115
+          as part of the Derivative Works; within the Source form or
  116
+          documentation, if provided along with the Derivative Works; or,
  117
+          within a display generated by the Derivative Works, if and
  118
+          wherever such third-party notices normally appear. The contents
  119
+          of the NOTICE file are for informational purposes only and
  120
+          do not modify the License. You may add Your own attribution
  121
+          notices within Derivative Works that You distribute, alongside
  122
+          or as an addendum to the NOTICE text from the Work, provided
  123
+          that such additional attribution notices cannot be construed
  124
+          as modifying the License.
  125
+
  126
+      You may add Your own copyright statement to Your modifications and
  127
+      may provide additional or different license terms and conditions
  128
+      for use, reproduction, or distribution of Your modifications, or
  129
+      for any such Derivative Works as a whole, provided Your use,
  130
+      reproduction, and distribution of the Work otherwise complies with
  131
+      the conditions stated in this License.
  132
+
  133
+   5. Submission of Contributions. Unless You explicitly state otherwise,
  134
+      any Contribution intentionally submitted for inclusion in the Work
  135
+      by You to the Licensor shall be under the terms and conditions of
  136
+      this License, without any additional terms or conditions.
  137
+      Notwithstanding the above, nothing herein shall supersede or modify
  138
+      the terms of any separate license agreement you may have executed
  139
+      with Licensor regarding such Contributions.
  140
+
  141
+   6. Trademarks. This License does not grant permission to use the trade
  142
+      names, trademarks, service marks, or product names of the Licensor,
  143
+      except as required for reasonable and customary use in describing the
  144
+      origin of the Work and reproducing the content of the NOTICE file.
  145
+
  146
+   7. Disclaimer of Warranty. Unless required by applicable law or
  147
+      agreed to in writing, Licensor provides the Work (and each
  148
+      Contributor provides its Contributions) on an "AS IS" BASIS,
  149
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
  150
+      implied, including, without limitation, any warranties or conditions
  151
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
  152
+      PARTICULAR PURPOSE. You are solely responsible for determining the
  153
+      appropriateness of using or redistributing the Work and assume any
  154
+      risks associated with Your exercise of permissions under this License.
  155
+
  156
+   8. Limitation of Liability. In no event and under no legal theory,
  157
+      whether in tort (including negligence), contract, or otherwise,
  158
+      unless required by applicable law (such as deliberate and grossly
  159
+      negligent acts) or agreed to in writing, shall any Contributor be
  160
+      liable to You for damages, including any direct, indirect, special,
  161
+      incidental, or consequential damages of any character arising as a
  162
+      result of this License or out of the use or inability to use the
  163
+      Work (including but not limited to damages for loss of goodwill,
  164
+      work stoppage, computer failure or malfunction, or any and all
  165
+      other commercial damages or losses), even if such Contributor
  166
+      has been advised of the possibility of such damages.
  167
+
  168
+   9. Accepting Warranty or Additional Liability. While redistributing
  169
+      the Work or Derivative Works thereof, You may choose to offer,
  170
+      and charge a fee for, acceptance of support, warranty, indemnity,
  171
+      or other liability obligations and/or rights consistent with this
  172
+      License. However, in accepting such obligations, You may act only
  173
+      on Your own behalf and on Your sole responsibility, not on behalf
  174
+      of any other Contributor, and only if You agree to indemnify,
  175
+      defend, and hold each Contributor harmless for any liability
  176
+      incurred by, or claims asserted against, such Contributor by reason
  177
+      of your accepting any such warranty or additional liability.
  178
+
  179
+   END OF TERMS AND CONDITIONS
  180
+
  181
+   APPENDIX: How to apply the Apache License to your work.
  182
+
  183
+      To apply the Apache License to your work, attach the following
  184
+      boilerplate notice, with the fields enclosed by brackets "[]"
  185
+      replaced with your own identifying information. (Don't include
  186
+      the brackets!)  The text should be enclosed in the appropriate
  187
+      comment syntax for the file format. We also recommend that a
  188
+      file or class name and description of purpose be included on the
  189
+      same "printed page" as the copyright notice for easier
  190
+      identification within third-party archives.
  191
+
  192
+   Copyright 2009-2011 Rob Ellis, Brock Whitten, Brian LeRoux
  193
+   Copyright 2010-2011, IBM Corporation
  194
+   Copyright 2011 Adobe
  195
+
  196
+   Licensed under the Apache License, Version 2.0 (the "License");
  197
+   you may not use this file except in compliance with the License.
  198
+   You may obtain a copy of the License at
  199
+
  200
+       http://www.apache.org/licenses/LICENSE-2.0
  201
+
  202
+   Unless required by applicable law or agreed to in writing, software
  203
+   distributed under the License is distributed on an "AS IS" BASIS,
  204
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  205
+   See the License for the specific language governing permissions and
  206
+   limitations under the License.
  207
+
  208
+
41  README.md
Source Rendered
@@ -2,44 +2,17 @@
2 2
 
3 3
 These specs are designed to run inside the mobile device that implements it - _it will fail in the DESKTOP browser_.
4 4
 
5  
-These set of tests is designed to be used with PhoneGap. You should initialize a fresh PhoneGap repository (git clone 
6  
-git://github.com/phonegap/phonegap.git) and then toss these files into the www or assets folder, replacing the
  5
+These set of tests is designed to be used with Cordova. You should initialize a fresh Cordova repository for a target platform and then toss these files into the www folder, replacing the
7 6
 contents. 
8 7
 
9  
-Make sure you include phonegap-\*.js in the www folder.  You also need to edit phonegap.js to reference the phonegap-\*.js file you are testing.
10  
-For example, to test with phonegap-0.9.6.1, the phonegap.js file would be:
  8
+Make sure you include Cordova-\*.js in the www folder.  You also need to edit Cordova.js to reference the Cordova-\*.js file you are testing.
  9
+For example, to test with Cordova-0.9.6.1, the Cordova.js file would be:
11 10
 
12  
-    document.write('<script type="text/javascript" charset="utf-8" src="../phonegap-0.9.6.1.js"></script>');
13  
-    document.write('<script type="text/javascript" charset="utf-8" src="phonegap-0.9.6.1.js"></script>');
  11
+    document.write('<script type="text/javascript" charset="utf-8" src="../Cordova-0.9.6.1.js"></script>');
  12
+    document.write('<script type="text/javascript" charset="utf-8" src="Cordova-0.9.6.1.js"></script>');
14 13
 
15  
-This is done so that you don't have to modify every HTML file when you want to test a new version of PhoneGap.
  14
+This is done so that you don't have to modify every HTML file when you want to test a new version of Cordova.
16 15
 
17 16
 The goal is to test mobile device functionality inside a mobile browser.
18  
-Where possible, the PhoneGap API lines up with HTML 5 spec. Maybe down
  17
+Where possible, the Cordova API lines up with HTML 5 spec. Maybe down
19 18
 the road we could use this spec for parts of HTML 5, too :)
20  
-
21  
-
22  
-LICENSE
23  
----
24  
-
25  
-_Copyright (c) 2009-2011 Rob Ellis, Brian LeRoux, Brock Whitten, Nitobi Software_  
26  
-_Copyright (c) 2010-2011, IBM Corporation_
27  
-
28  
-Permission is hereby granted, free of charge, to any person obtaining
29  
-a copy of this software and associated documentation files (the
30  
-"Software"), to deal in the Software without restriction, including
31  
-without limitation the rights to use, copy, modify, merge, publish,
32  
-distribute, sublicense, and/or sell copies of the Software, and to
33  
-permit persons to whom the Software is furnished to do so, subject to
34  
-the following conditions:
35  
-
36  
-The above copyright notice and this permission notice shall be included
37  
-in all copies or substantial portions of the Software.
38  
-
39  
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
40  
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
41  
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
42  
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
43  
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
44  
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
45  
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
36  autotest/tests/camera.tests.js
... ...
@@ -1,12 +1,40 @@
1 1
 Tests.prototype.CameraTests = function() {	
2 2
 	module('Camera (navigator.camera)');
3 3
 	test("should exist", function() {
4  
-  		expect(1);
5  
-  		ok(navigator.camera != null, "navigator.camera should not be null.");
  4
+      expect(1);
  5
+      ok(navigator.camera !== null, "navigator.camera should not be null.");
6 6
 	});
7 7
 	test("should contain a getPicture function", function() {
8 8
 		expect(2);
9  
-		ok(typeof navigator.camera.getPicture != 'undefined' && navigator.camera.getPicture != null, "navigator.camera.getPicture should not be null.");
  9
+		ok(typeof navigator.camera.getPicture != 'undefined' && navigator.camera.getPicture !== null, "navigator.camera.getPicture should not be null.");
10 10
 		ok(typeof navigator.camera.getPicture == 'function', "navigator.camera.getPicture should be a function.");
11 11
 	});
12  
-};
  12
+
  13
+  module('Camera Constants (window.Camera)');
  14
+  test("should exist", function() {
  15
+    expect(1);
  16
+    ok(window.Camera !== null, "window.Camera should not be null.");
  17
+  });
  18
+  test("should contain two DestinationType constants", function() {
  19
+    expect(2);
  20
+    equals(Camera.DestinationType.DATA_URL, 0, "DestinationType.DATA_URL should equal to 0");
  21
+    equals(Camera.DestinationType.FILE_URI, 1, "DestinationType.DATA_URL should equal to 1");
  22
+  });
  23
+  test("should contain two EncodingType constants", function() {
  24
+    expect(2);
  25
+    equals(Camera.EncodingType.JPEG, 0, "EncodingType.JPEG should equal to 0");
  26
+    equals(Camera.EncodingType.PNG, 1, "EncodingType.PNG should equal to 1");
  27
+  });
  28
+  test("should contain three MediaType constants", function() {
  29
+    expect(3);
  30
+    equals(Camera.MediaType.PICTURE, 0, 'MediaType.PICTURE should equal to 0');
  31
+    equals(Camera.MediaType.VIDEO, 1, 'MediaType.VIDEO should equal to 1');
  32
+    equals(Camera.MediaType.ALLMEDIA, 2, 'MediaType.ALLMEDIA should equal to 2');
  33
+  });
  34
+  test("should contain three PictureSourceType constants", function() {
  35
+    expect(3);
  36
+    equals(Camera.PictureSourceType.PHOTOLIBRARY, 0, 'PictureSourceType.PHOTOLIBRARY should equal to 0');
  37
+    equals(Camera.PictureSourceType.CAMERA, 1, 'PictureSourceType.CAMERA should equal to 1');
  38
+    equals(Camera.PictureSourceType.SAVEDPHOTOALBUM, 2, 'PictureSourceType.SAVEDPHOTOALBUM should equal to 2');
  39
+  });
  40
+};
8  camera/index.html
@@ -37,7 +37,8 @@
37 37
                 console.log("Error getting picture: " + e);
38 38
                 document.getElementById('camera_status').innerHTML = "Error getting picture.";
39 39
             },
40  
-            { quality: 50, destinationType: navigator.camera.DestinationType.FILE_URI, sourceType : navigator.camera.PictureSourceType.CAMERA});
  40
+            { quality: 50, destinationType:
  41
+            Camera.DestinationType.FILE_URI, sourceType : Camera.PictureSourceType.CAMERA});
41 42
     };
42 43
 
43 44
     /**
@@ -57,7 +58,8 @@
57 58
                 console.log("Error getting picture: " + e);
58 59
                 document.getElementById('camera_status').innerHTML = "Error getting picture.";
59 60
             },
60  
-            { quality: 50, destinationType: navigator.camera.DestinationType.FILE_URI, sourceType: navigator.camera.PictureSourceType.PHOTOLIBRARY});
  61
+            { quality: 50, destinationType:
  62
+            Camera.DestinationType.FILE_URI, sourceType: Camera.PictureSourceType.PHOTOLIBRARY});
61 63
     };
62 64
 
63 65
     
@@ -89,6 +91,6 @@
89 91
     <h2>Action</h2>
90 92
     <a href="javascript:" class="btn large" onclick="getPicture();">Take Picture</a>
91 93
     <a href="javascript:" class="btn large" onclick="getImage();">Select Image from Library</a>
92  
-    <h2>&nbsp</h2><a href="javascript:" class="backBtn" onclick="backHome();">Back</a>
  94
+    <h2>&nbsp;</h2><a href="javascript:" class="backBtn" onclick="backHome();">Back</a>
93 95
   </body>
94 96
 </html>      

0 notes on commit ce12dfc

Please sign in to comment.
Something went wrong with that request. Please try again.