-
Notifications
You must be signed in to change notification settings - Fork 610
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
[MAJOR] expose defaults
and original Template rendering functions
#708
Merged
jshjohnson
merged 5 commits into
Choices-js:master
from
tinovyatkin:expose-default-templates
Oct 29, 2019
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
c01a54b
expose original Template rendering functions
tinovyatkin 4ba4ea3
add to types
tinovyatkin 59df8c1
Merge branch 'master' into expose-default-templates
tinovyatkin 9fb72e6
add moduleResolution
tinovyatkin 578eb44
use `defaults`
tinovyatkin File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -39,11 +39,28 @@ import { | |
diff, | ||
} from './lib/utils'; | ||
|
||
const USER_DEFAULTS = /** @type {Partial<import('../../types/index').Choices.Options>} */ ({}); | ||
|
||
/** | ||
* Choices | ||
* @author Josh Johnson<[email protected]> | ||
*/ | ||
class Choices { | ||
/* ======================================== | ||
= Static properties = | ||
======================================== */ | ||
|
||
static get defaults() { | ||
return Object.preventExtensions({ | ||
get options() { | ||
return USER_DEFAULTS; | ||
}, | ||
get templates() { | ||
return TEMPLATES; | ||
}, | ||
}); | ||
} | ||
|
||
constructor(element = '[data-choice]', userConfig = {}) { | ||
if (isType('String', element)) { | ||
const elements = Array.from(document.querySelectorAll(element)); | ||
|
@@ -56,7 +73,7 @@ class Choices { | |
} | ||
|
||
this.config = merge.all( | ||
[DEFAULT_CONFIG, Choices.userDefaults, userConfig], | ||
[DEFAULT_CONFIG, Choices.defaults.options, userConfig], | ||
// When merging array configs, replace with a copy of the userConfig array, | ||
// instead of concatenating with the default array | ||
{ arrayMerge: (destinationArray, sourceArray) => [...sourceArray] }, | ||
|
@@ -2092,6 +2109,4 @@ class Choices { | |
/* ===== End of Private functions ====== */ | ||
} | ||
|
||
Choices.userDefaults = {}; | ||
|
||
export default Choices; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👌