dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #132 from mpranjic/masterfix

Browse Source 
updating jquery mobile to 1.3.1
This commit is contained in:
mdipierro
2013-07-14 12:35:27 -07:00
parent 7a0f6eafb7 b0ac67a8f6
commit 27535b032d
6 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
applications/admin/static/plugin_jqmobile/jquery.mobile-1.2.0.min.css
Vendored
-2
View File
File diff suppressed because one or more lines are too long
applications/admin/static/plugin_jqmobile/jquery.mobile-1.2.0.min.js
Vendored
-2
View File
File diff suppressed because one or more lines are too long
applications/admin/static/plugin_jqmobile/jquery.mobile-1.3.1.min.css
Vendored
+3
View File
File diff suppressed because one or more lines are too long
applications/admin/static/plugin_jqmobile/jquery.mobile-1.3.1.min.js
Vendored
+7
View File
File diff suppressed because one or more lines are too long
applications/admin/views/default.mobile/layout.html
+2 -2
View File
@@ -31,7 +31,7 @@
<link rel="apple-touch-icon" href="{{=URL('static','favicon.png')}}">
<!-- For the less-enabled mobile browsers like Opera Mini -->
<link rel="stylesheet" href="{{=URL('static','plugin_jqmobile/jquery.mobile-1.2.0.min.css')}}">
<link rel="stylesheet" href="{{=URL('static','plugin_jqmobile/jquery.mobile-1.3.1.min.css')}}">
<!-- All JavaScript at the bottom, except for Modernizr which enables HTML5 elements & feature detects -->
<script src="{{=URL('static','js/modernizr.custom.js')}}"></script!>
@@ -61,7 +61,7 @@ $(document).bind("mobileinit", function(){
});
</script>
<script src="{{=URL('static','plugin_jqmobile/jquery.mobile-1.2.0.min.js')}}"></script>
<script src="{{=URL('static','plugin_jqmobile/jquery.mobile-1.3.1.min.js')}}"></script>
<style>
.error { color: red; }
applications/admin/views/plugin_jqmobile/layout.html
+2 -2
View File
@@ -31,7 +31,7 @@
<link rel="apple-touch-icon" href="{{=URL('static','favicon.png')}}">
<!-- For the less-enabled mobile browsers like Opera Mini -->
<link rel="stylesheet" href="{{=URL('static','plugin_jqmobile/jquery.mobile-1.2.0.min.css')}}">
<link rel="stylesheet" href="{{=URL('static','plugin_jqmobile/jquery.mobile-1.3.1.min.css')}}">
<!-- All JavaScript at the bottom, except for Modernizr which enables HTML5 elements & feature detects -->
<script src="{{=URL('static','js/modernizr.custom.js')}}"></script!>
@@ -61,7 +61,7 @@ $(document).bind("mobileinit", function(){
});
</script>
<script src="{{=URL('static','plugin_jqmobile/jquery.mobile-1.2.0.min.js')}}"></script>
<script src="{{=URL('static','plugin_jqmobile/jquery.mobile-1.3.1.min.js')}}"></script>
<style>
.error { color: red; }