mirror of
https://github.com/discourse/discourse.git
synced 2025-02-20 03:24:59 +08:00
barber upgrade, get assets precompile working on 1.9
This commit is contained in:
parent
51c4cb3de1
commit
8be2cb061e
|
@ -41,10 +41,10 @@ GEM
|
||||||
activerecord (>= 2.3.0)
|
activerecord (>= 2.3.0)
|
||||||
rake (>= 0.8.7)
|
rake (>= 0.8.7)
|
||||||
arel (5.0.1.20140414130214)
|
arel (5.0.1.20140414130214)
|
||||||
barber (0.4.2)
|
barber (0.5.0)
|
||||||
ember-source
|
ember-source
|
||||||
execjs
|
execjs
|
||||||
handlebars-source
|
handlebars-source (>= 1.0.0.rc.4)
|
||||||
better_errors (2.0.0)
|
better_errors (2.0.0)
|
||||||
coderay (>= 1.0.0)
|
coderay (>= 1.0.0)
|
||||||
erubis (>= 2.6.6)
|
erubis (>= 2.6.6)
|
||||||
|
|
|
@ -4,10 +4,6 @@
|
||||||
module Barber
|
module Barber
|
||||||
class EmberCompatPrecompiler < Barber::Precompiler
|
class EmberCompatPrecompiler < Barber::Precompiler
|
||||||
|
|
||||||
def self.call(template)
|
|
||||||
"Handlebars.template(#{compile(template)})"
|
|
||||||
end
|
|
||||||
|
|
||||||
def sources
|
def sources
|
||||||
[handlebars, precompiler]
|
[handlebars, precompiler]
|
||||||
end
|
end
|
||||||
|
@ -18,7 +14,7 @@ module Barber
|
||||||
#{File.read(Rails.root + "app/assets/javascripts/discourse/lib/ember_compat_handlebars.js")}
|
#{File.read(Rails.root + "app/assets/javascripts/discourse/lib/ember_compat_handlebars.js")}
|
||||||
var Barber = {
|
var Barber = {
|
||||||
precompile: function(string) {
|
precompile: function(string) {
|
||||||
return Discourse.EmberCompatHandlebars.precompile(string).toString();
|
return Discourse.EmberCompatHandlebars.precompile(string,false).toString();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
END
|
END
|
||||||
|
|
Loading…
Reference in New Issue
Block a user