Make the Mention button work with the asset pipeline
* Fix the javascript_include_tag in the status_messages/new view * Precompile pubhlsiher.js and jquery.textchange.min.js This fixes a 500 error that was being thrown when the Mention button was clicked, due to the above two javascripts not being precompiled and a javascript include that needed to be updated to load jquery.textchange.js from the correct path.
This commit is contained in:
parent
208fdee0cd
commit
f96fc5834f
2 changed files with 4 additions and 4 deletions
|
|
@ -1,7 +1,7 @@
|
|||
-# Copyright (c) 2010-2011, Diaspora Inc. This file is
|
||||
-# licensed under the Affero General Public License version 3 or later. See
|
||||
-# the COPYRIGHT file.
|
||||
= javascript_include_tag 'vendor/jquery.textchange.min.js', "publisher.js"
|
||||
= javascript_include_tag 'jquery.textchange.min.js', "publisher.js"
|
||||
|
||||
:javascript
|
||||
$(function() {
|
||||
|
|
|
|||
|
|
@ -76,9 +76,9 @@ module Diaspora
|
|||
# Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
|
||||
# Javascripts
|
||||
config.assets.precompile += [ "contact-list.js", "finder.js", "home.js",
|
||||
"ie.js", "inbox.js", "jquery.js", "jquery_ujs.js", "login.js", "mailchimp.js",
|
||||
"main.js", "mobile.js", "profile.js", "people.js", "photos.js", "templates.js",
|
||||
"validation.js" ]
|
||||
"ie.js", "inbox.js", "jquery.js", "jquery_ujs.js", "jquery.textchange.min.js",
|
||||
"login.js", "mailchimp.js", "main.js", "mobile.js", "profile.js",
|
||||
"people.js", "photos.js", "publisher.js", "templates.js", "validation.js" ]
|
||||
|
||||
# Stylesheets
|
||||
config.assets.precompile += [ "blueprint.css", "bootstrap.css", "default.css",
|
||||
|
|
|
|||
Loading…
Reference in a new issue