Skip to content

Commit fa3227a

Browse files
mislavmislav
committed
Merge pull request #458 from defunkt/vendor
Move jQuery & QUnit to `vendor/`
2 parents 6bb4cc5 + 716ec4b commit fa3227a

File tree

7 files changed

+10
-17
lines changed

7 files changed

+10
-17
lines changed

‎bower.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
".travis.yml",
1010
"Gemfile",
1111
"Gemfile.lock",
12+
"vendor/",
1213
"test/"
1314
]
1415
}

‎test/app.rb‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
require 'sinatra'
22
require 'json'
33

4-
set :public_folder, settings.root
4+
set :public_folder, File.dirname(settings.root)
55
enable :static
66

77
helpers do
@@ -31,14 +31,6 @@ def title(str)
3131
erb :qunit
3232
end
3333

34-
get '/jquery.pjax.js' do
35-
send_file "#{settings.root}/../jquery.pjax.js"
36-
end
37-
38-
get '/test/:file' do
39-
send_file "#{settings.root}/../test/#{params[:file]}"
40-
end
41-
4234
get '/env.html' do
4335
erb :env, :layout => !pjax?
4436
end

‎test/views/layout.erb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<head>
44
<meta charset="utf-8">
55
<title><%= @title %></title>
6-
<script type="text/javascript" src="test/jquery-1.9.0.js"></script>
7-
<script type="text/javascript" src="jquery.pjax.js"></script>
6+
<script type="text/javascript" src="/vendor/jquery.js"></script>
7+
<script type="text/javascript" src="/jquery.pjax.js"></script>
88
</head>
99
<body>
1010
<div id="main">

‎test/views/qunit.erb‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
<html lang="en">
33
<head>
44
<meta charset="utf-8">
5-
<link rel="stylesheet" href="/test/qunit.css">
5+
<link rel="stylesheet" href="/vendor/qunit.css">
66

7-
<script type="text/javascript" src="/test/jquery-1.9.0.js"></script>
8-
<script type="text/javascript" src="/test/qunit.js"></script>
7+
<script type="text/javascript" src="/vendor/jquery.js"></script>
8+
<script type="text/javascript" src="/vendor/qunit.js"></script>
99
<script type="text/javascript">QUnit.config.testTimeout = 10000</script>
1010
<script type="text/javascript" src="/jquery.pjax.js"></script>
11-
<script type="text/javascript" src="/unit/pjax.js"></script>
12-
<script type="text/javascript" src="/unit/fn_pjax.js"></script>
13-
<script type="text/javascript" src="/unit/pjax_fallback.js"></script>
11+
<script type="text/javascript" src="/test/unit/pjax.js"></script>
12+
<script type="text/javascript" src="/test/unit/fn_pjax.js"></script>
13+
<script type="text/javascript" src="/test/unit/pjax_fallback.js"></script>
1414
</head>
1515
<body>
1616
<div id="qunit"></div>

‎test/jquery-1.9.0.js‎ renamed to ‎vendor/jquery.js‎

File renamed without changes.

‎test/qunit.css‎ renamed to ‎vendor/qunit.css‎

File renamed without changes.

‎test/qunit.js‎ renamed to ‎vendor/qunit.js‎

File renamed without changes.

0 commit comments

Comments
 (0)