Skip to content

Commit 4478048

Browse files
dmathieudmathieu
committed
Merge pull request #78 from emberjs-addons/ember-edge
Use Emberjs 1.0.0.rc.6
2 parents 3093cd7 + ee7ca33 commit 4478048

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+368
-37387
lines changed

Diff for: ‎.gitignore

+1-2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,5 @@ tmp/
44
tests/source/
55
tests/ember-bootstrap-tests.js
66
.DS_Store
7-
8-
# .github-upload-token stores OAuth token, used by github_downloads gem
97
.github-upload-token
8+
*.gem

Diff for: ‎.jshintrc

+61-57
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,64 @@
11
{
2-
"predef": [
3-
"console",
4-
"Ember",
5-
"Bootstrap",
6-
"Handlebars",
7-
"Metamorph",
8-
"ember_assert",
9-
"ember_warn",
10-
"ember_deprecate",
11-
"ember_deprecateFunc",
12-
"require",
13-
"equal",
14-
"test",
15-
"testBoth",
16-
"testWithDefault",
17-
"raises",
18-
"deepEqual",
19-
"start",
20-
"stop",
21-
"ok",
22-
"strictEqual",
23-
"module",
24-
"expect",
25-
"minispade",
2+
predef: [
3+
"console",
4+
"requireModule",
5+
"Ember",
6+
"Handlebars",
7+
"Bootstrap",
8+
"Metamorph",
9+
"ember_assert",
10+
"ember_warn",
11+
"ember_deprecate",
12+
"ember_deprecateFunc",
13+
"require",
14+
"equal",
15+
"notEqual",
16+
"asyncTest",
17+
"test",
18+
"raises",
19+
"deepEqual",
20+
"start",
21+
"stop",
22+
"ok",
23+
"strictEqual",
24+
"module",
25+
"expect",
26+
"minispade",
27+
"async",
28+
"invokeAsync",
29+
"jQuery",
30+
"expectAssertion",
2631

27-
"clickRelLink",
28-
"appendIntoDOM",
29-
"isAppendedToDOM",
30-
"isDestroyed",
31-
"documentHasSelector",
32-
"destroyIfNecessary"
33-
],
34-
35-
"node" : false,
36-
"es5" : true,
37-
"browser" : true,
38-
39-
"boss" : true,
40-
"curly": false,
41-
"debug": false,
42-
"devel": false,
43-
"eqeqeq": true,
44-
"evil": true,
45-
"forin": false,
46-
"immed": false,
47-
"laxbreak": false,
48-
"newcap": true,
49-
"noarg": true,
50-
"noempty": false,
51-
"nonew": false,
52-
"nomen": false,
53-
"onevar": false,
54-
"plusplus": false,
55-
"regexp": false,
56-
"undef": true,
57-
"sub": true,
58-
"strict": false,
59-
"white": false
32+
"clickRelLink",
33+
"appendIntoDOM",
34+
"isAppendedToDOM",
35+
"isDestroyed",
36+
"documentHasSelector",
37+
"destroyIfNecessary"
38+
],
39+
node: false,
40+
es5: true,
41+
browser: true,
42+
boss: true,
43+
curly: false,
44+
debug: false,
45+
devel: false,
46+
eqeqeq: true,
47+
evil: true,
48+
forin: false,
49+
immed: false,
50+
laxbreak: false,
51+
newcap: true,
52+
noarg: true,
53+
noempty: false,
54+
nonew: false,
55+
nomen: false,
56+
onevar: false,
57+
plusplus: false,
58+
regexp: false,
59+
undef: true,
60+
sub: true,
61+
strict: false,
62+
white: false,
63+
eqnull: true
6064
}

Diff for: ‎.travis.yml

+2-6
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1+
---
12
rvm:
23
- 1.9.3
3-
before_script:
4-
- "export DISPLAY=:99.0"
5-
- "sh -e /etc/init.d/xvfb start"
6-
- bundle exec rackup &
7-
- sleep 5
8-
script: phantomjs tests/qunit/run-qunit.js "http://localhost:9292/tests/index.html?package=ember-bootstrap"
4+
script: rake test[all]

Diff for: ‎Assetfile

+11-90
Original file line numberDiff line numberDiff line change
@@ -1,96 +1,11 @@
1-
Encoding.default_external = "UTF-8" if defined?(Encoding)
2-
3-
require "rake-pipeline-web-filters"
4-
require "json"
5-
require "uglifier"
6-
7-
class EmberProductionFilter < Rake::Pipeline::Filter
8-
def generate_output(inputs, output)
9-
inputs.each do |input|
10-
result = File.read(input.fullpath)
11-
result.gsub!(%r{^(\s)*Ember\.(assert|deprecate|warn)\((.*)\).*$}, "")
12-
output.write result
13-
end
14-
end
15-
end
16-
17-
class EmberLicenseFilter < Rake::Pipeline::Filter
18-
def generate_output(inputs, output)
19-
inputs.each do |input|
20-
file = File.read(input.fullpath)
21-
license = File.read("generators/license.js")
22-
output.write "#{license}\n\n#{file}"
23-
end
24-
end
25-
end
26-
27-
class JSHintRC < Rake::Pipeline::Filter
28-
def generate_output(inputs, output)
29-
inputs.each do |input|
30-
file = File.read(input.fullpath)
31-
jshintrc = File.read(".jshintrc")
32-
output.write "var JSHINTRC = #{jshintrc};\n\n#{file}"
33-
end
34-
end
35-
end
36-
371
distros = {
382
:full => %w(ember-bootstrap)
393
}
404

41-
output "dist"
42-
43-
input "packages" do
44-
output "tests"
5+
#MEGAHAX
6+
ember_spade_postprocess = "filter EmberAddMicroLoader, :global => true"
457

46-
match "*/tests/**/*.js" do
47-
minispade :rewrite_requires => true, :string => true, :module_id_generator => proc { |input|
48-
id = input.path.dup
49-
id.sub!(/\.js$/, '')
50-
id.sub!(/\/main$/, '')
51-
id.sub!('/tests', '/~tests')
52-
id
53-
}
54-
55-
concat "ember-bootstrap-tests.js"
56-
end
57-
58-
match "ember-bootstrap-tests.js" do
59-
filter JSHintRC
60-
end
61-
end
62-
63-
input "packages" do
64-
match "*/lib/**/*.js" do
65-
minispade :rewrite_requires => true, :string => true, :module_id_generator => proc { |input|
66-
id = input.path.dup
67-
id.sub!('/lib/', '/')
68-
id.sub!(/\.js$/, '')
69-
id.sub!(/\/main$/, '')
70-
id
71-
}
72-
73-
concat "ember-bootstrap-spade.js"
74-
end
75-
end
76-
77-
input "packages" do
78-
match "*/lib/**/main.js" do
79-
neuter(
80-
:additional_dependencies => proc { |input|
81-
Dir.glob(File.join(File.dirname(input.fullpath),'**','*.js'))
82-
},
83-
:path_transform => proc { |path, input|
84-
package, path = path.split('/', 2)
85-
current_package = input.path.split('/', 2)[0]
86-
current_package == package && path ? File.join(package, "lib", "#{path}.js") : nil
87-
},
88-
:closure_wrap => true
89-
) do |filename|
90-
File.join("modules/", filename.gsub('/lib/main.js', '.js'))
91-
end
92-
end
93-
end
8+
instance_eval File.read(::EmberDev.support_path.join('Assetfile'))
949

9510
distros.each do |name, modules|
9611
name = "ember-bootstrap"
@@ -99,16 +14,22 @@ distros.each do |name, modules|
9914
module_paths = modules.map{|m| "#{m}.js" }
10015
match "{#{module_paths.join(',')}}" do
10116
concat(module_paths){ ["#{name}.js", "#{name}.prod.js"] }
17+
filter EmberAddMicroLoader
18+
end
19+
20+
match "#{name}.js" do
21+
filter VersionInfo
10222
end
10323

10424
# Strip dev code
10525
match "#{name}.prod.js" do
106-
filter(EmberProductionFilter) { ["#{name}.prod.js", "#{name}.min.js"] }
26+
filter(EmberStripDebugMessagesFilter) { ["#{name}.prod.js", "min/#{name}.js"] }
10727
end
10828

10929
# Minify
110-
match "#{name}.min.js" do
30+
match "min/#{name}.js" do
11131
uglify{ "#{name}.min.js" }
32+
filter VersionInfo
11233
filter EmberLicenseFilter
11334
end
11435
end

Diff for: ‎Gemfile

+4-11
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,8 @@
11
source "http://rubygems.org"
22

33
gem "rake-pipeline", :git => "https://github.com/livingsocial/rake-pipeline.git"
4-
gem "rake-pipeline-web-filters", :git => "https://github.com/wycats/rake-pipeline-web-filters.git"
5-
gem "colored"
6-
gem "uglifier", "~> 1.0.3"
4+
gem "ember-dev", :git => "https://github.com/emberjs/ember-dev.git", :branch => 'master'
75

8-
group :development do
9-
gem "rack"
10-
gem "versionomy"
11-
gem "github_downloads"
12-
gem "ember-docs", :git => "https://github.com/emberjs/docs-generator.git"
13-
gem "kicker"
14-
gem "json"
15-
end
6+
gem 'ember-source', '1.0.0.rc6.2'
7+
8+
gemspec

0 commit comments

Comments
 (0)