github/cordova-android
4
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2026-04-23 00:00:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 4.0.x (up to 3.7.0-dev)

Browse Source 
Conflicts:
	VERSION
	bin/templates/cordova/version
	framework/src/org/apache/cordova/CordovaWebView.java
	package.json
	test/src/org/apache/cordova/test/basicauth.java
	test/src/org/apache/cordova/test/menus.java
This commit is contained in:
Ian Clelland
2014-09-11 10:16:28 -04:00
parent 31b1a821ca 5a82dd5110
commit 51e634ccb4
7 changed files with 210 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/assets/www/htmlnotfound/error.html
+21 -2
View File
@@ -14,6 +14,25 @@
"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.$
under the License.
-->
This is an error page.
<!DOCTYPE HTML>
<html>
<head>
<meta name="viewport" content="width=320, user-scalable=no" />
<meta http-equiv="Content-type" content="text/html; charset=utf-8">
<title>Expected Error</title>
<link rel="stylesheet" href="../master.css" type="text/css" media="screen" title="no title">
<script type="text/javascript" charset="utf-8" src="../cordova.js"></script>
<script type="text/javascript" charset="utf-8" src="../main.js"></script>
</head>
<body onload="init();" id="stage" class="theme">
<h1>Expected Error</h1>
<div id="info">
<h4>Cordova: <span id="cordova"> &nbsp;</span></h4>
<h4>Deviceready: <span id="deviceready"> &nbsp;</span></h4>
</div>
<div id="info">
This is an expected error page because the initial href doesn't exist.
</body>
</html>
test/assets/www/index.html
+1 -1
View File
@@ -36,7 +36,7 @@
</head>
<body onload="init();" id="stage" class="theme">
<h1>Cordova Android Tests</h1>
<h1>Cordova Android Native Tests</h1>
<div id="info">
<h4>Cordova: <span id="cordova"> &nbsp;</span></h4>
<h4>Deviceready: <span id="deviceready"> &nbsp;</span></h4>
test/assets/www/menus/index.html
+1 -1
View File
@@ -33,7 +33,7 @@
<h4>Deviceready: <span id="deviceready"> &nbsp;</span></h4>
</div>
<div id="info">
<h4>The menu items should be:</h4>
<h4>The options menu items should be:</h4>
<li>Item1<br>
<li>Item2<br>
<li>Item3<br>