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

read data-* attributes #241

Merged
merged 1 commit into from
Apr 29, 2013
Merged

read data-* attributes #241

merged 1 commit into from
Apr 29, 2013

Conversation

d42f
Copy link
Contributor

@d42f d42f commented Apr 14, 2013

read data-* attributes

read data-* attributes
@@ -350,7 +350,7 @@
});
},
shallowExtend: function (options) {
var settings = $.extend({}, $.fn.wysihtml5.defaultOptions, options || {});
var settings = $.extend({}, $.fn.wysihtml5.defaultOptions, options || {}, $(this).data());

Choose a reason for hiding this comment

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

👍

jhollingworth added a commit that referenced this pull request Apr 29, 2013
@jhollingworth jhollingworth merged commit 2bacaad into jhollingworth:master Apr 29, 2013
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants