You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by bo...@apache.org on 2014/01/22 20:38:32 UTC
[21/50] [abbrv] git commit: CB-5346: remove dependency on device
plugin
CB-5346: remove dependency on device plugin
- remove dependency on the device plugin in the js and html
- clean out dollar signs chars that were accidently appended to the license
- fix punctuation in the viewport value
Project: http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/commit/07e922f1
Tree: http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/tree/07e922f1
Diff: http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/diff/07e922f1
Branch: refs/heads/master
Commit: 07e922f1a9cdd704f2bb512e06569c62d5da77b3
Parents: 748fd98
Author: Marcel Kinard <cm...@gmail.com>
Authored: Wed Nov 13 14:43:43 2013 -0500
Committer: Joe Bowser <bo...@apache.org>
Committed: Wed Jan 22 11:37:17 2014 -0800
----------------------------------------------------------------------
test/README.md | 1 -
test/assets/www/backbuttonmultipage/index.html | 5 +-
.../assets/www/backbuttonmultipage/sample2.html | 5 +-
.../assets/www/backbuttonmultipage/sample3.html | 5 +-
test/assets/www/background/index.html | 54 ++++++++------------
test/assets/www/background/index2.html | 54 ++++++++------------
test/assets/www/backgroundcolor/index.html | 8 ++-
test/assets/www/basicauth/index.html | 8 ++-
test/assets/www/fullscreen/index.html | 8 ++-
test/assets/www/iframe/index.html | 8 ++-
test/assets/www/iframe/index2.html | 8 ++-
test/assets/www/index.html | 7 +--
test/assets/www/lifecycle/index.html | 22 ++------
test/assets/www/lifecycle/index2.html | 5 ++
test/assets/www/main.js | 13 +----
test/assets/www/menus/index.html | 8 ++-
test/assets/www/splashscreen/index.html | 40 +++++++--------
test/assets/www/userwebview/index.html | 40 +++++++--------
test/assets/www/whitelist/index.html | 40 +++++++--------
test/assets/www/whitelist/index2.html | 40 +++++++--------
test/assets/www/xhr/index.html | 40 +++++++--------
21 files changed, 172 insertions(+), 247 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/blob/07e922f1/test/README.md
----------------------------------------------------------------------
diff --git a/test/README.md b/test/README.md
index 2a93f27..5d86720 100755
--- a/test/README.md
+++ b/test/README.md
@@ -30,7 +30,6 @@ Before running the tests, they need to be set up.
To run from command line:
-0. Install the Cordova Device Plugin using plugman
0. Build by entering `ant debug install`
0. Run tests by clicking on "CordovaTest" icon on device
http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/blob/07e922f1/test/assets/www/backbuttonmultipage/index.html
----------------------------------------------------------------------
diff --git a/test/assets/www/backbuttonmultipage/index.html b/test/assets/www/backbuttonmultipage/index.html
index afab731..8afa729 100755
--- a/test/assets/www/backbuttonmultipage/index.html
+++ b/test/assets/www/backbuttonmultipage/index.html
@@ -27,9 +27,8 @@ $
<body onload="init();" id="stage" class="theme">
<h1>Cordova Android Tests</h1>
<div id="info">
- <h4>Platform: <span id="platform"> </span>, Version: <span id="version"> </span></h4>
- <h4>UUID: <span id="uuid"> </span>, Name: <span id="name"> </span></h4>
- <h4>Width: <span id="width"> </span>, Height: <span id="height"> </span>, Color Depth: <span id="colorDepth"></span></h4>
+ <h4>Cordova: <span id="cordova"> </span></h4>
+ <h4>Deviceready: <span id="deviceready"> </span></h4>
</div>
<div id="info">
<h4>Page 1</h4>
http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/blob/07e922f1/test/assets/www/backbuttonmultipage/sample2.html
----------------------------------------------------------------------
diff --git a/test/assets/www/backbuttonmultipage/sample2.html b/test/assets/www/backbuttonmultipage/sample2.html
index 397ac70..9d8c7dd 100755
--- a/test/assets/www/backbuttonmultipage/sample2.html
+++ b/test/assets/www/backbuttonmultipage/sample2.html
@@ -27,9 +27,8 @@ $
<body onload="init();" id="stage" class="theme">
<h1>Cordova Android Tests</h1>
<div id="info">
- <h4>Platform: <span id="platform"> </span>, Version: <span id="version"> </span></h4>
- <h4>UUID: <span id="uuid"> </span>, Name: <span id="name"> </span></h4>
- <h4>Width: <span id="width"> </span>, Height: <span id="height"> </span>, Color Depth: <span id="colorDepth"></span></h4>
+ <h4>Cordova: <span id="cordova"> </span></h4>
+ <h4>Deviceready: <span id="deviceready"> </span></h4>
</div>
<div id="info">
<h4>Page 2</h4>
http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/blob/07e922f1/test/assets/www/backbuttonmultipage/sample3.html
----------------------------------------------------------------------
diff --git a/test/assets/www/backbuttonmultipage/sample3.html b/test/assets/www/backbuttonmultipage/sample3.html
index f4b1f8a..31890b1 100755
--- a/test/assets/www/backbuttonmultipage/sample3.html
+++ b/test/assets/www/backbuttonmultipage/sample3.html
@@ -27,9 +27,8 @@ $
<body onload="init();" id="stage" class="theme">
<h1>Cordova Android Tests</h1>
<div id="info">
- <h4>Platform: <span id="platform"> </span>, Version: <span id="version"> </span></h4>
- <h4>UUID: <span id="uuid"> </span>, Name: <span id="name"> </span></h4>
- <h4>Width: <span id="width"> </span>, Height: <span id="height"> </span>, Color Depth: <span id="colorDepth"></span></h4>
+ <h4>Cordova: <span id="cordova"> </span></h4>
+ <h4>Deviceready: <span id="deviceready"> </span></h4>
</div>
<div id="info">
<h4>Page 3</h4>
http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/blob/07e922f1/test/assets/www/background/index.html
----------------------------------------------------------------------
diff --git a/test/assets/www/background/index.html b/test/assets/www/background/index.html
index 2a073a6..751806b 100755
--- a/test/assets/www/background/index.html
+++ b/test/assets/www/background/index.html
@@ -1,21 +1,21 @@
<!DOCTYPE HTML>
<!--
- Licensed to the Apache Software Foundation (ASF) under one$
- or more contributor license agreements. See the NOTICE file$
- distributed with this work for additional information$
- regarding copyright ownership. The ASF licenses this file$
- to you under the Apache License, Version 2.0 (the$
- "License"); you may not use this file except in compliance$
- with the License. You may obtain a copy of the License at$
-$
- http://www.apache.org/licenses/LICENSE-2.0$
-$
- Unless required by applicable law or agreed to in writing,$
- software distributed under the License is distributed on an$
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY$
- KIND, either express or implied. See the License for the$
- specific language governing permissions and limitations$
- under the License.$
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
-->
<html>
<head>
@@ -40,13 +40,8 @@ $
function onDeviceReady() {
// Register the event listener
- document.getElementById("platform").innerHTML = device.platform;
- document.getElementById("version").innerHTML = device.version;
- document.getElementById("uuid").innerHTML = device.uuid;
- document.getElementById("name").innerHTML = device.name;
- document.getElementById("width").innerHTML = screen.width;
- document.getElementById("height").innerHTML = screen.height;
- document.getElementById("colorDepth").innerHTML = screen.colorDepth;
+ document.getElementById("deviceready").innerHTML = "fired";
+ document.getElementById("cordova").innerHTML = cordova.version;
document.addEventListener("pause", onPause, false);
document.addEventListener("resume", onResume, false);
@@ -84,17 +79,8 @@ $
<body onload="onLoad()" onunload="onUnLoaded()" id="stage" class="theme">
<h1>Events</h1>
<div id="info">
- <h4>
- Platform: <span id="platform"> </span>, Version: <span
- id="version"> </span>
- </h4>
- <h4>
- UUID: <span id="uuid"> </span>, Name: <span id="name"> </span>
- </h4>
- <h4>
- Width: <span id="width"> </span>, Height: <span id="height">
- </span>, Color Depth: <span id="colorDepth"></span>
- </h4>
+ <h4>Cordova: <span id="cordova"> </span></h4>
+ <h4>Deviceready: <span id="deviceready"> </span></h4>
</div>
<div id="info">
Press "Home" button, then return to this app to see pause/resume.<br>
http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/blob/07e922f1/test/assets/www/background/index2.html
----------------------------------------------------------------------
diff --git a/test/assets/www/background/index2.html b/test/assets/www/background/index2.html
index addf6eb..fa5a367 100755
--- a/test/assets/www/background/index2.html
+++ b/test/assets/www/background/index2.html
@@ -1,21 +1,21 @@
<!DOCTYPE HTML>
<!--
- Licensed to the Apache Software Foundation (ASF) under one$
- or more contributor license agreements. See the NOTICE file$
- distributed with this work for additional information$
- regarding copyright ownership. The ASF licenses this file$
- to you under the Apache License, Version 2.0 (the$
- "License"); you may not use this file except in compliance$
- with the License. You may obtain a copy of the License at$
-$
- http://www.apache.org/licenses/LICENSE-2.0$
-$
- Unless required by applicable law or agreed to in writing,$
- software distributed under the License is distributed on an$
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY$
- KIND, either express or implied. See the License for the$
- specific language governing permissions and limitations$
- under the License.$
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
-->
<html>
<head>
@@ -40,13 +40,8 @@ $
function onDeviceReady() {
// Register the event listener
- document.getElementById("platform").innerHTML = device.platform;
- document.getElementById("version").innerHTML = device.version;
- document.getElementById("uuid").innerHTML = device.uuid;
- document.getElementById("name").innerHTML = device.name;
- document.getElementById("width").innerHTML = screen.width;
- document.getElementById("height").innerHTML = screen.height;
- document.getElementById("colorDepth").innerHTML = screen.colorDepth;
+ document.getElementById("deviceready").innerHTML = "fired";
+ document.getElementById("cordova").innerHTML = cordova.version;
document.addEventListener("pause", onPause, false);
document.addEventListener("resume", onResume, false);
@@ -84,17 +79,8 @@ $
<body onload="onLoad()" onunload="onUnLoaded()" id="stage" class="theme">
<h1>Events</h1>
<div id="info">
- <h4>
- Platform: <span id="platform"> </span>, Version: <span
- id="version"> </span>
- </h4>
- <h4>
- UUID: <span id="uuid"> </span>, Name: <span id="name"> </span>
- </h4>
- <h4>
- Width: <span id="width"> </span>, Height: <span id="height">
- </span>, Color Depth: <span id="colorDepth"></span>
- </h4>
+ <h4>Cordova: <span id="cordova"> </span></h4>
+ <h4>Deviceready: <span id="deviceready"> </span></h4>
</div>
<div id="info">
<h4>Press "Back" button to return to Page 1.</h4>
http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/blob/07e922f1/test/assets/www/backgroundcolor/index.html
----------------------------------------------------------------------
diff --git a/test/assets/www/backgroundcolor/index.html b/test/assets/www/backgroundcolor/index.html
index 0746dcf..3b09d64 100755
--- a/test/assets/www/backgroundcolor/index.html
+++ b/test/assets/www/backgroundcolor/index.html
@@ -19,7 +19,7 @@
<!DOCTYPE HTML>
<html>
<head>
- <meta name="viewport" content="width=320; user-scalable=no" />
+ <meta name="viewport" content="width=320, user-scalable=no" />
<meta http-equiv="Content-type" content="text/html; charset=utf-8">
<title>Cordova Tests</title>
<link rel="stylesheet" href="../master.css" type="text/css" media="screen" title="no title">
@@ -29,10 +29,8 @@
<body onload="init();" id="stage" class="theme">
<h1>Background Color Test</h1>
<div id="info">
- <h4>Platform: <span id="platform"> </span>, Version: <span id="version"> </span></h4>
- <h4>UUID: <span id="uuid"> </span>, Name: <span id="name"> </span></h4>
- <h4>Width: <span id="width"> </span>, Height: <span id="height">
- </span>, Color Depth: <span id="colorDepth"></span></h4>
+ <h4>Cordova: <span id="cordova"> </span></h4>
+ <h4>Deviceready: <span id="deviceready"> </span></h4>
</div>
<div id="info">
Before this page was show, you should have seen the background flash green.</br>
http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/blob/07e922f1/test/assets/www/basicauth/index.html
----------------------------------------------------------------------
diff --git a/test/assets/www/basicauth/index.html b/test/assets/www/basicauth/index.html
index 02ff0b2..5d2bc51 100755
--- a/test/assets/www/basicauth/index.html
+++ b/test/assets/www/basicauth/index.html
@@ -19,7 +19,7 @@
<!DOCTYPE HTML>
<html>
<head>
- <meta name="viewport" content="width=320; user-scalable=no" />
+ <meta name="viewport" content="width=320, user-scalable=no" />
<meta http-equiv="Content-type" content="text/html; charset=utf-8">
<title>Cordova Tests</title>
<link rel="stylesheet" href="../master.css" type="text/css" media="screen" title="no title">
@@ -29,10 +29,8 @@
<body onload="init();" id="stage" class="theme">
<h1>Basic Auth</h1>
<div id="info">
- <h4>Platform: <span id="platform"> </span>, Version: <span id="version"> </span></h4>
- <h4>UUID: <span id="uuid"> </span>, Name: <span id="name"> </span></h4>
- <h4>Width: <span id="width"> </span>, Height: <span id="height">
- </span>, Color Depth: <span id="colorDepth"></span></h4>
+ <h4>Cordova: <span id="cordova"> </span></h4>
+ <h4>Deviceready: <span id="deviceready"> </span></h4>
</div>
<div id="info">
Loading link below should be successful and show page indicating username=test & password=test. <br>
http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/blob/07e922f1/test/assets/www/fullscreen/index.html
----------------------------------------------------------------------
diff --git a/test/assets/www/fullscreen/index.html b/test/assets/www/fullscreen/index.html
index 8fa24da..ab43cc4 100755
--- a/test/assets/www/fullscreen/index.html
+++ b/test/assets/www/fullscreen/index.html
@@ -19,7 +19,7 @@
<!DOCTYPE HTML>
<html>
<head>
- <meta name="viewport" content="width=320; user-scalable=no" />
+ <meta name="viewport" content="width=320, user-scalable=no" />
<meta http-equiv="Content-type" content="text/html; charset=utf-8">
<title>Cordova Tests</title>
<link rel="stylesheet" href="../master.css" type="text/css" media="screen" title="no title">
@@ -29,10 +29,8 @@
<body onload="init();" id="stage" class="theme">
<h1>Full Screen Test</h1>
<div id="info">
- <h4>Platform: <span id="platform"> </span>, Version: <span id="version"> </span></h4>
- <h4>UUID: <span id="uuid"> </span>, Name: <span id="name"> </span></h4>
- <h4>Width: <span id="width"> </span>, Height: <span id="height">
- </span>, Color Depth: <span id="colorDepth"></span></h4>
+ <h4>Cordova: <span id="cordova"> </span></h4>
+ <h4>Deviceready: <span id="deviceready"> </span></h4>
</div>
<div id="info">
The app should take over the entire screen. <br>
http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/blob/07e922f1/test/assets/www/iframe/index.html
----------------------------------------------------------------------
diff --git a/test/assets/www/iframe/index.html b/test/assets/www/iframe/index.html
index 0b3c3d7..de8febf 100755
--- a/test/assets/www/iframe/index.html
+++ b/test/assets/www/iframe/index.html
@@ -19,7 +19,7 @@ $
-->
<html>
<head>
- <meta name="viewport" content="width=320; user-scalable=no" />
+ <meta name="viewport" content="width=320, user-scalable=no" />
<meta http-equiv="Content-type" content="text/html; charset=utf-8">
<title>Cordova Tests</title>
<link rel="stylesheet" href="../master.css" type="text/css" media="screen" title="no title">
@@ -33,10 +33,8 @@ $
<body onload="init();" id="stage" class="theme">
<h1>IFrame</h1>
<div id="info">
- <h4>Platform: <span id="platform"> </span>, Version: <span id="version"> </span></h4>
- <h4>UUID: <span id="uuid"> </span>, Name: <span id="name"> </span></h4>
- <h4>Width: <span id="width"> </span>, Height: <span id="height">
- </span>, Color Depth: <span id="colorDepth"></span></h4>
+ <h4>Cordova: <span id="cordova"> </span></h4>
+ <h4>Deviceready: <span id="deviceready"> </span></h4>
</div>
<div id="info">
Press the two buttons:<br>
http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/blob/07e922f1/test/assets/www/iframe/index2.html
----------------------------------------------------------------------
diff --git a/test/assets/www/iframe/index2.html b/test/assets/www/iframe/index2.html
index abe692b..a244c45 100755
--- a/test/assets/www/iframe/index2.html
+++ b/test/assets/www/iframe/index2.html
@@ -19,7 +19,7 @@ $
-->
<html>
<head>
- <meta name="viewport" content="width=320; user-scalable=no" />
+ <meta name="viewport" content="width=320, user-scalable=no" />
<meta http-equiv="Content-type" content="text/html; charset=utf-8">
<title>Cordova Tests</title>
<link rel="stylesheet" href="../master.css" type="text/css" media="screen" title="no title">
@@ -29,10 +29,8 @@ $
<body onload="init();" id="stage" class="theme">
<h1>IFrame window</h1>
<div id="info">
- <h4>Platform: <span id="platform"> </span>, Version: <span id="version"> </span></h4>
- <h4>UUID: <span id="uuid"> </span>, Name: <span id="name"> </span></h4>
- <h4>Width: <span id="width"> </span>, Height: <span id="height">
- </span>, Color Depth: <span id="colorDepth"></span></h4>
+ <h4>Cordova: <span id="cordova"> </span></h4>
+ <h4>Deviceready: <span id="deviceready"> </span></h4>
</div>
<div id="info">
This should display a Cordova page inside an iframe. The info above should be filled out.
http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/blob/07e922f1/test/assets/www/index.html
----------------------------------------------------------------------
diff --git a/test/assets/www/index.html b/test/assets/www/index.html
index 590b593..53d402d 100755
--- a/test/assets/www/index.html
+++ b/test/assets/www/index.html
@@ -38,11 +38,8 @@
<body onload="init();" id="stage" class="theme">
<h1>Cordova Android Tests</h1>
<div id="info">
- <h4>Platform: <span id="platform"> </span>, Version: <span id="version"> </span></h4>
- <h4>UUID: <span id="uuid"> </span>, Name: <span id="name"> </span></h4>
- <h4>Width: <span id="width"> </span>, Height: <span id="height">
- </span>, Color Depth: <span id="colorDepth"></span></h4>
- <h4>Cordova Version: <span id="cordova"> </span></h4>
+ <h4>Cordova: <span id="cordova"> </span></h4>
+ <h4>Deviceready: <span id="deviceready"> </span></h4>
</div>
<div id="info">
<h4>Run each of the test activities below:</h4>
http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/blob/07e922f1/test/assets/www/lifecycle/index.html
----------------------------------------------------------------------
diff --git a/test/assets/www/lifecycle/index.html b/test/assets/www/lifecycle/index.html
index d965924..69a1870 100755
--- a/test/assets/www/lifecycle/index.html
+++ b/test/assets/www/lifecycle/index.html
@@ -40,13 +40,8 @@ $
function onDeviceReady() {
// Register the event listener
- document.getElementById("platform").innerHTML = device.platform;
- document.getElementById("version").innerHTML = device.version;
- document.getElementById("uuid").innerHTML = device.uuid;
- document.getElementById("name").innerHTML = device.name;
- document.getElementById("width").innerHTML = screen.width;
- document.getElementById("height").innerHTML = screen.height;
- document.getElementById("colorDepth").innerHTML = screen.colorDepth;
+ document.getElementById("deviceready").innerHTML = "fired";
+ document.getElementById("cordova").innerHTML = cordova.version;
document.addEventListener("pause", onPause, false);
document.addEventListener("resume", onResume, false);
@@ -84,17 +79,8 @@ $
<body onload="onLoad()" onunload="onUnLoaded()" id="stage" class="theme">
<h1>Events</h1>
<div id="info">
- <h4>
- Platform: <span id="platform"> </span>, Version: <span
- id="version"> </span>
- </h4>
- <h4>
- UUID: <span id="uuid"> </span>, Name: <span id="name"> </span>
- </h4>
- <h4>
- Width: <span id="width"> </span>, Height: <span id="height">
- </span>, Color Depth: <span id="colorDepth"></span>
- </h4>
+ <h4>Cordova: <span id="cordova"> </span></h4>
+ <h4>Deviceready: <span id="deviceready"> </span></h4>
</div>
<div id="info">
<h4>Test 1</h4>
http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/blob/07e922f1/test/assets/www/lifecycle/index2.html
----------------------------------------------------------------------
diff --git a/test/assets/www/lifecycle/index2.html b/test/assets/www/lifecycle/index2.html
index bfa3ed8..caa2482 100755
--- a/test/assets/www/lifecycle/index2.html
+++ b/test/assets/www/lifecycle/index2.html
@@ -40,6 +40,7 @@ $
function onDeviceReady() {
// Register the event listener
+<<<<<<< HEAD
document.getElementById("platform").innerHTML = device.platform;
document.getElementById("version").innerHTML = device.version;
document.getElementById("uuid").innerHTML = device.uuid;
@@ -47,6 +48,10 @@ $
document.getElementById("width").innerHTML = screen.width;
document.getElementById("height").innerHTML = screen.height;
document.getElementById("colorDepth").innerHTML = screen.colorDepth;
+=======
+ document.getElementById("deviceready").innerHTML = "fired";
+ document.getElementById("cordova").innerHTML = cordova.version;
+>>>>>>> 8e753a6... CB-5346: remove dependency on device plugin
document.addEventListener("pause", onPause, false);
document.addEventListener("resume", onResume, false);
http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/blob/07e922f1/test/assets/www/main.js
----------------------------------------------------------------------
diff --git a/test/assets/www/main.js b/test/assets/www/main.js
index aa1b226..f525a5c 100755
--- a/test/assets/www/main.js
+++ b/test/assets/www/main.js
@@ -18,17 +18,8 @@
*/
var deviceInfo = function() {
- document.getElementById("platform").innerHTML = device.platform;
- document.getElementById("version").innerHTML = device.version;
- document.getElementById("uuid").innerHTML = device.uuid;
- document.getElementById("name").innerHTML = device.name;
- document.getElementById("width").innerHTML = screen.width;
- document.getElementById("height").innerHTML = screen.height;
- document.getElementById("colorDepth").innerHTML = screen.colorDepth;
- var el = document.getElementById("cordova");
- if (el) {
- el.innerHTML = device.cordova;
- }
+ document.getElementById("deviceready").innerHTML = "fired";
+ document.getElementById("cordova").innerHTML = cordova.version;
};
var getLocation = function() {
http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/blob/07e922f1/test/assets/www/menus/index.html
----------------------------------------------------------------------
diff --git a/test/assets/www/menus/index.html b/test/assets/www/menus/index.html
index 38322bc..3a4c0ce 100755
--- a/test/assets/www/menus/index.html
+++ b/test/assets/www/menus/index.html
@@ -19,7 +19,7 @@ $
-->
<html>
<head>
- <meta name="viewport" content="width=320; user-scalable=no" />
+ <meta name="viewport" content="width=320, user-scalable=no" />
<meta http-equiv="Content-type" content="text/html; charset=utf-8">
<title>Cordova Tests</title>
<link rel="stylesheet" href="../master.css" type="text/css" media="screen" title="no title">
@@ -29,10 +29,8 @@ $
<body onload="init();" id="stage" class="theme">
<h1>Menu Test</h1>
<div id="info">
- <h4>Platform: <span id="platform"> </span>, Version: <span id="version"> </span></h4>
- <h4>UUID: <span id="uuid"> </span>, Name: <span id="name"> </span></h4>
- <h4>Width: <span id="width"> </span>, Height: <span id="height">
- </span>, Color Depth: <span id="colorDepth"></span></h4>
+ <h4>Cordova: <span id="cordova"> </span></h4>
+ <h4>Deviceready: <span id="deviceready"> </span></h4>
</div>
<div id="info">
<h4>The menu items should be:</h4>
http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/blob/07e922f1/test/assets/www/splashscreen/index.html
----------------------------------------------------------------------
diff --git a/test/assets/www/splashscreen/index.html b/test/assets/www/splashscreen/index.html
index 8d2cd9f..5f5d9e8 100755
--- a/test/assets/www/splashscreen/index.html
+++ b/test/assets/www/splashscreen/index.html
@@ -1,25 +1,25 @@
<!--
- Licensed to the Apache Software Foundation (ASF) under one$
- or more contributor license agreements. See the NOTICE file$
- distributed with this work for additional information$
- regarding copyright ownership. The ASF licenses this file$
- to you under the Apache License, Version 2.0 (the$
- "License"); you may not use this file except in compliance$
- with the License. You may obtain a copy of the License at$
-$
- http://www.apache.org/licenses/LICENSE-2.0$
-$
- Unless required by applicable law or agreed to in writing,$
- software distributed under the License is distributed on an$
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY$
- KIND, either express or implied. See the License for the$
- specific language governing permissions and limitations$
- under the License.$
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
-->
<!DOCTYPE HTML>
<html>
<head>
- <meta name="viewport" content="width=320; user-scalable=no" />
+ <meta name="viewport" content="width=320, user-scalable=no" />
<meta http-equiv="Content-type" content="text/html; charset=utf-8">
<title>Cordova Tests</title>
<link rel="stylesheet" href="../master.css" type="text/css" media="screen" title="no title">
@@ -29,10 +29,8 @@ $
<body onload="init();" id="stage" class="theme">
<h1>Splash Screen Test</h1>
<div id="info">
- <h4>Platform: <span id="platform"> </span>, Version: <span id="version"> </span></h4>
- <h4>UUID: <span id="uuid"> </span>, Name: <span id="name"> </span></h4>
- <h4>Width: <span id="width"> </span>, Height: <span id="height">
- </span>, Color Depth: <span id="colorDepth"></span></h4>
+ <h4>Cordova: <span id="cordova"> </span></h4>
+ <h4>Deviceready: <span id="deviceready"> </span></h4>
</div>
<div id="info">
You should have seen the splash screen for 2 seconds.</div>
http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/blob/07e922f1/test/assets/www/userwebview/index.html
----------------------------------------------------------------------
diff --git a/test/assets/www/userwebview/index.html b/test/assets/www/userwebview/index.html
index 51eec6a..b1a653a 100755
--- a/test/assets/www/userwebview/index.html
+++ b/test/assets/www/userwebview/index.html
@@ -1,25 +1,25 @@
<!--
- Licensed to the Apache Software Foundation (ASF) under one$
- or more contributor license agreements. See the NOTICE file$
- distributed with this work for additional information$
- regarding copyright ownership. The ASF licenses this file$
- to you under the Apache License, Version 2.0 (the$
- "License"); you may not use this file except in compliance$
- with the License. You may obtain a copy of the License at$
-$
- http://www.apache.org/licenses/LICENSE-2.0$
-$
- Unless required by applicable law or agreed to in writing,$
- software distributed under the License is distributed on an$
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY$
- KIND, either express or implied. See the License for the$
- specific language governing permissions and limitations$
- under the License.$
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
-->
<!DOCTYPE HTML>
<html>
<head>
- <meta name="viewport" content="width=320; user-scalable=no" />
+ <meta name="viewport" content="width=320, user-scalable=no" />
<meta http-equiv="Content-type" content="text/html; charset=utf-8">
<title>Cordova Tests</title>
<link rel="stylesheet" href="../master.css" type="text/css" media="screen" title="no title">
@@ -29,10 +29,8 @@ $
<body onload="init();" id="stage" class="theme">
<h1>User WebView/Client/Chrome Test</h1>
<div id="info">
- <h4>Platform: <span id="platform"> </span>, Version: <span id="version"> </span></h4>
- <h4>UUID: <span id="uuid"> </span>, Name: <span id="name"> </span></h4>
- <h4>Width: <span id="width"> </span>, Height: <span id="height">
- </span>, Color Depth: <span id="colorDepth"></span></h4>
+ <h4>Cordova: <span id="cordova"> </span></h4>
+ <h4>Deviceready: <span id="deviceready"> </span></h4>
</div>
<div id="info">
<h4>The following should be seen in LogCat:</h4>
http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/blob/07e922f1/test/assets/www/whitelist/index.html
----------------------------------------------------------------------
diff --git a/test/assets/www/whitelist/index.html b/test/assets/www/whitelist/index.html
index cf09d4c..b9596c9 100755
--- a/test/assets/www/whitelist/index.html
+++ b/test/assets/www/whitelist/index.html
@@ -1,25 +1,25 @@
<!--
- Licensed to the Apache Software Foundation (ASF) under one$
- or more contributor license agreements. See the NOTICE file$
- distributed with this work for additional information$
- regarding copyright ownership. The ASF licenses this file$
- to you under the Apache License, Version 2.0 (the$
- "License"); you may not use this file except in compliance$
- with the License. You may obtain a copy of the License at$
-$
- http://www.apache.org/licenses/LICENSE-2.0$
-$
- Unless required by applicable law or agreed to in writing,$
- software distributed under the License is distributed on an$
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY$
- KIND, either express or implied. See the License for the$
- specific language governing permissions and limitations$
- under the License.$
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
-->
<!DOCTYPE HTML>
<html>
<head>
- <meta name="viewport" content="width=320; user-scalable=no" />
+ <meta name="viewport" content="width=320, user-scalable=no" />
<meta http-equiv="Content-type" content="text/html; charset=utf-8">
<title>Cordova Tests</title>
<link rel="stylesheet" href="../master.css" type="text/css" media="screen" title="no title">
@@ -29,10 +29,8 @@ $
<body onload="init();" id="stage" class="theme">
<h1>Whitelist Page 1</h1>
<div id="info">
- <h4>Platform: <span id="platform"> </span>, Version: <span id="version"> </span></h4>
- <h4>UUID: <span id="uuid"> </span>, Name: <span id="name"> </span></h4>
- <h4>Width: <span id="width"> </span>, Height: <span id="height">
- </span>, Color Depth: <span id="colorDepth"></span></h4>
+ <h4>Cordova: <span id="cordova"> </span></h4>
+ <h4>Deviceready: <span id="deviceready"> </span></h4>
</div>
<div id="info">
Loading Page 2 should be successful.<br>
http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/blob/07e922f1/test/assets/www/whitelist/index2.html
----------------------------------------------------------------------
diff --git a/test/assets/www/whitelist/index2.html b/test/assets/www/whitelist/index2.html
index 1ba780b..5d990ad 100755
--- a/test/assets/www/whitelist/index2.html
+++ b/test/assets/www/whitelist/index2.html
@@ -1,25 +1,25 @@
<!--
- Licensed to the Apache Software Foundation (ASF) under one$
- or more contributor license agreements. See the NOTICE file$
- distributed with this work for additional information$
- regarding copyright ownership. The ASF licenses this file$
- to you under the Apache License, Version 2.0 (the$
- "License"); you may not use this file except in compliance$
- with the License. You may obtain a copy of the License at$
-$
- http://www.apache.org/licenses/LICENSE-2.0$
-$
- Unless required by applicable law or agreed to in writing,$
- software distributed under the License is distributed on an$
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY$
- KIND, either express or implied. See the License for the$
- specific language governing permissions and limitations$
- under the License.$
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
-->
<!DOCTYPE HTML>
<html>
<head>
- <meta name="viewport" content="width=320; user-scalable=no" />
+ <meta name="viewport" content="width=320, user-scalable=no" />
<meta http-equiv="Content-type" content="text/html; charset=utf-8">
<title>Cordova Tests</title>
<link rel="stylesheet" href="../master.css" type="text/css" media="screen" title="no title">
@@ -29,10 +29,8 @@ $
<body onload="init();" id="stage" class="theme">
<h1>Whitelist Page 2</h1>
<div id="info">
- <h4>Platform: <span id="platform"> </span>, Version: <span id="version"> </span></h4>
- <h4>UUID: <span id="uuid"> </span>, Name: <span id="name"> </span></h4>
- <h4>Width: <span id="width"> </span>, Height: <span id="height">
- </span>, Color Depth: <span id="colorDepth"></span></h4>
+ <h4>Cordova: <span id="cordova"> </span></h4>
+ <h4>Deviceready: <span id="deviceready"> </span></h4>
</div>
<div id="info">
Press "backbutton"
http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/blob/07e922f1/test/assets/www/xhr/index.html
----------------------------------------------------------------------
diff --git a/test/assets/www/xhr/index.html b/test/assets/www/xhr/index.html
index 9eddb1d..d1b997a 100755
--- a/test/assets/www/xhr/index.html
+++ b/test/assets/www/xhr/index.html
@@ -1,25 +1,25 @@
<!--
- Licensed to the Apache Software Foundation (ASF) under one$
- or more contributor license agreements. See the NOTICE file$
- distributed with this work for additional information$
- regarding copyright ownership. The ASF licenses this file$
- to you under the Apache License, Version 2.0 (the$
- "License"); you may not use this file except in compliance$
- with the License. You may obtain a copy of the License at$
-$
- http://www.apache.org/licenses/LICENSE-2.0$
-$
- Unless required by applicable law or agreed to in writing,$
- software distributed under the License is distributed on an$
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY$
- KIND, either express or implied. See the License for the$
- specific language governing permissions and limitations$
- under the License.$
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
-->
<!DOCTYPE HTML>
<html>
<head>
- <meta name="viewport" content="width=320; user-scalable=no" />
+ <meta name="viewport" content="width=320, user-scalable=no" />
<meta http-equiv="Content-type" content="text/html; charset=utf-8">
<title>Cordova Tests</title>
<link rel="stylesheet" href="../master.css" type="text/css" media="screen" title="no title">
@@ -49,10 +49,8 @@ $
<body onload="init();" id="stage" class="theme">
<h1>XHR</h1>
<div id="info">
- <h4>Platform: <span id="platform"> </span>, Version: <span id="version"> </span></h4>
- <h4>UUID: <span id="uuid"> </span>, Name: <span id="name"> </span></h4>
- <h4>Width: <span id="width"> </span>, Height: <span id="height">
- </span>, Color Depth: <span id="colorDepth"></span></h4>
+ <h4>Cordova: <span id="cordova"> </span></h4>
+ <h4>Deviceready: <span id="deviceready"> </span></h4>
</div>
<div id="info">
Press buttons below to test. You should see an alert with results displayed.