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

Merge pull request #5758 from svbergerem/fix-missing-assets

Browse source 
Fix missing assets bug
This commit is contained in:
Jonne Haß 2015-03-11 20:36:28 +01:00
commit 6dfc77f385
6 changed files with 0 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/views/profiles/_edit_public.haml
View file

@ -1,10 +1,4 @@
-# Copyright (c) 2010-2011, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
- content_for :head do - content_for :head do
= javascript_include_tag :profile
:javascript :javascript
$(document).ready(function () { $(document).ready(function () {
var data = $.parseJSON( '#{@tags_array.to_json.gsub("'", "\\\\'")}' ), var data = $.parseJSON( '#{@tags_array.to_json.gsub("'", "\\\\'")}' ),

6
app/views/status_messages/bookmarklet.html.haml
View file

@ -1,9 +1,3 @@
-# Copyright (c) 2010-2012, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
= javascript_include_tag :home
.container-fluid#bookmarklet .container-fluid#bookmarklet
.row-fluid .row-fluid
%h4 %h4

2
app/views/status_messages/new.html.haml
View file

@ -1,5 +1,3 @@
= javascript_include_tag :home
= render :partial => 'publisher/publisher', = render :partial => 'publisher/publisher',
:locals => { :aspect => @aspect, :locals => { :aspect => @aspect,
:aspect_ids => @aspect_ids, :aspect_ids => @aspect_ids,

1
app/views/streams/main_stream.html.haml
View file

@ -3,7 +3,6 @@
-# the COPYRIGHT file. -# the COPYRIGHT file.
- content_for :head do - content_for :head do
= javascript_include_tag :home
- if AppConfig.chat.enabled? - if AppConfig.chat.enabled?
= javascript_include_tag :jsxc, :id => 'jsxc', = javascript_include_tag :jsxc, :id => 'jsxc',
:data => { :endpoint => get_bosh_endpoint } :data => { :endpoint => get_bosh_endpoint }

7
app/views/users/getting_started.haml
View file

@ -1,10 +1,3 @@
-# Copyright (c) 2010-2011, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
- content_for :head do
= javascript_include_tag :profile
.container .container
.row .row
%section#hello-there.span12 %section#hello-there.span12

4
config/application.rb
View file

@ -68,19 +68,15 @@ module Diaspora
config.assets.precompile += %w{ config.assets.precompile += %w{
aspect-contacts.js aspect-contacts.js
contact-list.js contact-list.js
home.js
ie.js ie.js
inbox.js inbox.js
jquery.js jquery.js
jquery_ujs.js jquery_ujs.js
jquery-textchange.js jquery-textchange.js
mailchimp.js
main.js main.js
jsxc.js jsxc.js
mobile/mobile.js mobile/mobile.js
profile.js
people.js people.js
profile.js
publisher.js publisher.js
templates.js templates.js
validation.js validation.js