You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by na...@apache.org on 2014/10/02 20:17:38 UTC
[04/29] git commit: CB-7410 Fix the errorUrl test
CB-7410 Fix the errorUrl test
Make the error.html page a well-formed html document, otherwise it
won't display.
Conflicts:
test/assets/www/htmlnotfound/error.html
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/7ed34e5c
Tree: http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/tree/7ed34e5c
Diff: http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/diff/7ed34e5c
Branch: refs/heads/master
Commit: 7ed34e5ca20c4736ced7f60ba83c7c1f7271d8eb
Parents: ccc4a57
Author: Marcel Kinard <cm...@gmail.com>
Authored: Fri Aug 29 17:38:03 2014 -0400
Committer: Prabhjot Singh <pr...@amazon.com>
Committed: Wed Sep 17 10:05:14 2014 +0530
----------------------------------------------------------------------
test/assets/www/htmlnotfound/error.html | 53 +++++++++++++++++++---------
1 file changed, 36 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/blob/7ed34e5c/test/assets/www/htmlnotfound/error.html
----------------------------------------------------------------------
diff --git a/test/assets/www/htmlnotfound/error.html b/test/assets/www/htmlnotfound/error.html
index c1f1329..3852efe 100755
--- a/test/assets/www/htmlnotfound/error.html
+++ b/test/assets/www/htmlnotfound/error.html
@@ -1,19 +1,38 @@
<!--
- 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.
-->
-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"> </span></h4>
+ <h4>Deviceready: <span id="deviceready"> </span></h4>
+ </div>
+ <div id="info">
+ This is an expected error page because the initial href doesn't exist.
+ </body>
+</html>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org