Skip to content

Commit

Permalink
Make examples interactive
Browse files Browse the repository at this point in the history
  • Loading branch information
@RobbieTheWagner
RobbieTheWagner committed Jan 12, 2017
1 parent d13078d commit b35f113
Show file tree
Hide file tree
Showing 10 changed files with 77 additions and 88 deletions.
2 changes: 1 addition & 1 deletion addon/helpers/add.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import Ember from 'ember';
const { Helper } = Ember;

export function add(params) {
return params.reduce((a, b) => a + b);
return params.reduce((a, b) => Number(a) + Number(b));
}

export default Helper.helper(add);
2 changes: 1 addition & 1 deletion addon/helpers/div.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import Ember from 'ember';
const { Helper } = Ember;

export function div(params) {
return params.reduce((a, b) => a / b);
return params.reduce((a, b) => Number(a) / Number(b));
}

export default Helper.helper(div);
2 changes: 1 addition & 1 deletion addon/helpers/mod.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import Ember from 'ember';
const { Helper } = Ember;

export function mod(params) {
return params.reduce((a, b) => a % b);
return params.reduce((a, b) => Number(a) % Number(b));
}

export default Helper.helper(mod);
2 changes: 1 addition & 1 deletion addon/helpers/mult.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import Ember from 'ember';
const { Helper } = Ember;

export function mult(params) {
return params.reduce((a, b) => a * b);
return params.reduce((a, b) => Number(a) * Number(b));
}

export default Helper.helper(mult);
2 changes: 1 addition & 1 deletion addon/helpers/sub.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import Ember from 'ember';
const { Helper } = Ember;

export function sub(params) {
return params.reduce((a, b) => a - b);
return params.reduce((a, b) => Number(a) - Number(b));
}

export default Helper.helper(sub);
10 changes: 6 additions & 4 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@
"scripts": {
"build": "ember build",
"start": "ember server",
"test": "ember try:each"
"test": "ember try:each",
"deploy": "ember github-pages:commit --message \"Deploy gh-pages from commit $(git rev-parse HEAD)\"; git push; git checkout -"
},
"dependencies": {
"ember-cli-babel": "^5.1.7"
Expand All @@ -42,19 +43,20 @@
"ember-cli-inject-live-reload": "^1.4.1",
"ember-cli-qunit": "^3.0.1",
"ember-cli-release": "^0.2.9",
"ember-cli-sass": "^6.0.0",
"ember-cli-sass": "^5.6.0",
"ember-cli-sri": "^2.1.0",
"ember-cli-test-loader": "^1.1.0",
"ember-cli-uglify": "^1.2.0",
"ember-debonair": "0.3.0",
"ember-disable-prototype-extensions": "^1.1.0",
"ember-export-application-global": "^1.0.5",
"ember-let": "0.5.4",
"ember-load-initializers": "^0.6.0",
"ember-resolver": "^2.0.3",
"ember-source": "^2.11.0-beta.2",
"ember-template-lint": "0.6.3",
"eslint-plugin-ship-shape": "0.4.0",
"flexi": "html-next/flexi",
"ember-source": "^2.11.0-beta.2",
"flexi": "1.2.0",
"loader.js": "^4.0.10"
},
"engines": {
Expand Down
14 changes: 14 additions & 0 deletions tests/dummy/app/controllers/application.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import Controller from 'ember-controller';

export default Controller.extend({
add1: 1,
add2: 2,
div1: 20,
div2: 10,
mod1: 11,
mod2: 10,
mult1: 6,
mult2: 6,
sub1: 10,
sub2: 2
});
15 changes: 14 additions & 1 deletion tests/dummy/app/styles/app.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,22 @@ h1 {
font-size: 6vw;
}

input {
font-size: 12pt;
padding: 10px;
margin: 10px;
width: 65px;
}

.operator {
text-align: center;
width: 20px;
}

.result {
margin-left: 0.5em;
color: $bloodOrange;
margin-left: 0.5em;
width: 25px;
}

.centered {
Expand Down
25 changes: 20 additions & 5 deletions tests/dummy/app/templates/application.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +7,38 @@
</centered>

<centered>
1 + 2 = <span class="result">{{add 1 2}}</span>
{{input type="number" value=add1}}
<span class="operator">+</span>
{{input type="number" value=add2}}
= <span class="result">{{add add1 add2}}</span>
</centered>

<centered>
20 / 10 = <span class="result">{{div 20 10}}</span>
{{input type="number" value=div1}}
<span class="operator">/</span>
{{input type="number" value=div2}}
= <span class="result">{{div div1 div2}}</span>
</centered>

<centered>
11 % 10 = <span class="result">{{mod 11 10}}</span>
{{input type="number" value=mod1}}
<span class="operator">%</span>
{{input type="number" value=mod2}}
= <span class="result">{{mod mod1 mod2}}</span>
</centered>

<centered>
6 * 6 = <span class="result">{{mult 6 6}}</span>
{{input type="number" value=mult1}}
<span class="operator">*</span>
{{input type="number" value=mult2}}
= <span class="result">{{mult mult1 mult2}}</span>
</centered>

<centered>
10 - 2 = <span class="result">{{sub 10 2}}</span>
{{input type="number" value=sub1}}
<span class="operator">-</span>
{{input type="number" value=sub2}}
= <span class="result">{{sub sub1 sub2}}</span>
</centered>

<centered>
Expand Down
91 changes: 18 additions & 73 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -919,17 +919,6 @@ broccoli-sass-source-maps@^1.8.0:
object-assign "^2.0.0"
rsvp "^3.0.6"

broccoli-sass-source-maps@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/broccoli-sass-source-maps/-/broccoli-sass-source-maps-2.0.0.tgz#7f25f9f4b296918cec6e00672c63e75abce33d45"
dependencies:
broccoli-caching-writer "^3.0.3"
include-path-searcher "^0.1.0"
mkdirp "^0.3.5"
node-sass "^4.1.0"
object-assign "^2.0.0"
rsvp "^3.0.6"

broccoli-slow-trees@^1.0.0:
version "1.1.0"
resolved "https://registry.npmjs.org/broccoli-slow-trees/-/broccoli-slow-trees-1.1.0.tgz#426c5724e008107e4573f73e8a9ca702916b78f7"
Expand Down Expand Up @@ -1953,7 +1942,7 @@ ember-cli-release@^0.2.9:
semver "^4.3.1"
silent-error "^1.0.0"

ember-cli-sass@^5.3.1:
ember-cli-sass@^5.3.1, ember-cli-sass@^5.6.0:
version "5.6.0"
resolved "https://registry.npmjs.org/ember-cli-sass/-/ember-cli-sass-5.6.0.tgz#792de67544bb903eef421a3e59c484840fea5352"
dependencies:
Expand All @@ -1964,17 +1953,6 @@ ember-cli-sass@^5.3.1:
ember-cli-version-checker "^1.0.2"
merge "^1.2.0"

ember-cli-sass@^6.0.0:
version "6.0.0"
resolved "https://registry.npmjs.org/ember-cli-sass/-/ember-cli-sass-6.0.0.tgz#31c9c8fa789c0d25aaf8e315431b7a3ec4ba0175"
dependencies:
broccoli-funnel "^1.0.0"
broccoli-merge-trees "^1.1.0"
broccoli-sass-source-maps "^2.0.0"
ember-cli-babel "5.1.10"
ember-cli-version-checker "^1.0.2"
merge "^1.2.0"

ember-cli-sri@^2.1.0:
version "2.1.1"
resolved "https://registry.npmjs.org/ember-cli-sri/-/ember-cli-sri-2.1.1.tgz#971620934a4b9183cf7923cc03e178b83aa907fd"
Expand Down Expand Up @@ -2768,9 +2746,9 @@ flat-cache@^1.2.1:
graceful-fs "^4.1.2"
write "^0.2.1"

flexi@html-next/flexi:
flexi@1.2.0:
version "1.2.0"
resolved "https://codeload.github.com/html-next/flexi/tar.gz/2e6a06524bcf1fadb479435e3076eb0461255a5c"
resolved "https://registry.npmjs.org/flexi/-/flexi-1.2.0.tgz#b03ccb23a11fbb33b6f68624f5f4c82bf29ee9a5"
dependencies:
broccoli-funnel "^1.0.1"
broccoli-merge-trees "^1.1.1"
Expand Down Expand Up @@ -4146,10 +4124,6 @@ lodash.merge@^4.3.0, lodash.merge@^4.4.0, lodash.merge@^4.5.1:
version "4.6.0"
resolved "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.0.tgz#69884ba144ac33fe699737a6086deffadd0f89c5"

lodash.mergewith@^4.6.0:
version "4.6.0"
resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.0.tgz#150cf0a16791f5903b8891eab154609274bdea55"

lodash.omit@^4.1.0:
version "4.5.0"
resolved "https://registry.npmjs.org/lodash.omit/-/lodash.omit-4.5.0.tgz#6eb19ae5a1ee1dd9df0b969e66ce0b7fa30b5e60"
Expand Down Expand Up @@ -4487,11 +4461,11 @@ mustache@^2.2.1:
version "2.3.0"
resolved "https://registry.npmjs.org/mustache/-/mustache-2.3.0.tgz#4028f7778b17708a489930a6e52ac3bca0da41d0"

mute-stream@0.0.5, mute-stream@~0.0.4:
mute-stream@0.0.5:
version "0.0.5"
resolved "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz#8fbfabb0a98a253d3184331f9e8deb7372fac6c0"

mute-stream@0.0.6:
mute-stream@0.0.6, mute-stream@~0.0.4:
version "0.0.6"
resolved "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.6.tgz#48962b19e169fd1dfc240b3f1e7317627bbc47db"

Expand Down Expand Up @@ -4588,29 +4562,6 @@ node-sass@^3.8.0:
request "^2.61.0"
sass-graph "^2.1.1"

node-sass@^4.1.0:
version "4.1.1"
resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.1.1.tgz#dc3e27d25bd827b6276ea243be357c7c7cd07111"
dependencies:
async-foreach "^0.1.3"
chalk "^1.1.1"
cross-spawn "^3.0.0"
gaze "^1.0.0"
get-stdin "^4.0.1"
glob "^7.0.3"
in-publish "^2.0.0"
lodash.assign "^4.2.0"
lodash.clonedeep "^4.3.2"
lodash.mergewith "^4.6.0"
meow "^3.7.0"
mkdirp "^0.5.1"
nan "^2.3.2"
node-gyp "^3.3.1"
npmlog "^4.0.0"
request "^2.61.0"
sass-graph "^2.1.1"
stdout-stream "^1.4.0"

node-uuid@~1.4.0, node-uuid@~1.4.7:
version "1.4.7"
resolved "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz#6da5a17668c4b3dd59623bda11cf7fa4c1f60a6f"
Expand Down Expand Up @@ -5228,7 +5179,7 @@ read@1, read@1.0.x, read@~1.0.1, read@~1.0.7:
dependencies:
mute-stream "~0.0.4"

"readable-stream@1 || 2", readable-stream@^2, readable-stream@^2.0.2, readable-stream@~2.1.5:
"readable-stream@1 || 2", readable-stream@^2, "readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@~2.1.5:
version "2.1.5"
resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.5.tgz#66fa8b720e1438b364681f2ad1a63c618448c9d0"
dependencies:
Expand All @@ -5249,25 +5200,25 @@ readable-stream@1.1:
isarray "0.0.1"
string_decoder "~0.10.x"

"readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.0.1, readable-stream@^2.0.4, readable-stream@~2.0.0, readable-stream@~2.0.5:
version "2.0.6"
resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e"
readable-stream@~1.0.2:
version "1.0.34"
resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
dependencies:
core-util-is "~1.0.0"
inherits "~2.0.1"
isarray "~1.0.0"
process-nextick-args "~1.0.6"
isarray "0.0.1"
string_decoder "~0.10.x"
util-deprecate "~1.0.1"

readable-stream@~1.0.2:
version "1.0.34"
resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
readable-stream@~2.0.0, readable-stream@~2.0.5:
version "2.0.6"
resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e"
dependencies:
core-util-is "~1.0.0"
inherits "~2.0.1"
isarray "0.0.1"
isarray "~1.0.0"
process-nextick-args "~1.0.6"
string_decoder "~0.10.x"
util-deprecate "~1.0.1"

readdir-scoped-modules@^1.0.0:
version "1.0.2"
Expand Down Expand Up @@ -5584,11 +5535,11 @@ sass-graph@^2.1.1:
lodash "^4.0.0"
yargs "^4.7.1"

"semver@2 >=2.2.1 || 3.x || 4 || 5", "semver@^2.3.0 || 3.x || 4 || 5", semver@^5.1.0, semver@^5.1.1, semver@~5.3.0:
"semver@2 >=2.2.1 || 3.x || 4 || 5", "semver@2 || 3 || 4 || 5", "semver@2.x || 3.x || 4 || 5", "semver@^2.3.0 || 3.x || 4 || 5", semver@^5.1.0, semver@^5.1.1, semver@~5.3.0:
version "5.3.0"
resolved "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"

"semver@2 || 3 || 4 || 5", "semver@2.x || 3.x || 4 || 5", semver@^4.1.0, semver@^4.2.2, semver@^4.3.1:
semver@^4.1.0, semver@^4.2.2, semver@^4.3.1:
version "4.3.6"
resolved "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da"

Expand Down Expand Up @@ -5884,12 +5835,6 @@ stack-trace@0.0.x:
version "1.3.1"
resolved "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"

stdout-stream@^1.4.0:
version "1.4.0"
resolved "https://registry.yarnpkg.com/stdout-stream/-/stdout-stream-1.4.0.tgz#a2c7c8587e54d9427ea9edb3ac3f2cd522df378b"
dependencies:
readable-stream "^2.0.1"

string-template@~0.2.1:
version "0.2.1"
resolved "https://registry.npmjs.org/string-template/-/string-template-0.2.1.tgz#42932e598a352d01fc22ec3367d9d84eec6c9add"
Expand Down

0 comments on commit b35f113

Please sign in to comment.