updating jquery mobile, fix the menu page a bit
This commit is contained in:
parent
f99b724e0b
commit
bb59df46f9
4 changed files with 5133 additions and 10 deletions
|
|
@ -15,18 +15,11 @@
|
||||||
:javascript
|
:javascript
|
||||||
Diaspora.widgets.i18n.loadLocale(#{get_javascript_strings_for(current_user.language).to_json}, "#{current_user.language}");
|
Diaspora.widgets.i18n.loadLocale(#{get_javascript_strings_for(current_user.language).to_json}, "#{current_user.language}");
|
||||||
|
|
||||||
= stylesheet_link_tag 'vendor/jquery.mobile-1.0a3.min', 'mobile'
|
= stylesheet_link_tag 'vendor/jquery.mobile-1.0a4.min', 'mobile'
|
||||||
= csrf_meta_tag
|
= csrf_meta_tag
|
||||||
|
|
||||||
:javascript
|
:javascript
|
||||||
$(document).ready(Mobile.initialize);
|
$(document).ready(Mobile.initialize);
|
||||||
$(document).ready( function() {
|
|
||||||
$("#menu_button").bind('tap', function(e){
|
|
||||||
e.preventDefault();
|
|
||||||
$("#content").hide();
|
|
||||||
$("#menu").show();
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
= yield(:head)
|
= yield(:head)
|
||||||
|
|
||||||
|
|
@ -95,7 +88,8 @@
|
||||||
= link_to(image_tag('icons/search_white.png'), people_path)
|
= link_to(image_tag('icons/search_white.png'), people_path)
|
||||||
= link_to(image_tag('white.png'), aspects_path)
|
= link_to(image_tag('white.png'), aspects_path)
|
||||||
|
|
||||||
%div{:data => {:role => 'content'}}
|
#content{:data => {:role => 'content'}}
|
||||||
|
|
||||||
%h2
|
%h2
|
||||||
= current_user.name
|
= current_user.name
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -36,9 +36,10 @@ javascripts:
|
||||||
mobile:
|
mobile:
|
||||||
- public/javascripts/vendor/jquery144.min.js
|
- public/javascripts/vendor/jquery144.min.js
|
||||||
- public/javascripts/custom-mobile-scripting.js
|
- public/javascripts/custom-mobile-scripting.js
|
||||||
- public/javascripts/vendor/jquery.mobile-1.0a3.min.js
|
- public/javascripts/vendor/jquery.mobile-1.0a4.js
|
||||||
- public/javascripts/vendor/jquery.infinitescroll.min.js
|
- public/javascripts/vendor/jquery.infinitescroll.min.js
|
||||||
- public/javascripts/diaspora.js
|
- public/javascripts/diaspora.js
|
||||||
|
- public/javascripts/widgets/i18n.js
|
||||||
- public/javascripts/mobile.js
|
- public/javascripts/mobile.js
|
||||||
- public/javascripts/application.js
|
- public/javascripts/application.js
|
||||||
- public/javascripts/rails.js
|
- public/javascripts/rails.js
|
||||||
|
|
|
||||||
5112
public/javascripts/vendor/jquery.mobile-1.0a4.js
vendored
Normal file
5112
public/javascripts/vendor/jquery.mobile-1.0a4.js
vendored
Normal file
File diff suppressed because it is too large
Load diff
16
public/stylesheets/vendor/jquery.mobile-1.0a4.min.css
vendored
Normal file
16
public/stylesheets/vendor/jquery.mobile-1.0a4.min.css
vendored
Normal file
File diff suppressed because one or more lines are too long
Loading…
Reference in a new issue