Skip to content

Commit 3d8cf85

Browse files
authored
Ember 2 10 (#175)
* Updating ember to 2.10 * Updating dependencies * Cleaning packages * Fixing tests * Setting checkbox properties after module init * Adding change log * Adding release version
1 parent eb2a942 commit 3d8cf85

14 files changed

Lines changed: 118 additions & 245 deletions

File tree

.gitignore

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# See http://help.github.com/ignore-files/ for more about ignoring files.
1+
# See https://help.github.com/ignore-files/ for more about ignoring files.
22

33
# compiled output
44
/dist
@@ -13,6 +13,5 @@
1313
/connect.lock
1414
/coverage/*
1515
/libpeerconnection.log
16-
npm-debug.log
16+
npm-debug.log*
1717
testem.log
18-
lcov.dat

.travis.yml

Lines changed: 24 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,47 @@
11
language: node_js
22
node_js:
33
- "4"
4+
45
sudo: required
6+
57
cache:
68
directories:
7-
- node_modules
9+
- $HOME/.npm
10+
- $HOME/.cache # includes bowers cache
11+
812
env:
9-
- EMBER_TRY_SCENARIO=default
10-
- EMBER_TRY_SCENARIO=ember-1.13
11-
- EMBER_TRY_SCENARIO=ember-2.4
12-
- EMBER_TRY_SCENARIO=ember-2.5
13-
- EMBER_TRY_SCENARIO=ember-2.6
14-
- EMBER_TRY_SCENARIO=ember-2.7
15-
- EMBER_TRY_SCENARIO=ember-2.8
13+
# we recommend testing LTS's and latest stable release (bonus points to beta/canary)
14+
- EMBER_TRY_SCENARIO=ember-lts-2.4
15+
- EMBER_TRY_SCENARIO=ember-lts-2.8
1616
- EMBER_TRY_SCENARIO=ember-release
17-
- ALLOW_DEPRECATIONS=true EMBER_TRY_SCENARIO=ember-beta
18-
- ALLOW_DEPRECATIONS=true EMBER_TRY_SCENARIO=ember-canary
17+
- EMBER_TRY_SCENARIO=ember-beta
18+
- EMBER_TRY_SCENARIO=ember-canary
19+
1920
matrix:
2021
fast_finish: true
2122
allow_failures:
22-
- env: ALLOW_DEPRECATIONS=true EMBER_TRY_SCENARIO=ember-beta
23-
- env: ALLOW_DEPRECATIONS=true EMBER_TRY_SCENARIO=ember-canary
23+
- env: EMBER_TRY_SCENARIO=ember-beta
24+
- env: EMBER_TRY_SCENARIO=ember-canary
25+
2426
before_install:
2527
- 'export DISPLAY=:99.0'
2628
- sh -e /etc/init.d/xvfb start
2729
- npm config set spin false
28-
- npm install -g npm@^2
30+
- npm install -g bower
31+
- bower --version
32+
- npm install phantomjs-prebuilt
33+
- node_modules/phantomjs-prebuilt/bin/phantomjs --version
2934
- npm install -g codeclimate-test-reporter
35+
3036
install:
31-
- npm install -g bower
3237
- npm install
3338
- bower install
39+
3440
script:
35-
- 'ember try:one $EMBER_TRY_SCENARIO --- ember test'
41+
# Usually, it's ok to finish the test scenario without reverting
42+
# to the addon's original dependency state, skipping "cleanup".
43+
- ember try:one $EMBER_TRY_SCENARIO test --skip-cleanup
44+
3645
dist: trusty
3746
addons:
3847
apt:

CHANGELOG.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,19 @@
11
# Change Log
22
All notable changes to this project will be documented in this file. The project adhere's to Semantic Versioning. See Versioning for more information.
33

4+
## [2.0.1]
5+
### Changed
6+
- Updated Ember to 2.10 and dependencies
7+
8+
### Fixed
9+
- Mutable cell symbol change
10+
- Checkbox and Radio initial property initialization
11+
12+
### Removed
13+
- Blanket dependency
14+
15+
## [2.0.0] - 2016-10-18
16+
417
## [2.0.0-beta.3]
518
### Fixed
619
- hasOwnProperty now properly works for objects without prototype

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) 2016
3+
Copyright (c) 2017
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/mixins/base.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ Semantic.BaseMixin = Ember.Mixin.create({
171171
// if its a mutable object, get the actual value
172172
if (typeof value === 'object') {
173173
let objectKeys = Ember.A(Object.keys(value));
174-
if (objectKeys.any((objectkey) => objectkey.indexOf('MUTABLE_CELL') === 0)) {
174+
if (objectKeys.any((objectkey) => objectkey.indexOf('MUTABLE_CELL') >= 0)) {
175175
value = Ember.get(value, 'value');
176176
}
177177
}
@@ -261,7 +261,7 @@ Semantic.BaseMixin = Ember.Mixin.create({
261261
}
262262
},
263263

264-
_swapAttrs(attrName) {
264+
_setAttrBindable(attrName) {
265265
if (this.get('_settableAttrs').includes(attrName)) {
266266
this.get('_settableAttrs').removeObject(attrName);
267267
this.get('_bindableAttrs').addObject(attrName);

addon/mixins/checkbox.js

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,22 @@ var CheckboxMixin = Ember.Mixin.create(Base, {
2222
didInitSemantic() {
2323
this._super(...arguments);
2424
// We need to fake that its bindable for checked and disabled
25-
this._swapAttrs('checked');
26-
this._swapAttrs('disabled');
27-
this._swapAttrs('enabled');
25+
this._setAttrBindable('checked');
26+
this._setAttrBindable('disabled');
27+
this._setAttrBindable('enabled');
2828
if (this.get('readonly') != null) {
2929
this.get('_settableAttrs').addObject('readonly');
3030
}
31+
// Init initial value set properties correctly
32+
if (this.get('checked') != null) {
33+
this.setSemanticAttr('checked', this.get('checked'));
34+
}
35+
if (this.get('disabled') != null) {
36+
this.setSemanticAttr('disabled', this.get('disabled'));
37+
}
38+
if (this.get('enabled') != null) {
39+
this.setSemanticAttr('enabled', this.get('enabled'));
40+
}
3141
},
3242

3343
getSemanticAttr(attrName) {

bower.json

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
{
22
"name": "semantic-ui-ember",
33
"dependencies": {
4-
"ember": "~2.8.0",
4+
"ember": "~2.10.0",
55
"ember-cli-shims": "0.1.3",
66
"highlightjs": "^9.4.0",
7-
"semantic-ui": "2.2.4"
8-
},
9-
"devDependencies": {
10-
"blanket": "5e94fc30f2e694bb5c3718ddcbf60d467f4b4d26"
7+
"semantic-ui": "2.2.7"
118
}
129
}

config/ember-try.js

Lines changed: 23 additions & 153 deletions
Original file line numberDiff line numberDiff line change
@@ -1,172 +1,58 @@
11
/*jshint node:true*/
22
module.exports = {
3-
"command": "ember test",
4-
"scenarios": [
3+
scenarios: [
54
{
6-
"name": "default",
7-
"bower": {
8-
"dependencies": {}
9-
}
10-
},
11-
{
12-
"name": "ember-1.13",
13-
"bower": {
14-
"dependencies": {
15-
"ember": "~1.13.0",
16-
"ember-data": "~1.13.0",
17-
"ember-cli-shims": "0.0.6"
18-
}
19-
},
20-
npm: {
21-
dependencies: {
22-
"ember-hash-helper-polyfill": "0.1.1"
23-
}
24-
}
25-
},
26-
{
27-
name: "ember-2.0",
5+
name: 'ember-lts-2.4',
286
bower: {
297
dependencies: {
30-
ember: "~2.0.0",
31-
"ember-data": "~2.0.0",
32-
"ember-cli-shims": "0.0.6"
33-
}
34-
},
35-
npm: {
36-
dependencies: {
37-
"ember-hash-helper-polyfill": "0.1.1"
8+
'ember': 'components/ember#lts-2-4'
9+
},
10+
resolutions: {
11+
'ember': 'lts-2-4'
3812
}
3913
}
4014
},
4115
{
42-
name: "ember-2.1",
16+
name: 'ember-lts-2.8',
4317
bower: {
4418
dependencies: {
45-
ember: "~2.1.0",
46-
"ember-data": "~2.1.0",
47-
"ember-cli-shims": "0.0.6"
19+
'ember': 'components/ember#lts-2-8'
20+
},
21+
resolutions: {
22+
'ember': 'lts-2-8'
4823
}
4924
}
5025
},
5126
{
52-
name: "ember-2.2",
27+
name: 'ember-release',
5328
bower: {
5429
dependencies: {
55-
ember: "~2.2.0",
56-
"ember-data": "~2.2.0",
57-
"ember-cli-shims": "0.0.6"
58-
}
59-
},
60-
npm: {
61-
dependencies: {
62-
"ember-hash-helper-polyfill": "0.1.1"
30+
'ember': 'components/ember#release'
31+
},
32+
resolutions: {
33+
'ember': 'release'
6334
}
6435
}
6536
},
6637
{
67-
name: "ember-2.3",
38+
name: 'ember-beta',
6839
bower: {
6940
dependencies: {
70-
ember: "~2.3.0",
71-
"ember-data": "~2.3.0"
72-
}
73-
}
74-
},
75-
{
76-
"name": "ember-2.4",
77-
"bower": {
78-
"dependencies": {
79-
"ember": "~2.4.0",
80-
"ember-data": "~2.4.0"
81-
}
82-
}
83-
},
84-
{
85-
"name": "ember-2.5",
86-
"bower": {
87-
"dependencies": {
88-
"ember": "~2.5.0",
89-
"ember-data": "~2.5.0"
90-
}
91-
}
92-
},
93-
{
94-
"name": "ember-2.6",
95-
"bower": {
96-
"dependencies": {
97-
"ember": "~2.6.0",
98-
"ember-data": "~2.6.0"
99-
}
100-
}
101-
},
102-
{
103-
"name": "ember-2.7",
104-
"bower": {
105-
"dependencies": {
106-
"ember": "~2.7.0",
107-
"ember-data": "~2.7.0"
108-
}
109-
}
110-
},
111-
{
112-
"name": "ember-2.8",
113-
"bower": {
114-
"dependencies": {
115-
"ember": "~2.8.0",
116-
"ember-data": "~2.8.0"
117-
}
118-
}
119-
},
120-
{
121-
"name": "ember-release",
122-
"bower": {
123-
"dependencies": {
124-
"ember": "components/ember#release",
125-
"ember-data": "components/ember-data#release",
126-
"jquery": "<3"
127-
},
128-
"resolutions": {
129-
"ember": "release",
130-
"ember-data": "release"
131-
}
132-
}
133-
},
134-
{
135-
"name": "ember-beta",
136-
"bower": {
137-
"dependencies": {
138-
"ember": "components/ember#beta",
139-
"ember-data": "components/ember-data#beta"
41+
'ember': 'components/ember#beta'
14042
},
141-
"resolutions": {
142-
"ember": "beta",
143-
"ember-data": "beta"
144-
}
145-
}
146-
},
147-
{
148-
"name": "ember-canary",
149-
"bower": {
150-
"dependencies": {
151-
"ember": "components/ember#canary",
152-
"ember-data": "components/ember-data#canary"
153-
},
154-
"resolutions": {
155-
"ember": "canary",
156-
"ember-data": "canary"
43+
resolutions: {
44+
'ember': 'beta'
15745
}
15846
}
15947
},
16048
{
161-
name: 'ember-alpha',
162-
allowedToFail: true,
49+
name: 'ember-canary',
16350
bower: {
16451
dependencies: {
165-
"ember": "alpha",
166-
"ember-data": "components/ember-data#release",
52+
'ember': 'components/ember#canary'
16753
},
16854
resolutions: {
169-
"ember": "alpha"
55+
'ember': 'canary'
17056
}
17157
}
17258
},
@@ -178,22 +64,6 @@ module.exports = {
17864
}
17965
}
18066
},
181-
{
182-
"name": "semantic-2.2.2",
183-
"bower": {
184-
"dependencies": {
185-
"semantic-ui": "2.2.2"
186-
}
187-
}
188-
},
189-
{
190-
"name": "semantic-2.2.3",
191-
"bower": {
192-
"dependencies": {
193-
"semantic-ui": "2.2.3"
194-
}
195-
}
196-
},
19767
{
19868
"name": "semantic-2.2.4",
19969
"bower": {

0 commit comments

Comments
 (0)