Skip to content

Commit c3c86c3

Browse files
jereljerel
committed
Upgraded Ember and Ember CLI
1 parent 0992ccd commit c3c86c3

File tree

21 files changed

+114
-193
lines changed

21 files changed

+114
-193
lines changed

‎LICENSE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2015
3+
Copyright (c) 2016
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
66

‎addon/.gitkeep

Whitespace-only changes.

‎app/.gitkeep

Whitespace-only changes.

‎bower.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
{
22
"name": "ember-cli-loading-slider",
33
"dependencies": {
4-
"ember": "1.13.11",
4+
"ember": "1.13.12",
55
"ember-cli-shims": "0.0.6",
66
"ember-cli-test-loader": "0.2.1",
77
"ember-data": "1.13.15",
88
"ember-load-initializers": "0.1.7",
99
"ember-qunit": "0.4.16",
1010
"ember-qunit-notifications": "0.1.0",
1111
"ember-resolver": "~0.1.20",
12-
"jquery": "^1.11.3",
12+
"jquery": "1.11.3",
1313
"loader.js": "ember-cli/loader.js#3.4.0",
1414
"qunit": "~1.20.0"
1515
}
16-
}
16+
}

‎ember-cli-build.js

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,18 @@
1-
/*jshint node:true*/
2-
/* global require, module */
3-
var EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
4-
5-
module.exports = function(defaults) {
6-
var app = new EmberAddon(defaults, {
7-
// Add options here
8-
});
9-
10-
/*
11-
This build file specifes the options for the dummy test app of this
12-
addon, located in `/tests/dummy`
13-
This build file does *not* influence how the addon or the app using it
14-
behave. You most likely want to be modifying `./index.js` or app's build file
15-
*/
16-
17-
app.import('vendor/ember-cli-loading-slider.css');
18-
19-
return app.toTree();
20-
};
1+
/*jshint node:true*/
2+
/* global require, module */
3+
var EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
4+
5+
module.exports = function(defaults) {
6+
var app = new EmberAddon(defaults, {
7+
// Add options here
8+
});
9+
10+
/*
11+
This build file specifes the options for the dummy test app of this
12+
addon, located in `/tests/dummy`
13+
This build file does *not* influence how the addon or the app using it
14+
behave. You most likely want to be modifying `./index.js` or app's build file
15+
*/
16+
17+
return app.toTree();
18+
};

‎package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
22
"name": "ember-cli-loading-slider",
3-
"version": "1.2.0",
3+
"version": "1.2.1",
44
"directories": {
55
"doc": "doc",
66
"test": "tests"
77
},
88
"scripts": {
9-
"start": "ember server",
109
"build": "ember build",
11-
"test": "ember test"
10+
"start": "ember server",
11+
"test": "ember try:testall"
1212
},
1313
"repository": "https://github.com/jerel/ember-cli-loading-slider",
1414
"engines": {
@@ -18,7 +18,7 @@
1818
"license": "MIT",
1919
"devDependencies": {
2020
"broccoli-asset-rev": "^2.2.0",
21-
"ember-cli": "1.13.13",
21+
"ember-cli": "1.13.15",
2222
"ember-cli-app-version": "^1.0.0",
2323
"ember-cli-content-security-policy": "0.4.0",
2424
"ember-cli-dependency-checker": "^1.1.0",

‎tests/.bowerrc

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎tests/.gitignore

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎tests/dummy/.jshintrc

Lines changed: 0 additions & 32 deletions
This file was deleted.

‎tests/dummy/app/app.js

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
import Ember from 'ember';
2-
import Resolver from 'ember/resolver';
3-
import loadInitializers from 'ember/load-initializers';
4-
import config from './config/environment';
5-
6-
let App;
7-
8-
Ember.MODEL_FACTORY_INJECTIONS = true;
9-
10-
App = Ember.Application.extend({
11-
modulePrefix: config.modulePrefix,
12-
podModulePrefix: config.podModulePrefix,
13-
Resolver
14-
});
15-
16-
loadInitializers(App, config.modulePrefix);
17-
18-
export default App;
1+
import Ember from 'ember';
2+
import Resolver from 'ember/resolver';
3+
import loadInitializers from 'ember/load-initializers';
4+
import config from './config/environment';
5+
6+
let App;
7+
8+
Ember.MODEL_FACTORY_INJECTIONS = true;
9+
10+
App = Ember.Application.extend({
11+
modulePrefix: config.modulePrefix,
12+
podModulePrefix: config.podModulePrefix,
13+
Resolver
14+
});
15+
16+
loadInitializers(App, config.modulePrefix);
17+
18+
export default App;

‎tests/dummy/app/components/.gitkeep

Whitespace-only changes.

‎tests/dummy/app/controllers/.gitkeep

Whitespace-only changes.

‎tests/dummy/app/helpers/.gitkeep

Whitespace-only changes.

‎tests/dummy/app/index.html

Lines changed: 25 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,25 @@
1-
<!DOCTYPE html>
2-
<html>
3-
<head>
4-
<meta charset="utf-8">
5-
<meta http-equiv="X-UA-Compatible" content="IE=edge">
6-
<title>Ember Add-on Loading Slider</title>
7-
<meta name="description" content="Show a slick animation when transitioning between routes or when making API requests.">
8-
<meta name="viewport" content="width=device-width, initial-scale=1">
9-
10-
{{content-for 'head'}}
11-
12-
<link rel="stylesheet" href="assets/vendor.css">
13-
<link rel="stylesheet" href="assets/dummy.css">
14-
15-
{{content-for 'head-footer'}}
16-
17-
<style>
18-
.boxed {
19-
max-width: 500px;
20-
}
21-
code {
22-
background-color: #d8d8d8;
23-
}
24-
</style>
25-
</head>
26-
<body>
27-
{{content-for 'body'}}
28-
29-
<script src="assets/vendor.js"></script>
30-
<script src="assets/dummy.js"></script>
31-
32-
{{content-for 'body-footer'}}
33-
</body>
34-
</html>
1+
<!DOCTYPE html>
2+
<html>
3+
<head>
4+
<meta charset="utf-8">
5+
<meta http-equiv="X-UA-Compatible" content="IE=edge">
6+
<title>Ember Add-on Loading Slider</title>
7+
<meta name="description" content="Show a slick animation when transitioning between routes or when making API requests.">
8+
<meta name="viewport" content="width=device-width, initial-scale=1">
9+
10+
{{content-for 'head'}}
11+
12+
<link rel="stylesheet" href="assets/vendor.css">
13+
<link rel="stylesheet" href="assets/dummy.css">
14+
15+
{{content-for 'head-footer'}}
16+
</head>
17+
<body>
18+
{{content-for 'body'}}
19+
20+
<script src="assets/vendor.js"></script>
21+
<script src="assets/dummy.js"></script>
22+
23+
{{content-for 'body-footer'}}
24+
</body>
25+
</html>

‎tests/dummy/app/models/.gitkeep

Whitespace-only changes.

‎tests/helpers/resolver.js

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
import Resolver from 'ember/resolver';
2-
import config from '../../config/environment';
3-
4-
const resolver = Resolver.create();
5-
6-
resolver.namespace = {
7-
modulePrefix: config.modulePrefix,
8-
podModulePrefix: config.podModulePrefix
9-
};
10-
11-
export default resolver;
1+
import Resolver from 'ember/resolver';
2+
import config from '../../config/environment';
3+
4+
const resolver = Resolver.create();
5+
6+
resolver.namespace = {
7+
modulePrefix: config.modulePrefix,
8+
podModulePrefix: config.podModulePrefix
9+
};
10+
11+
export default resolver;

‎tests/index.html

Lines changed: 34 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,34 @@
1-
<!DOCTYPE html>
2-
<html>
3-
<head>
4-
<meta charset="utf-8">
5-
<meta http-equiv="X-UA-Compatible" content="IE=edge">
6-
<title>LoadingSlider Tests</title>
7-
<meta name="description" content="">
8-
<meta name="viewport" content="width=device-width, initial-scale=1">
9-
10-
{{content-for 'head'}}
11-
{{content-for 'test-head'}}
12-
13-
<link rel="stylesheet" href="assets/vendor.css">
14-
<link rel="stylesheet" href="assets/dummy.css">
15-
<link rel="stylesheet" href="assets/test-support.css">
16-
<style>
17-
#ember-testing-container {
18-
position: absolute;
19-
background: white;
20-
bottom: 0;
21-
right: 0;
22-
width: 640px;
23-
height: 384px;
24-
overflow: auto;
25-
z-index: 9999;
26-
border: 1px solid #ccc;
27-
}
28-
#ember-testing {
29-
zoom: 50%;
30-
}
31-
</style>
32-
33-
{{content-for 'head-footer'}}
34-
{{content-for 'test-head-footer'}}
35-
</head>
36-
<body>
37-
{{content-for 'body'}}
38-
{{content-for 'test-body'}}
39-
40-
<script src="assets/vendor.js"></script>
41-
<script src="assets/test-support.js"></script>
42-
<script src="assets/dummy.js"></script>
43-
<script src="testem.js" integrity=""></script>
44-
<script src="assets/tests.js"></script>
45-
<script src="assets/test-loader.js"></script>
46-
47-
{{content-for 'body-footer'}}
48-
{{content-for 'test-body-footer'}}
49-
</body>
50-
</html>
1+
<!DOCTYPE html>
2+
<html>
3+
<head>
4+
<meta charset="utf-8">
5+
<meta http-equiv="X-UA-Compatible" content="IE=edge">
6+
<title>Dummy Tests</title>
7+
<meta name="description" content="">
8+
<meta name="viewport" content="width=device-width, initial-scale=1">
9+
10+
{{content-for 'head'}}
11+
{{content-for 'test-head'}}
12+
13+
<link rel="stylesheet" href="assets/vendor.css">
14+
<link rel="stylesheet" href="assets/dummy.css">
15+
<link rel="stylesheet" href="assets/test-support.css">
16+
17+
{{content-for 'head-footer'}}
18+
{{content-for 'test-head-footer'}}
19+
</head>
20+
<body>
21+
{{content-for 'body'}}
22+
{{content-for 'test-body'}}
23+
24+
<script src="assets/vendor.js"></script>
25+
<script src="assets/test-support.js"></script>
26+
<script src="assets/dummy.js"></script>
27+
<script src="testem.js" integrity=""></script>
28+
<script src="assets/tests.js"></script>
29+
<script src="assets/test-loader.js"></script>
30+
31+
{{content-for 'body-footer'}}
32+
{{content-for 'test-body-footer'}}
33+
</body>
34+
</html>

‎tests/integration/.gitkeep

Whitespace-only changes.

‎tests/acceptance/main-test.js renamed to ‎tests/integration/main-test.js

File renamed without changes.

‎tests/unit/.gitkeep

Whitespace-only changes.

‎vendor/.gitkeep

Whitespace-only changes.

0 commit comments

Comments
 (0)