diff --git a/app/assets/javascripts/diaspora.js b/app/assets/javascripts/diaspora.js index e704f8054f5..df60703f336 100644 --- a/app/assets/javascripts/diaspora.js +++ b/app/assets/javascripts/diaspora.js @@ -39,6 +39,9 @@ Diaspora.BaseWidget = { 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)); var widget = new Diaspora.Widgets[Widget](), diff --git a/app/assets/javascripts/mobile.js b/app/assets/javascripts/mobile.js index 3584bf001e9..95db6400a19 100644 --- a/app/assets/javascripts/mobile.js +++ b/app/assets/javascripts/mobile.js @@ -11,6 +11,10 @@ //= require jquery.autoSuggest.custom //= require fileuploader-custom //= require rails-timeago +//= require underscore +//= require diaspora +//= require helpers/i18n +//= require widgets/timeago $(document).ready(function(){ diff --git a/app/views/layouts/application.mobile.haml b/app/views/layouts/application.mobile.haml index 967a8f63fc4..5796a3f747f 100644 --- a/app/views/layouts/application.mobile.haml +++ b/app/views/layouts/application.mobile.haml @@ -113,4 +113,5 @@ / javascripts at the bottom = jquery_include_tag = javascript_include_tag :mobile + = load_javascript_locales = include_chartbeat