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.

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

Fix how some styles are documented. #930

Merged
merged 1 commit into from
Oct 8, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 0 deletions src/contourFeature.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ var meshFeature = require('./meshFeature');
* This defaults to the `z` property of the data elements. If the value of
* a grid point is `null` or `undefined`, the point and elements that use
* that point won't be included in the results.
* @property {number|function} [opacity=1] The opacity for the whole feature on
* a scale of 0 to 1.
*/

/**
Expand Down
4 changes: 1 addition & 3 deletions src/feature.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,6 @@ var geo_event = require('./event');
* Style specification for a feature.
*
* @typedef {object} geo.feature.styleSpec
* @property {number|function} [opacity=1] The opacity for the whole feature on
* a scale of 0 to 1.
*/

/**
Expand Down Expand Up @@ -837,7 +835,7 @@ var feature = function (arg) {
}
m_style = $.extend(
{},
{'opacity': 1.0},
{opacity: 1.0},
arg.style === undefined ? {} : arg.style);
m_this._bindMouseHandlers();
m_ready = true;
Expand Down
4 changes: 2 additions & 2 deletions src/isolineFeature.js
Original file line number Diff line number Diff line change
Expand Up @@ -510,8 +510,8 @@ var isolineFeature = function (arg) {
};

/**
* When the feature is marked as modified, mark our sub-feature as
* modified, too.
* Update the timestamp to the next global timestamp value. Mark
* sub-features as modified, too.
*
* @returns {object} The results of the superclass modified function.
*/
Expand Down
4 changes: 2 additions & 2 deletions src/polygonFeature.js
Original file line number Diff line number Diff line change
Expand Up @@ -401,8 +401,8 @@ var polygonFeature = function (arg) {
};

/**
* When the feature is marked as modified, mark our sub-feature as
* modified, too.
* Update the timestamp to the next global timestamp value. Mark
* sub-features as modified, too.
*
* @returns {object} The results of the superclass modified function.
*/
Expand Down