Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Correct noink property to no-ink to actually conform to established property name conventions #69

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Correct noink property to no-ink to actually conform to established property name conventions #69

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
755b577
Update noink to noInk to be consistent w/ existing prop semantics
lozandier May 25, 2016
81e5815
Better fit best practices of having doctype being DOCTYPE
lozandier May 31, 2016
650e63d
Correct typo in deprecation message for noink
lozandier May 31, 2016
378d1d3
Fix method name typo
lozandier May 31, 2016
3fd542c
Provide more useful deprecation message
lozandier May 31, 2016
48f42a6
Make more clear that next major version of this component will remove…
lozandier May 31, 2016
a89a359
Revert version to be manually changed later by core contributors of p…
lozandier Jun 2, 2016
7690075
Revert DOCTYPE to their original style established by core contributo…
lozandier Jun 2, 2016
5f6bbfa
Clarify the intent of `noink` being an alias until the next major ver…
lozandier Jun 3, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "paper-behaviors",
"version": "1.0.11",
"version": "1.0.12",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Side note: we prefer to do this as a separate commit

Copy link
Author

@lozandier lozandier Jun 2, 2016 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Understood, this is reverted.

"description": "Common behaviors across the paper elements",
"authors": [
"The Polymer Authors"
Expand Down
2 changes: 1 addition & 1 deletion demo/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!doctype html>
<!DOCTYPE html>
<!--
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why the change?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Admittedly stylistic since it's valid either way but caught my vim editor off-guard (opinionated or outdated check by original author being the traditional way it's declared before HTML5). I'll revert this as well.

@license
Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
Expand Down
2 changes: 1 addition & 1 deletion index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!doctype html>
<!DOCTYPE html>
<!--
@license
Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
Expand Down
22 changes: 18 additions & 4 deletions paper-ripple-behavior.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,15 @@
* If true, the element will not produce a ripple effect when interacted
* with via the pointer.
*/
noInk: {
type: Boolean,
observer: '_noInkChanged'
},

/**
* This property is a temporary alias to noInk until version 1.1
*
*/
noink: {
type: Boolean,
observer: '_noinkChanged'
Expand Down Expand Up @@ -70,7 +79,7 @@
ensureRipple: function(optTriggeringEvent) {
if (!this.hasRipple()) {
this._ripple = this._createRipple();
this._ripple.noink = this.noink;
this._ripple.noInk = this.noInk;
var rippleContainer = this._rippleContainer || this.root;
if (rippleContainer) {
Polymer.dom(rippleContainer).appendChild(this._ripple);
Expand Down Expand Up @@ -117,10 +126,15 @@
document.createElement('paper-ripple'));
},

_noinkChanged: function(noink) {
_noInkChanged: function(noInk) {
if (this.hasRipple()) {
this._ripple.noink = noink;
this._ripple.noInk = noInk;
}
}
},

_noinkChanged: function(noInk) {
console.warn("This field will be deprecated with the next major version of this component, use no-ink instead");
this.noInk = noInk;
},
};
</script>