From ee2fafa31dbf4daa2e8d18a032e2b583dfb0fe7e Mon Sep 17 00:00:00 2001 From: Maxwell Salzberg <maxwell@joindiaspora.com> Date: Wed, 7 Mar 2012 15:20:21 -0800 Subject: [PATCH] totally gross js load order problem.. make the widget system fire after the backbone app to get the notification and search autocomplete back --- config/assets.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/config/assets.yml b/config/assets.yml index 640ea962b9..31dd371be6 100644 --- a/config/assets.yml +++ b/config/assets.yml @@ -35,11 +35,6 @@ javascripts: - public/javascripts/keycodes.js - public/javascripts/fileuploader-custom.js - - public/javascripts/diaspora.js - - public/javascripts/helpers/*.js - - public/javascripts/pages/*.js - - public/javascripts/widgets/*.js - - public/javascripts/vendor/underscore.js - public/javascripts/vendor/backbone.js - public/javascripts/vendor/handlebars-1.0.0.beta.6.js @@ -57,6 +52,11 @@ javascripts: - public/javascripts/app/views/*.js - public/javascripts/app/views/**/*.js + - public/javascripts/diaspora.js + - public/javascripts/helpers/*.js + - public/javascripts/pages/*.js + - public/javascripts/widgets/*.js + - public/javascripts/view.js - public/javascripts/aspects-dropdown.js - public/javascripts/contact-edit.js -- GitLab