diff --git a/Brocfile.js b/Brocfile.js index 840a04a..97c6918 100644 --- a/Brocfile.js +++ b/Brocfile.js @@ -1,17 +1,16 @@ -var moduleFilter = require('broccoli-dist-es6-module'); -var templateFilter = require('broccoli-template-compiler'); +var mergeTrees = require('broccoli-merge-trees'), + moduleFilter = require('broccoli-dist-es6-module'), + templateFilter = require('ember-cli-htmlbars'); -module.exports = function(broccoli) { - var tree = broccoli.makeTree('lib'); - var templates = templateFilter(tree, {module: true}); - var modules = moduleFilter(templates, { - global: 'ic.tabs', - packageName: 'ic-tabs', - main: 'main', - shim: { - 'ember': 'Ember' - } - }); - return modules; -}; +var templates = templateFilter('lib'); +var dist = moduleFilter(templates, { + global: 'ic.tabs', + packageName: 'ic-tabs', + main: 'main', + shim: { + 'ember': 'Ember' + } + }); + +module.exports = mergeTrees([dist]); diff --git a/bower.json b/bower.json index 2d04ebf..1c6a0cc 100644 --- a/bower.json +++ b/bower.json @@ -20,12 +20,15 @@ ], "dependencies": { "ember": "^1.3.0", - "ic-styled": "~1.1.6" + "ic-styled": "^2.0.0" }, "devDependencies": { "ember-qunit": "^0.1.3", "jquery-simulate": "https://raw.github.com/jquery/jquery-simulate/master/jquery.simulate.js", "ember-canary": "http://builds.emberjs.com/canary/ember.js", - "ic-styled": "~1.1.6" + "ic-styled": "^2.0.0" + }, + "resolutions": { + "ember": ">= 1.8.1 < 2.0.0" } -} \ No newline at end of file +} diff --git a/dist/amd/tab-panel.js b/dist/amd/tab-panel.js index 6f8988a..3fd1b14 100644 --- a/dist/amd/tab-panel.js +++ b/dist/amd/tab-panel.js @@ -82,18 +82,6 @@ define( return this.get('tab.active'); }.property('tab.active'), - /** - * Shows or hides this panel depending on whether or not its active. - * - * @method toggleVisibility - * @private - */ - - toggleVisibility: function() { - var display = this.get('active') ? '' : 'none'; - this.$().css('display', display); - }.observes('active'), - /** * Registers with the TabsComponent. * diff --git a/dist/amd/tabs-css.js b/dist/amd/tabs-css.js index 3c31e39..3bf3a56 100644 --- a/dist/amd/tabs-css.js +++ b/dist/amd/tabs-css.js @@ -1,15 +1,8 @@ define( - ["ember","exports"], - function(__dependency1__, __exports__) { + ["exports"], + function(__exports__) { "use strict"; - var Ember = __dependency1__["default"] || __dependency1__; - __exports__["default"] = Ember.Handlebars.template(function anonymous(Handlebars,depth0,helpers,partials,data) { - this.compilerInfo = [4,'>= 1.0.0']; - helpers = this.merge(helpers, Ember.Handlebars.helpers); data = data || {}; - - - - data.buffer.push("ic-tabs,\nic-tab-list,\nic-tab-panel {\n display: block\n}\n\nic-tab-list {\n border-bottom: 1px solid #aaa;\n}\n\nic-tab {\n display: inline-block;\n padding: 6px 12px;\n border: 1px solid transparent;\n border-top-left-radius: 3px;\n border-top-right-radius: 3px;\n cursor: pointer;\n margin-bottom: -1px;\n position: relative;\n}\n\nic-tab[selected] {\n border-color: #aaa;\n border-bottom-color: #fff;\n}\n\nic-tab:focus {\n box-shadow: 0 10px 0 0 #fff,\n 0 0 5px hsl(208, 99%, 50%);\n border-color: hsl(208, 99%, 50%);\n border-bottom-color: #fff;\n outline: none;\n}\n\nic-tab:focus:before,\nic-tab:focus:after {\n content: '';\n position: absolute;\n bottom: -6px;\n width: 5px;\n height: 5px;\n background: #fff;\n}\n\nic-tab:focus:before {\n left: -4px;\n}\n\nic-tab:focus:after {\n right: -4px;\n}\n\n"); - - }); + __exports__["default"] = Ember.Handlebars.template({"compiler":[6,">= 2.0.0-beta.1"],"main":function(depth0,helpers,partials,data) { + data.buffer.push("ic-tabs,\nic-tab-list {\n display: block;\n}\n\nic-tab-panel {\n display: none;\n}\n\nic-tab-list {\n border-bottom: 1px solid #aaa;\n}\n\nic-tab {\n display: inline-block;\n padding: 6px 12px;\n border: 1px solid transparent;\n border-top-left-radius: 3px;\n border-top-right-radius: 3px;\n cursor: pointer;\n margin-bottom: -1px;\n position: relative;\n}\n\nic-tab[selected] {\n border-color: #aaa;\n border-bottom-color: #fff;\n}\n\nic-tab:focus {\n box-shadow: 0 10px 0 0 #fff,\n 0 0 5px hsl(208, 99%, 50%);\n border-color: hsl(208, 99%, 50%);\n border-bottom-color: #fff;\n outline: none;\n}\n\nic-tab:focus:before,\nic-tab:focus:after {\n content: '';\n position: absolute;\n bottom: -6px;\n width: 5px;\n height: 5px;\n background: #fff;\n}\n\nic-tab:focus:before {\n left: -4px;\n}\n\nic-tab:focus:after {\n right: -4px;\n}\n\nic-tab-panel.active {\n display: block;\n}\n\n"); + },"useData":true}); }); \ No newline at end of file diff --git a/dist/cjs/tab-panel.js b/dist/cjs/tab-panel.js index b855869..47e0cca 100644 --- a/dist/cjs/tab-panel.js +++ b/dist/cjs/tab-panel.js @@ -79,18 +79,6 @@ exports["default"] = Component.extend({ return this.get('tab.active'); }.property('tab.active'), - /** - * Shows or hides this panel depending on whether or not its active. - * - * @method toggleVisibility - * @private - */ - - toggleVisibility: function() { - var display = this.get('active') ? '' : 'none'; - this.$().css('display', display); - }.observes('active'), - /** * Registers with the TabsComponent. * diff --git a/dist/cjs/tabs-css.js b/dist/cjs/tabs-css.js index 82d3f83..0ed35b7 100644 --- a/dist/cjs/tabs-css.js +++ b/dist/cjs/tabs-css.js @@ -1,11 +1,4 @@ "use strict"; -var Ember = require("ember")["default"] || require("ember"); -exports["default"] = Ember.Handlebars.template(function anonymous(Handlebars,depth0,helpers,partials,data) { -this.compilerInfo = [4,'>= 1.0.0']; -helpers = this.merge(helpers, Ember.Handlebars.helpers); data = data || {}; - - - - data.buffer.push("ic-tabs,\nic-tab-list,\nic-tab-panel {\n display: block\n}\n\nic-tab-list {\n border-bottom: 1px solid #aaa;\n}\n\nic-tab {\n display: inline-block;\n padding: 6px 12px;\n border: 1px solid transparent;\n border-top-left-radius: 3px;\n border-top-right-radius: 3px;\n cursor: pointer;\n margin-bottom: -1px;\n position: relative;\n}\n\nic-tab[selected] {\n border-color: #aaa;\n border-bottom-color: #fff;\n}\n\nic-tab:focus {\n box-shadow: 0 10px 0 0 #fff,\n 0 0 5px hsl(208, 99%, 50%);\n border-color: hsl(208, 99%, 50%);\n border-bottom-color: #fff;\n outline: none;\n}\n\nic-tab:focus:before,\nic-tab:focus:after {\n content: '';\n position: absolute;\n bottom: -6px;\n width: 5px;\n height: 5px;\n background: #fff;\n}\n\nic-tab:focus:before {\n left: -4px;\n}\n\nic-tab:focus:after {\n right: -4px;\n}\n\n"); - -}); \ No newline at end of file +exports["default"] = Ember.Handlebars.template({"compiler":[6,">= 2.0.0-beta.1"],"main":function(depth0,helpers,partials,data) { + data.buffer.push("ic-tabs,\nic-tab-list {\n display: block;\n}\n\nic-tab-panel {\n display: none;\n}\n\nic-tab-list {\n border-bottom: 1px solid #aaa;\n}\n\nic-tab {\n display: inline-block;\n padding: 6px 12px;\n border: 1px solid transparent;\n border-top-left-radius: 3px;\n border-top-right-radius: 3px;\n cursor: pointer;\n margin-bottom: -1px;\n position: relative;\n}\n\nic-tab[selected] {\n border-color: #aaa;\n border-bottom-color: #fff;\n}\n\nic-tab:focus {\n box-shadow: 0 10px 0 0 #fff,\n 0 0 5px hsl(208, 99%, 50%);\n border-color: hsl(208, 99%, 50%);\n border-bottom-color: #fff;\n outline: none;\n}\n\nic-tab:focus:before,\nic-tab:focus:after {\n content: '';\n position: absolute;\n bottom: -6px;\n width: 5px;\n height: 5px;\n background: #fff;\n}\n\nic-tab:focus:before {\n left: -4px;\n}\n\nic-tab:focus:after {\n right: -4px;\n}\n\nic-tab-panel.active {\n display: block;\n}\n\n"); + },"useData":true}); \ No newline at end of file diff --git a/dist/globals/main.js b/dist/globals/main.js index 664e9dd..13cb619 100644 --- a/dist/globals/main.js +++ b/dist/globals/main.js @@ -269,18 +269,6 @@ exports["default"] = Component.extend({ return this.get('tab.active'); }.property('tab.active'), - /** - * Shows or hides this panel depending on whether or not its active. - * - * @method toggleVisibility - * @private - */ - - toggleVisibility: function() { - var display = this.get('active') ? '' : 'none'; - this.$().css('display', display); - }.observes('active'), - /** * Registers with the TabsComponent. * @@ -491,16 +479,9 @@ exports["default"] = Component.extend({ }); },{}],5:[function(_dereq_,module,exports){ "use strict"; -var Ember = window.Ember["default"] || window.Ember; -exports["default"] = Ember.Handlebars.template(function anonymous(Handlebars,depth0,helpers,partials,data) { -this.compilerInfo = [4,'>= 1.0.0']; -helpers = this.merge(helpers, Ember.Handlebars.helpers); data = data || {}; - - - - data.buffer.push("ic-tabs,\nic-tab-list,\nic-tab-panel {\n display: block\n}\n\nic-tab-list {\n border-bottom: 1px solid #aaa;\n}\n\nic-tab {\n display: inline-block;\n padding: 6px 12px;\n border: 1px solid transparent;\n border-top-left-radius: 3px;\n border-top-right-radius: 3px;\n cursor: pointer;\n margin-bottom: -1px;\n position: relative;\n}\n\nic-tab[selected] {\n border-color: #aaa;\n border-bottom-color: #fff;\n}\n\nic-tab:focus {\n box-shadow: 0 10px 0 0 #fff,\n 0 0 5px hsl(208, 99%, 50%);\n border-color: hsl(208, 99%, 50%);\n border-bottom-color: #fff;\n outline: none;\n}\n\nic-tab:focus:before,\nic-tab:focus:after {\n content: '';\n position: absolute;\n bottom: -6px;\n width: 5px;\n height: 5px;\n background: #fff;\n}\n\nic-tab:focus:before {\n left: -4px;\n}\n\nic-tab:focus:after {\n right: -4px;\n}\n\n"); - -}); +exports["default"] = Ember.Handlebars.template({"compiler":[6,">= 2.0.0-beta.1"],"main":function(depth0,helpers,partials,data) { + data.buffer.push("ic-tabs,\nic-tab-list {\n display: block;\n}\n\nic-tab-panel {\n display: none;\n}\n\nic-tab-list {\n border-bottom: 1px solid #aaa;\n}\n\nic-tab {\n display: inline-block;\n padding: 6px 12px;\n border: 1px solid transparent;\n border-top-left-radius: 3px;\n border-top-right-radius: 3px;\n cursor: pointer;\n margin-bottom: -1px;\n position: relative;\n}\n\nic-tab[selected] {\n border-color: #aaa;\n border-bottom-color: #fff;\n}\n\nic-tab:focus {\n box-shadow: 0 10px 0 0 #fff,\n 0 0 5px hsl(208, 99%, 50%);\n border-color: hsl(208, 99%, 50%);\n border-bottom-color: #fff;\n outline: none;\n}\n\nic-tab:focus:before,\nic-tab:focus:after {\n content: '';\n position: absolute;\n bottom: -6px;\n width: 5px;\n height: 5px;\n background: #fff;\n}\n\nic-tab:focus:before {\n left: -4px;\n}\n\nic-tab:focus:after {\n right: -4px;\n}\n\nic-tab-panel.active {\n display: block;\n}\n\n"); + },"useData":true}); },{}],6:[function(_dereq_,module,exports){ "use strict"; var Component = window.Ember.Component; diff --git a/dist/named-amd/main.js b/dist/named-amd/main.js index 180d77f..2bb0d5b 100644 --- a/dist/named-amd/main.js +++ b/dist/named-amd/main.js @@ -24,7 +24,8 @@ define("ic-tabs", __exports__.TabListComponent = TabListComponent; __exports__.TabPanelComponent = TabPanelComponent; __exports__.TabsComponent = TabsComponent; - });define("ic-tabs/tab-list", + }); +define("ic-tabs/tab-list", ["ember","exports"], function(__dependency1__, __exports__) { "use strict"; @@ -191,7 +192,8 @@ define("ic-tabs", } }); - });define("ic-tabs/tab-panel", + }); +define("ic-tabs/tab-panel", ["ember","exports"], function(__dependency1__, __exports__) { "use strict"; @@ -275,18 +277,6 @@ define("ic-tabs", return this.get('tab.active'); }.property('tab.active'), - /** - * Shows or hides this panel depending on whether or not its active. - * - * @method toggleVisibility - * @private - */ - - toggleVisibility: function() { - var display = this.get('active') ? '' : 'none'; - this.$().css('display', display); - }.observes('active'), - /** * Registers with the TabsComponent. * @@ -303,7 +293,8 @@ define("ic-tabs", }.on('willDestroyElement') }); - });define("ic-tabs/tab", + }); +define("ic-tabs/tab", ["ember","exports"], function(__dependency1__, __exports__) { "use strict"; @@ -497,21 +488,16 @@ define("ic-tabs", }); - });define("ic-tabs/tabs-css", - ["ember","exports"], - function(__dependency1__, __exports__) { + }); +define("ic-tabs/tabs-css", + ["exports"], + function(__exports__) { "use strict"; - var Ember = __dependency1__["default"] || __dependency1__; - __exports__["default"] = Ember.Handlebars.template(function anonymous(Handlebars,depth0,helpers,partials,data) { - this.compilerInfo = [4,'>= 1.0.0']; - helpers = this.merge(helpers, Ember.Handlebars.helpers); data = data || {}; - - - - data.buffer.push("ic-tabs,\nic-tab-list,\nic-tab-panel {\n display: block\n}\n\nic-tab-list {\n border-bottom: 1px solid #aaa;\n}\n\nic-tab {\n display: inline-block;\n padding: 6px 12px;\n border: 1px solid transparent;\n border-top-left-radius: 3px;\n border-top-right-radius: 3px;\n cursor: pointer;\n margin-bottom: -1px;\n position: relative;\n}\n\nic-tab[selected] {\n border-color: #aaa;\n border-bottom-color: #fff;\n}\n\nic-tab:focus {\n box-shadow: 0 10px 0 0 #fff,\n 0 0 5px hsl(208, 99%, 50%);\n border-color: hsl(208, 99%, 50%);\n border-bottom-color: #fff;\n outline: none;\n}\n\nic-tab:focus:before,\nic-tab:focus:after {\n content: '';\n position: absolute;\n bottom: -6px;\n width: 5px;\n height: 5px;\n background: #fff;\n}\n\nic-tab:focus:before {\n left: -4px;\n}\n\nic-tab:focus:after {\n right: -4px;\n}\n\n"); - - }); - });define("ic-tabs/tabs", + __exports__["default"] = Ember.Handlebars.template({"compiler":[6,">= 2.0.0-beta.1"],"main":function(depth0,helpers,partials,data) { + data.buffer.push("ic-tabs,\nic-tab-list {\n display: block;\n}\n\nic-tab-panel {\n display: none;\n}\n\nic-tab-list {\n border-bottom: 1px solid #aaa;\n}\n\nic-tab {\n display: inline-block;\n padding: 6px 12px;\n border: 1px solid transparent;\n border-top-left-radius: 3px;\n border-top-right-radius: 3px;\n cursor: pointer;\n margin-bottom: -1px;\n position: relative;\n}\n\nic-tab[selected] {\n border-color: #aaa;\n border-bottom-color: #fff;\n}\n\nic-tab:focus {\n box-shadow: 0 10px 0 0 #fff,\n 0 0 5px hsl(208, 99%, 50%);\n border-color: hsl(208, 99%, 50%);\n border-bottom-color: #fff;\n outline: none;\n}\n\nic-tab:focus:before,\nic-tab:focus:after {\n content: '';\n position: absolute;\n bottom: -6px;\n width: 5px;\n height: 5px;\n background: #fff;\n}\n\nic-tab:focus:before {\n left: -4px;\n}\n\nic-tab:focus:after {\n right: -4px;\n}\n\nic-tab-panel.active {\n display: block;\n}\n\n"); + },"useData":true}); + }); +define("ic-tabs/tabs", ["ember","exports"], function(__dependency1__, __exports__) { "use strict"; diff --git a/examples/basic.html b/examples/basic.html index cb36867..32e693b 100644 --- a/examples/basic.html +++ b/examples/basic.html @@ -105,7 +105,7 @@

Toast

- + diff --git a/examples/dynamic.html b/examples/dynamic.html index 4fbe853..f985558 100644 --- a/examples/dynamic.html +++ b/examples/dynamic.html @@ -14,18 +14,18 @@ {{#ic-tabs selected-index=selectedTabIndex}} {{#ic-tab-list}} - {{#each tabs}} + {{#each tab in tabs}} {{#ic-tab}} - {{name}} - + {{tab.name}} + {{/ic-tab}} {{/each}} {{/ic-tab-list}} - {{#each tabs}} + {{#each tab in tabs}} {{#ic-tab-panel}} -

{{description}}

+

{{tab.description}}

{{/ic-tab-panel}} {{/each}} {{/ic-tabs}} @@ -48,7 +48,7 @@ - + diff --git a/examples/query-params.html b/examples/query-params.html index 3efc0c2..54ef754 100644 --- a/examples/query-params.html +++ b/examples/query-params.html @@ -108,7 +108,7 @@

Toast

- + diff --git a/karma.conf.js b/karma.conf.js index e39ac22..97126e5 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -4,7 +4,7 @@ module.exports = function(config) { frameworks: ['qunit'], files: [ - 'bower_components/jquery/jquery.js', + 'bower_components/jquery/dist/jquery.js', 'bower_components/handlebars/handlebars.js', 'bower_components/ember/ember.js', 'bower_components/jquery-simulate/index.js', diff --git a/lib/tab-panel.js b/lib/tab-panel.js index 3c167b5..ab78725 100644 --- a/lib/tab-panel.js +++ b/lib/tab-panel.js @@ -77,18 +77,6 @@ export default Component.extend({ return this.get('tab.active'); }.property('tab.active'), - /** - * Shows or hides this panel depending on whether or not its active. - * - * @method toggleVisibility - * @private - */ - - toggleVisibility: function() { - var display = this.get('active') ? '' : 'none'; - this.$().css('display', display); - }.observes('active'), - /** * Registers with the TabsComponent. * diff --git a/lib/tabs-css.hbs b/lib/tabs-css.hbs index da43aad..9e85ecc 100644 --- a/lib/tabs-css.hbs +++ b/lib/tabs-css.hbs @@ -1,7 +1,10 @@ ic-tabs, -ic-tab-list, +ic-tab-list { + display: block; +} + ic-tab-panel { - display: block + display: none; } ic-tab-list { @@ -50,3 +53,7 @@ ic-tab:focus:after { right: -4px; } +ic-tab-panel.active { + display: block; +} + diff --git a/package.json b/package.json index 24a83e1..a9e88c1 100644 --- a/package.json +++ b/package.json @@ -10,20 +10,21 @@ "license": "MIT", "devDependencies": { "bower": "^1.2.8", - "broccoli": "^0.2.0", - "qunitjs": "~1.12.0", - "karma-qunit": "^0.1.1", - "karma-script-launcher": "^0.1.0", + "broccoli": "^0.13.3", + "broccoli-cli": "0.0.1", + "broccoli-dist-es6-module": "^0.2.1", + "broccoli-merge-trees": "^0.2.1", + "ember-cli-htmlbars": "^0.6.0", + "karma": "^0.10.9", "karma-chrome-launcher": "^0.1.2", "karma-firefox-launcher": "^0.1.3", "karma-html2js-preprocessor": "^0.1.0", - "karma": "^0.10.9", - "broccoli-dist-es6-module": "^0.1.8", - "broccoli-cli": "0.0.1", - "broccoli-template-compiler": "^1.4.1", + "karma-qunit": "^0.1.1", + "karma-script-launcher": "^0.1.0", + "qunitjs": "~1.14.0", "rf-release": "^0.1.2" }, "dependencies": { "ic-styled": "^1.1.6" } -} \ No newline at end of file +} diff --git a/test/support/setup.js b/test/support/setup.js index 9f2ec42..0d1f6bd 100644 --- a/test/support/setup.js +++ b/test/support/setup.js @@ -1,3 +1,6 @@ +document.write('
'); +document.write(''); + emq.globalize(); setResolver(Ember.DefaultResolver.extend({ diff --git a/testem.json b/testem.json index f1dbbbf..f28dd7e 100644 --- a/testem.json +++ b/testem.json @@ -1,7 +1,7 @@ { "framework": "qunit", "src_files": [ - "bower_components/jquery/jquery.js", + "bower_components/jquery/dist/jquery.js", "bower_components/handlebars/handlebars.js", "bower_components/ember/ember.js", "bower_components/jquery-simulate/index.js",