From 2986af9bf8b56a5d298372f3314b5d13ae23e963 Mon Sep 17 00:00:00 2001 From: Eduardo Weiland Date: Fri, 1 Jul 2016 11:43:37 -0300 Subject: [PATCH] Add code snippets in dummy app Fixes #2 --- bower.json | 2 +- ember-cli-build.js | 3 ++- package.json | 2 ++ tests/dummy/app/controllers/editable.js | 10 +++++++- tests/dummy/app/controllers/index.js | 10 +++++++- tests/dummy/app/templates/editable.hbs | 18 ++++++++------ tests/dummy/app/templates/index.hbs | 20 +++++++++------- tests/dummy/snippets/editable-table.js | 31 +++++++++++++++++++++++++ tests/dummy/snippets/simple-table.js | 30 ++++++++++++++++++++++++ 9 files changed, 107 insertions(+), 19 deletions(-) create mode 100644 tests/dummy/snippets/editable-table.js create mode 100644 tests/dummy/snippets/simple-table.js diff --git a/bower.json b/bower.json index 7855851..891482a 100644 --- a/bower.json +++ b/bower.json @@ -2,7 +2,7 @@ "name": "ember-data-table-light", "dependencies": { "ember": "~2.6.0", - "ember-cli-shims": "0.1.1", + "ember-cli-shims": "~0.1.1", "ember-cli-test-loader": "0.2.2", "ember-qunit-notifications": "0.1.0", "es5-shim": "^4.5.8", diff --git a/ember-cli-build.js b/ember-cli-build.js index 1cada8d..c47abd4 100644 --- a/ember-cli-build.js +++ b/ember-cli-build.js @@ -4,7 +4,8 @@ var EmberAddon = require('ember-cli/lib/broccoli/ember-addon'); module.exports = function(defaults) { var app = new EmberAddon(defaults, { - // Add options here + snippetSearchPaths: ['addon', 'tests/dummy/app'], + snippetPaths: ['snippets', 'tests/dummy/snippets'] }); // app.import('bower_components/font-awesome/css/font-awesome.css'); diff --git a/package.json b/package.json index 4db23c2..6b97668 100644 --- a/package.json +++ b/package.json @@ -40,6 +40,8 @@ "ember-cli-sri": "^2.1.0", "ember-cli-uglify": "^1.2.0", "ember-cli-yuidoc": "0.8.3", + "ember-code-snippet": "1.3.0", + "ember-composable-helpers": "0.26.2", "ember-disable-prototype-extensions": "^1.1.0", "ember-export-application-global": "^1.0.5", "ember-load-initializers": "^0.5.1", diff --git a/tests/dummy/app/controllers/editable.js b/tests/dummy/app/controllers/editable.js index f858bd8..1bc385f 100644 --- a/tests/dummy/app/controllers/editable.js +++ b/tests/dummy/app/controllers/editable.js @@ -5,6 +5,8 @@ const { } = Ember; export default Controller.extend({ + collapseCodeSnippet: true, + activeTab: 0, columns: [ { label: 'First Name', @@ -31,5 +33,11 @@ export default Controller.extend({ label: 'Country', valuePath: 'country' } - ] + ], + + actions: { + setActiveTab(tab) { + this.set('activeTab', tab); + } + } }); diff --git a/tests/dummy/app/controllers/index.js b/tests/dummy/app/controllers/index.js index 3cb00ef..b1e76f7 100644 --- a/tests/dummy/app/controllers/index.js +++ b/tests/dummy/app/controllers/index.js @@ -6,6 +6,8 @@ const { } = Ember; export default Controller.extend({ + collapseCodeSnippet: true, + activeTab: 0, columns: [ CheckboxColumn, { @@ -30,5 +32,11 @@ export default Controller.extend({ label: 'Country', valuePath: 'country' } - ] + ], + + actions: { + setActiveTab(tab) { + this.set('activeTab', tab); + } + } }); diff --git a/tests/dummy/app/templates/editable.hbs b/tests/dummy/app/templates/editable.hbs index b7a1399..0a71b7e 100644 --- a/tests/dummy/app/templates/editable.hbs +++ b/tests/dummy/app/templates/editable.hbs @@ -1,22 +1,26 @@
-
+ {{#bs-collapse collapsed=collapseCodeSnippet id="code-snippet" class="panel-collapse" role="tabpanel" aria-labelledby="table-1"}}
-
{{!code-snippet name="editable-table.js"}}
-
{{!code-snippet name="editable-table.hbs"}}
+
{{code-snippet name="editable-table.js"}}
+
{{code-snippet name="editable-table.hbs"}}
-
+ {{/bs-collapse}}
{{!-- BEGIN-SNIPPET editable-table --}} {{data-table 'user' columns=columns height='50vh'}} diff --git a/tests/dummy/app/templates/index.hbs b/tests/dummy/app/templates/index.hbs index aa55938..3d0f77a 100644 --- a/tests/dummy/app/templates/index.hbs +++ b/tests/dummy/app/templates/index.hbs @@ -1,22 +1,26 @@ -
+
-
+ {{#bs-collapse collapsed=collapseCodeSnippet id="code-snippet" class="panel-collapse" role="tabpanel" aria-labelledby="table-1"}}
-
{{!code-snippet name="simple-table.js"}}
-
{{!code-snippet name="simple-table.hbs"}}
+
{{code-snippet name="simple-table.js"}}
+
{{code-snippet name="simple-table.hbs"}}
-
+ {{/bs-collapse}}
{{!-- BEGIN-SNIPPET simple-table --}} {{data-table 'user' columns=columns height='50vh'}} diff --git a/tests/dummy/snippets/editable-table.js b/tests/dummy/snippets/editable-table.js new file mode 100644 index 0000000..c32c6ff --- /dev/null +++ b/tests/dummy/snippets/editable-table.js @@ -0,0 +1,31 @@ +import Ember from 'ember'; + +export default Ember.Component.extend({ + columns: [ + { + label: 'First Name', + valuePath: 'firstName', + width: '150px', + cellType: 'editable' + }, + { + label: 'Last Name', + valuePath: 'lastName', + width: '150px', + cellType: 'editable' + }, + { + label: 'Address', + valuePath: 'address', + cellType: 'editable' + }, + { + label: 'State', + valuePath: 'state' + }, + { + label: 'Country', + valuePath: 'country' + } + ] +}); diff --git a/tests/dummy/snippets/simple-table.js b/tests/dummy/snippets/simple-table.js new file mode 100644 index 0000000..2ccfba5 --- /dev/null +++ b/tests/dummy/snippets/simple-table.js @@ -0,0 +1,30 @@ +import Ember from 'ember'; +import CheckboxColumn from 'ember-data-table-light/columns/checkbox'; + +export default Ember.Component.extend({ + columns: [ + CheckboxColumn, + { + label: 'First Name', + valuePath: 'firstName', + width: '150px' + }, + { + label: 'Last Name', + valuePath: 'lastName', + width: '150px' + }, + { + label: 'Address', + valuePath: 'address' + }, + { + label: 'State', + valuePath: 'state' + }, + { + label: 'Country', + valuePath: 'country' + } + ] +});