You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by pu...@apache.org on 2012/11/01 23:09:19 UTC

[41/58] [abbrv] Merge remote-tracking branch 'sgrebnov-wp7/master'

http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp8/blob/8b958af0/example/www/index.html
----------------------------------------------------------------------
diff --cc example/www/index.html
index 1c1c567,0e75535..3bf8c18
--- a/example/www/index.html
+++ b/example/www/index.html
@@@ -1,108 -1,108 +1,108 @@@
- <!DOCTYPE html>
 -<!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. 
 --->
 -<html>
 -  <head>
 -    <meta name="viewport" content="width=device-width, height=device-height, initial-scale=1.0, maximum-scale=1.0, user-scalable=no;" />
 -    <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
 -
 -    <title>Cordova WP7</title>
 -
 -	  <link rel="stylesheet" href="master.css" type="text/css" media="screen" title="no title" charset="utf-8"/>
 -
 -
 -    <script type="text/javascript" charset="utf-8" src="cordova-current.js"></script>
 -
 -      <script type="text/javascript">
 -
 -
 -        document.addEventListener("deviceready",onDeviceReady,false);
 -        document.addEventListener("backbutton",onBackButton,false);
 -
 -        // once the device ready event fires, you can safely do your thing! -jm
 -        function onDeviceReady()
 -        {
 -        // IE does NOT provide an alert method, you can patch it with this line after deviceready.
 -        window.alert = window.alert || navigator.notification.alert;
 -
 -        console.log("onDeviceReady. You should see this message in Visual Studio's output window.");
 -        updateDeviceInfo();
 -
 -        }
 -
 -        function onBackButton()
 -        {
 -        console.log("onBackButton");
 -        }
 -
 -        function updateDeviceInfo()
 -        {
 -        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;
 -        };
 -
 -      </script>
 -
 -
 -
 -
 -  </head>
 -  <body>
 -    <h1>Cordova Tests</h1>
 -    <div id="info">
 -      <h4>
 -        Platform: <span id="platform"> </span>
 -      </h4>
 -      <h4>
 -        Version: <span id="version"></span>
 -      </h4>
 -      <h4>
 -        UUID: <span id="uuid"> </span>
 -      </h4>
 -      <h4>
 -        Name: <span id="name"></span>
 -      </h4>
 -      <h4>
 -        Width: <span id="width"></span>,   Height: <span id="height">
 -          
 -        </span>, Color Depth: <span id="colorDepth"></span>
 -      </h4>
 -    </div>
 -
 -    <a href="accelerometer.html" class="btn large">Accelerometer</a>
 -    <a href="accelerometer2.html" class="btn large">Accel Game</a>
 -    <a href="audio.html" class="btn large">Audio Play/Record</a>
 -    <a href="camera.html" class="btn large">Camera</a>
 -    <a href="capture.html" class="btn large">Capture</a>
 -    <a href="compass.html" class="btn large">Compass</a>
 -    <a href="network.html" class="btn large">Connection</a>
 -    <a href="contacts.html" class="btn large">Contacts</a>
 -    <a href="events.html" class="btn large">Events</a>
 -    <a href="file.html" class="btn large">File</a>
 -    <a href="location.html" class="btn large">Location</a>
 -    <a href="notification.html" class="btn large">Notification</a>
 -    <a href="storage.html" class="btn large">Local Storage</a>
 -    <a href="calculator.html" class="btn large">Calculator (custom plugin)</a>
 -  </body>
 -</html>
++<!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. 
 +-->
 +<html>
 +  <head>
 +    <meta name="viewport" content="width=device-width, height=device-height, initial-scale=1.0, maximum-scale=1.0, user-scalable=no;" />
 +    <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
 +
 +    <title>Cordova WP7</title>
 +
 +	  <link rel="stylesheet" href="master.css" type="text/css" media="screen" title="no title" charset="utf-8"/>
 +
 +
-       <script type="text/javascript" charset="utf-8" src="cordova-2.1.0.js"></script>
++    <script type="text/javascript" charset="utf-8" src="cordova-current.js"></script>
 +
 +      <script type="text/javascript">
 +
 +
 +        document.addEventListener("deviceready",onDeviceReady,false);
 +        document.addEventListener("backbutton",onBackButton,false);
 +
 +        // once the device ready event fires, you can safely do your thing! -jm
 +        function onDeviceReady()
 +        {
 +        // IE does NOT provide an alert method, you can patch it with this line after deviceready.
 +        window.alert = window.alert || navigator.notification.alert;
 +
 +        console.log("onDeviceReady. You should see this message in Visual Studio's output window.");
 +        updateDeviceInfo();
 +
 +        }
 +
 +        function onBackButton()
 +        {
 +        console.log("onBackButton");
 +        }
 +
 +        function updateDeviceInfo()
 +        {
 +        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;
 +        };
 +
 +      </script>
 +
 +
 +
 +
 +  </head>
 +  <body>
 +    <h1>Cordova Tests</h1>
 +    <div id="info">
 +      <h4>
 +        Platform: <span id="platform"> </span>
 +      </h4>
 +      <h4>
 +        Version: <span id="version"></span>
 +      </h4>
 +      <h4>
 +        UUID: <span id="uuid"> </span>
 +      </h4>
 +      <h4>
 +        Name: <span id="name"></span>
 +      </h4>
 +      <h4>
 +        Width: <span id="width"></span>,   Height: <span id="height">
 +          
 +        </span>, Color Depth: <span id="colorDepth"></span>
 +      </h4>
 +    </div>
 +
 +    <a href="accelerometer.html" class="btn large">Accelerometer</a>
 +    <a href="accelerometer2.html" class="btn large">Accel Game</a>
 +    <a href="audio.html" class="btn large">Audio Play/Record</a>
 +    <a href="camera.html" class="btn large">Camera</a>
 +    <a href="capture.html" class="btn large">Capture</a>
 +    <a href="compass.html" class="btn large">Compass</a>
 +    <a href="network.html" class="btn large">Connection</a>
 +    <a href="contacts.html" class="btn large">Contacts</a>
 +    <a href="events.html" class="btn large">Events</a>
 +    <a href="file.html" class="btn large">File</a>
 +    <a href="location.html" class="btn large">Location</a>
 +    <a href="notification.html" class="btn large">Notification</a>
 +    <a href="storage.html" class="btn large">Local Storage</a>
 +    <a href="calculator.html" class="btn large">Calculator (custom plugin)</a>
 +  </body>
 +</html>

http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp8/blob/8b958af0/example/www/location.html
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp8/blob/8b958af0/example/www/network.html
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp8/blob/8b958af0/framework/Properties/AssemblyInfo.cs
----------------------------------------------------------------------
diff --cc framework/Properties/AssemblyInfo.cs
index 984bf3b,b842ce5..8eb157a
--- a/framework/Properties/AssemblyInfo.cs
+++ b/framework/Properties/AssemblyInfo.cs
@@@ -5,11 -5,11 +5,11 @@@ using System.Runtime.InteropServices
  // General Information about an assembly is controlled through the following 
  // set of attributes. Change these attribute values to modify the information
  // associated with an assembly.
 -[assembly: AssemblyTitle("WP7CordovaClassLib")]
 -[assembly: AssemblyDescription("2.2.0")]
 +[assembly: AssemblyTitle("WPCordovaClassLib")]
- [assembly: AssemblyDescription("2.0")]
++[assembly: AssemblyDescription("2.2")]
  [assembly: AssemblyConfiguration("")]
  [assembly: AssemblyCompany("Apache Cordova")]
 -[assembly: AssemblyProduct("WP7CordovaClassLib")]
 +[assembly: AssemblyProduct("WPCordovaClassLib")]
  [assembly: AssemblyCopyright("")]
  [assembly: AssemblyTrademark("")]
  [assembly: AssemblyCulture("")]