Skip to content

Commit d54ee3c

Browse files
committed
Final cut at beta 1
1 parent 3c46a09 commit d54ee3c

Some content is hidden

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

52 files changed

+591
-837
lines changed

.jshintrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@
2828
"strict": false,
2929
"white": false,
3030
"eqnull": true,
31-
"esnext": true,
31+
"esversion": 6,
3232
"unused": true
3333
}

.travis.yml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
language: node_js
33
node_js:
4-
- "0.12"
4+
- "4"
55

66
sudo: false
77

@@ -11,7 +11,7 @@ cache:
1111

1212
env:
1313
- EMBER_TRY_SCENARIO=default
14-
- EMBER_TRY_SCENARIO=ember-1-13
14+
- EMBER_TRY_SCENARIO=ember-1.13
1515
- EMBER_TRY_SCENARIO=ember-release
1616
- EMBER_TRY_SCENARIO=ember-beta
1717
- EMBER_TRY_SCENARIO=ember-canary
@@ -22,14 +22,17 @@ matrix:
2222
- env: EMBER_TRY_SCENARIO=ember-canary
2323

2424
before_install:
25-
- export PATH=/usr/local/phantomjs-2.0.0/bin:$PATH
26-
- "npm config set spin false"
27-
- "npm install -g npm@^2"
25+
- npm config set spin false
26+
- npm install -g bower
27+
- bower --version
28+
- npm install phantomjs-prebuilt
29+
- node_modules/phantomjs-prebuilt/bin/phantomjs --version
2830

2931
install:
30-
- npm install -g bower
3132
- npm install
3233
- bower install
3334

3435
script:
35-
- ember try $EMBER_TRY_SCENARIO test
36+
# Usually, it's ok to finish the test scenario without reverting
37+
# to the addon's original dependency state, skipping "cleanup".
38+
- ember try:one $EMBER_TRY_SCENARIO test --skip-cleanup

addon/components/liquid-tether.js

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const { computed, get, observer, run } = Ember;
77
const { camelize } = Ember.String;
88

99
export default LiquidWormhole.extend({
10-
layout: layout,
10+
layout,
1111

1212
classPrefix: 'liquid-tether',
1313
target: null,
@@ -19,12 +19,10 @@ export default LiquidWormhole.extend({
1919
constraints: null,
2020
optimizations: null,
2121

22-
_containerClass: 'liquid-tether-container',
23-
2422
didInsertElement() {
25-
this._tetherElement = this.element.firstChild;
26-
2723
this._super.apply(this, arguments);
24+
25+
this._tetherElement = this.get('nodes')[0];
2826
},
2927

3028
willAppendNodes(bodyElement) {
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div class="liquid-tether-element">
2-
<div class={{class}}>
2+
<div id={{wormholeId}} class="{{wormholeClass}} liquid-wormhole-element">
33
{{yield}}
44
</div>
55
</div>

bower.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33
"dependencies": {
44
"bootstrap-sass": "~3.3.5",
55
"flat-ui-sass": "~2.1.3",
6-
"ember": "~2.4.1",
7-
"ember-cli-shims": "0.1.0",
8-
"ember-cli-test-loader": "0.2.2",
9-
"ember-qunit-notifications": "0.1.0"
6+
"ember": "~2.8.0",
7+
"ember-cli-shims": "0.1.1"
108
}
119
}

config/ember-try.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ module.exports = {
88
}
99
},
1010
{
11-
name: 'ember-1-13',
11+
name: 'ember-1.13',
1212
bower: {
1313
dependencies: {
1414
'ember': '~1.13.0'

package.json

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "liquid-tether",
3-
"version": "1.1.1",
3+
"version": "2.0.0-beta.1",
44
"description": "Modals made easy",
55
"directories": {
66
"doc": "doc",
@@ -18,32 +18,32 @@
1818
"author": "Christopher Garrett <[email protected]>",
1919
"license": "MIT",
2020
"devDependencies": {
21-
"ember-cli-content-security-policy": "0.4.0",
2221
"ember-cli-github-pages": "0.0.6",
23-
"broccoli-asset-rev": "^2.2.0",
24-
"ember-ajax": "0.7.1",
25-
"ember-cli": "2.4.2",
22+
"broccoli-asset-rev": "^2.4.2",
23+
"ember-ajax": "2.0.1",
24+
"ember-cli": "2.8.0",
2625
"ember-cli-app-version": "^1.0.0",
2726
"ember-cli-dependency-checker": "^1.2.0",
2827
"ember-cli-htmlbars-inline-precompile": "^0.3.1",
29-
"ember-cli-inject-live-reload": "^1.3.1",
28+
"ember-cli-inject-live-reload": "^1.4.0",
29+
"ember-cli-jshint": "^1.0.0",
3030
"ember-cli-sass": "^4.1.0",
31-
"ember-cli-qunit": "^1.2.1",
32-
"ember-cli-release": "0.2.8",
31+
"ember-cli-qunit": "^2.1.0",
32+
"ember-cli-release": "^0.2.9",
3333
"ember-cli-sri": "^2.1.0",
34+
"ember-cli-test-loader": "^1.1.0",
3435
"ember-cli-uglify": "^1.2.0",
36+
"ember-cli-markdown-compiler": "pzuraq/ember-cli-markdown-compiler#example-site-fixes",
3537
"ember-code-snippet": "1.1.3",
36-
"liquid-fire": "0.24.1",
38+
"liquid-fire": "0.26.1",
3739
"ui-tabs": "firefly-ui/ui-tabs",
3840
"phantomjs": "^2.0.0",
39-
"ember-data": "^2.4.0",
4041
"ember-disable-prototype-extensions": "^1.1.0",
41-
"ember-disable-proxy-controllers": "^1.0.1",
42-
"ember-export-application-global": "^1.0.4",
43-
"ember-load-initializers": "^0.5.0",
42+
"ember-export-application-global": "^1.0.5",
43+
"ember-load-initializers": "^0.5.1",
4444
"ember-resolver": "^2.0.3",
4545
"ember-try": "^0.1.2",
46-
"loader.js": "^4.0.0"
46+
"loader.js": "^4.0.1"
4747
},
4848
"keywords": [
4949
"ember-addon"
@@ -53,8 +53,8 @@
5353
"broccoli-merge-trees": "^0.2.3",
5454
"liquid-wormhole": "pzuraq/liquid-wormhole#v2.0.0-beta.1",
5555
"tether": "pzuraq/tether#adds-option-to-specify-body-element",
56-
"ember-cli-htmlbars": "^1.0.1",
57-
"ember-cli-babel": "^5.1.5"
56+
"ember-cli-htmlbars": "^1.0.3",
57+
"ember-cli-babel": "^5.1.6"
5858
},
5959
"ember-addon": {
6060
"configPath": "tests/dummy/config",

tests/.jshintrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,6 @@
5151
"strict": false,
5252
"white": false,
5353
"eqnull": true,
54-
"esnext": true,
54+
"esversion": 6,
5555
"unused": true
5656
}

tests/dummy/app/controllers/application.js

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

tests/dummy/app/controllers/basics.js

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

0 commit comments

Comments
 (0)