Skip to content

Commit

Permalink
Refs #11141 Move the dojox/mobileApp.js file to dojox/mobile/app.js t…
Browse files Browse the repository at this point in the history
…o follow the correct naming conventions

git-svn-id: http://svn.dojotoolkit.org/src/dojox/trunk@22469 560b804f-0ae3-0310-86f3-f6aa0a117693
  • Loading branch information
shaneosullivan committed Jul 13, 2010
1 parent eb99437 commit fb866fc
Show file tree
Hide file tree
Showing 10 changed files with 26 additions and 11 deletions.
File renamed without changes.
4 changes: 2 additions & 2 deletions mobile/build/profiles/mobile.profile.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ dependencies = {
]
},
{
name: "../dojox/mobileApp.js",
name: "../dojox/mobile/app.js",
dependencies: [
"dojox.mobileApp"
"dojox.mobile.app"
]
},
{
Expand Down
2 changes: 1 addition & 1 deletion mobile/tests/complexListApp/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
Include the files directly, as some mobile operating systems do not
allow synchronous XHR, and therefore break dojo.require
-->
<script type="text/javascript" src="../../../mobileApp.js"></script>
<script type="text/javascript" src="../../../mobile/app.js"></script>
<script language="JavaScript" type="text/javascript">
dojo.requireIf(!dojo.isWebKit, "dojox.mobile.app.compat");

Expand Down
2 changes: 1 addition & 1 deletion mobile/tests/dialogApp/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
Include the files directly, as some mobile operating systems do not
allow synchronous XHR, and therefore break dojo.require
-->
<script type="text/javascript" src="../../../mobileApp.js"></script>
<script type="text/javascript" src="../../../mobile/app.js"></script>
<script language="JavaScript" type="text/javascript">
dojo.requireIf(!dojo.isWebKit, "dojox.mobile.app.compat");

Expand Down
2 changes: 1 addition & 1 deletion mobile/tests/imageControlsApp/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
Include the files directly, as some mobile operating systems do not
allow synchronous XHR, and therefore break dojo.require
-->
<script type="text/javascript" src="../../../mobileApp.js"></script>
<script type="text/javascript" src="../../../mobile/app.js"></script>
<script type="text/javascript" src="../../../../dojo/io/script.js"></script>
<script language="JavaScript" type="text/javascript">
dojo.requireIf(!dojo.isWebKit, "dojox.mobile.app.compat");
Expand Down
14 changes: 14 additions & 0 deletions mobile/tests/imageControlsApp/view-resources.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
[
{
scene: "flickr-image-thumb-view",
module: "dojo.io.script"
},
{
scene: "flickr-image-view",
module: "dojo.io.script"
},
{
scene: "flickr-search-group",
module: "dojo.io.script"
}
]
5 changes: 3 additions & 2 deletions mobile/tests/inputApp/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,22 @@
<head>
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"/>
<meta name="apple-mobile-web-app-capable" content="yes" />
<link href="../../themes/iphone/iphone-app.css" rel="stylesheet"></link>
<link href="../../themes/iphone/iphone-app.css" rel="stylesheet">
<style>
.lnk {
font-size: 17px;
color: cyan;
text-decoration: none;
}
</style>

<script type="text/javascript" src="../../../../dojo/dojo.js" djConfig="parseOnLoad: false"></script>

<!--
Include the files directly, as some mobile operating systems do not
allow synchronous XHR, and therefore break dojo.require
-->
<script type="text/javascript" src="../../../mobileApp.js"></script>
<script type="text/javascript" src="../../../mobile/app.js"></script>
<script language="JavaScript" type="text/javascript">
dojo.requireIf(!dojo.isWebKit, "dojox.mobile.app.compat");

Expand Down
2 changes: 1 addition & 1 deletion mobile/tests/multiSceneApp/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
Include the files directly, as some mobile operating systems do not
allow synchronous XHR, and therefore break dojo.require
-->
<script type="text/javascript" src="../../../mobileApp.js"></script>
<script type="text/javascript" src="../../../mobile/app.js"></script>
<script language="JavaScript" type="text/javascript">
dojo.requireIf(!dojo.isWebKit, "dojox.mobile.app.compat");

Expand Down
4 changes: 2 additions & 2 deletions mobile/tests/simpleApp/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
Include the files directly, as some mobile operating systems do not
allow synchronous XHR, and therefore break dojo.require
-->
<script type="text/javascript" src="../../../mobileApp.js"></script>
<script type="text/javascript" src="../../../mobile/app.js"></script>
<script language="JavaScript" type="text/javascript">
dojo.requireIf(!dojo.isWebKit, "dojox.mobile.app.compat");

Expand All @@ -26,7 +26,7 @@
title: "Simple Mobile App",
initialScene: "main"
};

dojo.ready(dojox.mobile.app.init);
</script>
</head>
Expand Down
2 changes: 1 addition & 1 deletion mobile/tests/simpleListApp/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
Include the files directly, as some mobile operating systems do not
allow synchronous XHR, and therefore break dojo.require
-->
<script type="text/javascript" src="../../../mobileApp.js"></script>
<script type="text/javascript" src="../../../mobile/app.js"></script>
<script language="JavaScript" type="text/javascript">
dojo.requireIf(!dojo.isWebKit, "dojox.mobile.app.compat");

Expand Down

0 comments on commit fb866fc

Please sign in to comment.