diff --git a/.gitignore b/.gitignore index 99f211d..b13058c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -/node_modules/ +bower_components .DS_Store diff --git a/README.md b/README.md index 9b7632a..1f2f627 100755 --- a/README.md +++ b/README.md @@ -1,4 +1,2 @@ -core-selector +iron-selector ============= - -See the [component page](http://polymer-project.org/docs/elements/core-elements.html#core-selector) for more information. diff --git a/bower.json b/bower.json index be8e240..6942811 100755 --- a/bower.json +++ b/bower.json @@ -1,19 +1,21 @@ { - "name": "core-selector", + "name": "iron-selector", "version": "0.8.0", "private": true, - "main": "core-selector.html", - "authors": [ - "Frankie Fu ", - "The Polymer Authors" + "main": [ + "iron-selector.html" ], - "repository": "https://github.com/Polymer/core-selector/tree/0.8-preview", + "authors": "The Polymer Authors", + "repository": { + "type": "git", + "url": "git://github.com/PolymerElements/iron-selector.git" + }, "dependencies": { - "polymer": "Polymer/polymer#0.8-preview" + "polymer": "Polymer/polymer#v0.8.0-rc.4" }, "devDependencies": { - "webcomponentsjs": "webcomponents/webcomponentsjs", - "web-component-tester": "*", - "test-fixture": "Polymer/test-fixture#master" + "test-fixture": "PolymerElements/test-fixture#^0.8.0", + "web-component-tester": "Polymer/web-component-tester#^2.2.3", + "webcomponentsjs": "webcomponents/webcomponentsjs#^0.6.0" } } diff --git a/demo/index.html b/demo/index.html index 09b9b3e..f8fb0a4 100644 --- a/demo/index.html +++ b/demo/index.html @@ -11,21 +11,21 @@ - core-selector + iron-selector - + ... - +
Item 1
Item 2
Item 3
- + @group Polymer Core Elements -@element core-selector +@element iron-selector @homepage github.io --> - + @@ -19,10 +19,10 @@ - + @@ -32,13 +32,13 @@ @@ -60,11 +60,11 @@ assert.equal(s.selected, '1'); }); - test('activates on click and fires core-activate', function(done) { + test('activates on click and fires iron-activate', function(done) { assert.equal(s.selected, '0'); - // attach core-activate listener - s.addEventListener("core-activate", function(event) { + // attach iron-activate listener + s.addEventListener("iron-activate", function(event) { assert.equal(event.detail.selected, '1'); assert.equal(event.detail.item, s.children[1]); done(); @@ -74,11 +74,11 @@ s.children[1].dispatchEvent(new CustomEvent('click', {bubbles: true})); }); - test('click on already selected and fires core-activate', function(done) { + test('click on already selected and fires iron-activate', function(done) { assert.equal(s.selected, '0'); - // attach core-activate listener - s.addEventListener("core-activate", function(event) { + // attach iron-activate listener + s.addEventListener("iron-activate", function(event) { assert.equal(event.detail.selected, '0'); assert.equal(event.detail.item, s.children[0]); done(); @@ -96,9 +96,9 @@ assert.equal(s.selected, '2'); }); - test('activates on mousedown and fires core-activate', function(done) { - // attach core-activate listener - s.addEventListener("core-activate", function(event) { + test('activates on mousedown and fires iron-activate', function(done) { + // attach iron-activate listener + s.addEventListener("iron-activate", function(event) { assert.equal(event.detail.selected, '2'); assert.equal(event.detail.item, s.children[2]); done(); @@ -120,13 +120,13 @@ }); test('activates on click and preventDefault', function() { - // attach core-activate listener - s.addEventListener("core-activate", function(event) { + // attach iron-activate listener + s.addEventListener("iron-activate", function(event) { event.preventDefault(); }); // select Item 2 s.children[2].dispatchEvent(new CustomEvent('click', {bubbles: true})); - // shouldn't got selected since we preventDefault in core-activate + // shouldn't got selected since we preventDefault in iron-activate assert.equal(s.selected, '0'); }); diff --git a/test/basic.html b/test/basic.html index 6e2f7f9..117075e 100644 --- a/test/basic.html +++ b/test/basic.html @@ -11,7 +11,7 @@ - core-selector-basic + iron-selector-basic @@ -20,10 +20,10 @@ - + @@ -65,14 +65,14 @@ test('attribute selected', function() { // check selected class - assert.isTrue(s1.querySelector('#item0').classList.contains('core-selected')); + assert.isTrue(s1.querySelector('#item0').classList.contains('iron-selected')); }); test('set selected', function() { // set selected s1.selected = 'item1'; // check selected class - assert.isTrue(s1.querySelector('#item1').classList.contains('core-selected')); + assert.isTrue(s1.querySelector('#item1').classList.contains('iron-selected')); }); test('get items', function() { @@ -83,7 +83,7 @@ var item = s1.querySelector('#item2'); item.dispatchEvent(new CustomEvent('click', {bubbles: true})); // check selected class - assert.isTrue(item.classList.contains('core-selected')); + assert.isTrue(item.classList.contains('iron-selected')); }); test('add item dynamically', function() { @@ -97,7 +97,7 @@ // check items length assert.equal(s1.$.selector.items.length, 5); // check selected class - assert.isTrue(s1.querySelector('#item4').classList.contains('core-selected')); + assert.isTrue(s1.querySelector('#item4').classList.contains('iron-selected')); }); }); @@ -106,14 +106,14 @@ test('attribute selected', function() { // check selected class - assert.isTrue(s2.querySelector('#item0').classList.contains('core-selected')); + assert.isTrue(s2.querySelector('#item0').classList.contains('iron-selected')); }); test('set selected', function() { // set selected s2.selected = 'item1'; // check selected class - assert.isTrue(s2.querySelector('#item1').classList.contains('core-selected')); + assert.isTrue(s2.querySelector('#item1').classList.contains('iron-selected')); }); test('get items', function() { @@ -124,7 +124,7 @@ var item = s2.querySelector('#item2'); item.dispatchEvent(new CustomEvent('click', {bubbles: true})); // check selected class - assert.isTrue(item.classList.contains('core-selected')); + assert.isTrue(item.classList.contains('iron-selected')); }); test('add item dynamically', function() { @@ -138,7 +138,7 @@ // check items length assert.equal(s2.$.selector.items.length, 5); // check selected class - assert.isTrue(s2.querySelector('#item4').classList.contains('core-selected')); + assert.isTrue(s2.querySelector('#item4').classList.contains('iron-selected')); }); }); @@ -151,11 +151,11 @@ // check selected assert.equal(s3.selected, 'item0'); // check selected class - assert.isTrue(s3.querySelector('#item0').classList.contains('core-selected')); + assert.isTrue(s3.querySelector('#item0').classList.contains('iron-selected')); // set selected s3.selected = 'item2'; // check selected class - assert.isTrue(s3.querySelector('#item2').classList.contains('core-selected')); + assert.isTrue(s3.querySelector('#item2').classList.contains('iron-selected')); done(); }); }); diff --git a/test/multi.html b/test/multi.html index 7dddcf8..73fb682 100644 --- a/test/multi.html +++ b/test/multi.html @@ -11,7 +11,7 @@ - core-selector-multi + iron-selector-multi @@ -20,10 +20,10 @@ - + @@ -33,13 +33,13 @@ @@ -59,7 +59,7 @@ test('has sane defaults', function() { assert.equal(s.selected, undefined); - assert.equal(s.selectedClass, 'core-selected'); + assert.equal(s.selectedClass, 'iron-selected'); assert.equal(s.items.length, 5); }); @@ -67,8 +67,8 @@ // set selected s.selected = [0, 2]; // check selected class - assert.isTrue(s.children[0].classList.contains('core-selected')); - assert.isTrue(s.children[2].classList.contains('core-selected')); + assert.isTrue(s.children[0].classList.contains('iron-selected')); + assert.isTrue(s.children[2].classList.contains('iron-selected')); // check selectedItem assert.equal(s.selectedItem.length, 2); assert.equal(s.selectedItem[0], s.children[0]); @@ -80,23 +80,23 @@ s.children[0].dispatchEvent(new CustomEvent('click', {bubbles: true})); s.children[2].dispatchEvent(new CustomEvent('click', {bubbles: true})); // check selected class - assert.isTrue(s.children[0].classList.contains('core-selected')); - assert.isTrue(s.children[2].classList.contains('core-selected')); + assert.isTrue(s.children[0].classList.contains('iron-selected')); + assert.isTrue(s.children[2].classList.contains('iron-selected')); // check selectedItem assert.equal(s.selectedItem.length, 2); assert.equal(s.selectedItem[0], s.children[0]); assert.equal(s.selectedItem[1], s.children[2]); }); - test('fire core-select/deselect events', function() { - // setup listener for core-select event + test('fire iron-select/deselect events', function() { + // setup listener for iron-select event var selectEventCounter = 0; - s.addEventListener('core-select', function(e) { + s.addEventListener('iron-select', function(e) { selectEventCounter++; }); // setup listener for core-deselect event var deselectEventCounter = 0; - s.addEventListener('core-deselect', function(e) { + s.addEventListener('iron-deselect', function(e) { deselectEventCounter++; }); // tap to select an item @@ -109,7 +109,7 @@ // check selected assert.equal(s.selected.length, 0); // check class - assert.isFalse(s.children[0].classList.contains('core-selected')); + assert.isFalse(s.children[0].classList.contains('iron-selected')); // check events assert.equal(selectEventCounter, 1); assert.equal(deselectEventCounter, 1); diff --git a/test/next-previous.html b/test/next-previous.html index 5edd796..3a830c2 100644 --- a/test/next-previous.html +++ b/test/next-previous.html @@ -11,7 +11,7 @@ - core-selector-next-previous + iron-selector-next-previous @@ -20,10 +20,10 @@ - + @@ -33,21 +33,21 @@ diff --git a/test/selected-attribute.html b/test/selected-attribute.html index 4f4f97c..3e1ecaf 100644 --- a/test/selected-attribute.html +++ b/test/selected-attribute.html @@ -11,7 +11,7 @@ - core-selector-selected-attribute + iron-selector-selected-attribute @@ -20,10 +20,10 @@ - + @@ -33,13 +33,13 @@ diff --git a/test/template-repeat.html b/test/template-repeat.html index 7b4a606..34b9171 100644 --- a/test/template-repeat.html +++ b/test/template-repeat.html @@ -11,7 +11,7 @@ - core-selector-template-repeat + iron-selector-template-repeat @@ -20,10 +20,10 @@ - + @@ -33,11 +33,11 @@ @@ -63,7 +63,7 @@ var item = s.selectedItem; assert.equal(s.items[1], item); // check selected class - assert.isTrue(item.classList.contains('core-selected')); + assert.isTrue(item.classList.contains('iron-selected')); done(); }); }); @@ -83,7 +83,7 @@ // check selected (should still honor the selected) assert.equal(s.selected, 1); // check selected class - assert.isTrue(s.querySelector('#bar').classList.contains('core-selected')); + assert.isTrue(s.querySelector('#bar').classList.contains('iron-selected')); done(); }); }); @@ -98,7 +98,7 @@ var item = s.selectedItem; assert.equal(s.items[3], item); // check selected class - assert.isTrue(item.classList.contains('core-selected')); + assert.isTrue(item.classList.contains('iron-selected')); done(); }); });