nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #5489 from collimarco/solved5482

Browse source 
Solved #5482
This commit is contained in:
Jason Robinson 2015-01-17 03:39:03 +02:00
commit 5c810a8a2e
3 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/assets/javascripts/diaspora.js
View file

@ -39,6 +39,9 @@
Diaspora.BaseWidget = { Diaspora.BaseWidget = {
instantiate: function(Widget, element) { instantiate: function(Widget, element) {
// Mobile version loads only some widgets
if (typeof Diaspora.Widgets[Widget] === 'undefined') return;
$.extend(Diaspora.Widgets[Widget].prototype, Diaspora.EventBroker.extend(Diaspora.BaseWidget)); $.extend(Diaspora.Widgets[Widget].prototype, Diaspora.EventBroker.extend(Diaspora.BaseWidget));
var widget = new Diaspora.Widgets[Widget](), var widget = new Diaspora.Widgets[Widget](),

4
app/assets/javascripts/mobile.js
View file

@ -11,6 +11,10 @@
//= require jquery.autoSuggest.custom //= require jquery.autoSuggest.custom
//= require fileuploader-custom //= require fileuploader-custom
//= require rails-timeago //= require rails-timeago
//= require underscore
//= require diaspora
//= require helpers/i18n
//= require widgets/timeago
$(document).ready(function(){ $(document).ready(function(){

1
app/views/layouts/application.mobile.haml
View file

@ -120,4 +120,5 @@
/ javascripts at the bottom / javascripts at the bottom
= jquery_include_tag = jquery_include_tag
= javascript_include_tag :mobile = javascript_include_tag :mobile
= load_javascript_locales
= include_chartbeat = include_chartbeat