Skip to content

Commit eddc0ac

Browse files
committed
switched imagesloaded from bower to npm dependency via browserify
1 parent c1cae55 commit eddc0ac

6 files changed

Lines changed: 25 additions & 25 deletions

File tree

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
import 'npm:imagesloaded';
2+
export function initialize() {
3+
}
4+
5+
export default {
6+
name: 'images-loaded',
7+
initialize
8+
};
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export { default, initialize } from 'ember-masonry-grid/instance-initializers/images-loaded';
Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
var RSVP = require('rsvp');
12
module.exports = {
23
name: 'ember-masonry-grid',
34
description: 'Add ember-masonry-grid bower dependencies to app.',
@@ -6,9 +7,13 @@ module.exports = {
67
},
78

89
afterInstall: function () {
9-
return this.addBowerPackagesToProject([
10-
{ name: 'masonry' },
11-
{ name: 'imagesloaded' }
10+
return RSVP.all([
11+
this.addBowerPackageToProject('masonry'),
12+
this.addPackagesToProject([
13+
{ name: 'imagesloaded' },
14+
{ name: 'ember-browserify' },
15+
{ name: 'rsvp' }
16+
])
1217
]);
1318
}
1419
};

bower.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
"jquery": "^1.11.3",
1010
"loader.js": "^3.5.0",
1111
"qunit": "~1.20.0",
12-
"imagesloaded": "~3.2.0",
1312
"masonry": "~3.3.2",
1413
"sinonjs": "~1.17.1"
1514
}

index.js

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,5 @@
22
'use strict';
33

44
module.exports = {
5-
name: 'ember-masonry-grid',
6-
7-
included: function (app) {
8-
this._super.included(app);
9-
10-
if (!process.env.EMBER_CLI_FASTBOOT) {
11-
app.import({
12-
development: app.bowerDirectory + '/masonry/dist/masonry.pkgd.js',
13-
production: app.bowerDirectory + '/masonry/dist/masonry.pkgd.min.js'
14-
});
15-
16-
app.import({
17-
development: app.bowerDirectory + '/imagesloaded/imagesloaded.pkgd.js',
18-
production: app.bowerDirectory + '/imagesloaded/imagesloaded.pkgd.min.js'
19-
});
20-
}
21-
}
5+
name: 'ember-masonry-grid'
226
};

package.json

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
"license": "MIT",
1919
"devDependencies": {
2020
"broccoli-asset-rev": "^2.2.0",
21-
"ember-cli": "2.2.0-beta.1",
2221
"ember-ajax": "0.7.1",
22+
"ember-cli": "2.2.0-beta.1",
2323
"ember-cli-app-version": "^1.0.0",
2424
"ember-cli-content-security-policy": "0.4.0",
2525
"ember-cli-dependency-checker": "^1.2.0",
@@ -32,14 +32,17 @@
3232
"ember-disable-prototype-extensions": "^1.0.0",
3333
"ember-disable-proxy-controllers": "^1.0.1",
3434
"ember-export-application-global": "^1.0.4",
35+
"ember-resolver": "^2.0.3",
3536
"ember-sinon": "0.3.0",
3637
"ember-suave": "1.2.3",
37-
"ember-resolver": "^2.0.3",
38-
"ember-try": "~0.0.8"
38+
"ember-try": "~0.0.8",
39+
"imagesloaded": "^4.1.1"
3940
},
4041
"dependencies": {
42+
"ember-browserify": "^1.1.13",
4143
"ember-cli-babel": "^5.1.5",
42-
"ember-cli-htmlbars": "^1.0.1"
44+
"ember-cli-htmlbars": "^1.0.1",
45+
"rsvp": "^3.3.3"
4346
},
4447
"description": "Quickly and easily add masonry layouts to your app.",
4548
"keywords": [

0 commit comments

Comments
 (0)