From 73c9b5cff297564eeb09c08cfb380dac500d705f Mon Sep 17 00:00:00 2001 From: Kevin Ross Date: Mon, 28 Mar 2016 15:18:19 -0500 Subject: [PATCH] #886 - more prefix renaming - I'm not sure how I missed these --- docs/assets/js/src/index.js | 2 +- docs/assets/scss/bmd/_clipboard-js.scss | 2 +- docs/getting-started/customization.md | 2 +- docs/material-design/drawers.md | 4 +- js/src/autofill.js | 4 +- js/src/base.js | 8 +- js/src/baseInput.js | 32 ++++---- js/src/baseSelection.js | 4 +- js/src/bootstrapMaterialDesign.js | 6 +- js/src/checkbox.js | 4 +- js/src/checkboxInline.js | 6 +- js/src/collapseInline.js | 10 +-- js/src/drawer.js | 4 +- js/src/file.js | 10 +-- js/src/radio.js | 4 +- js/src/radioInline.js | 6 +- js/src/ripples.js | 4 +- js/src/select.js | 4 +- js/src/switch.js | 4 +- js/src/text.js | 4 +- js/src/textarea.js | 4 +- scss/_buttons.scss | 62 ++++++++-------- scss/_cards.scss | 4 +- scss/_checkboxes.scss | 30 ++++---- scss/_drawer.scss | 14 ++-- scss/_dropdown.scss | 26 +++---- scss/_forms.scss | 22 +++--- scss/_nav.scss | 22 +++--- scss/_navbar.scss | 2 +- scss/_popover.scss | 6 +- scss/_radios.scss | 22 +++--- scss/_reboot.scss | 2 +- scss/_switches.scss | 34 ++++----- scss/_variables.scss | 98 ++++++++++++------------- scss/mixins/_animations.scss | 8 +- scss/mixins/_buttons.scss | 22 +++--- scss/mixins/_forms.scss | 22 +++--- scss/mixins/_variations.scss | 26 +++---- scss/plugins/_plugin-snackbarjs.scss | 4 +- scss/variables/_colors-map.scss | 4 +- scss/variables/_drawer.scss | 4 +- scss/variables/_menu.scss | 24 +++--- scss/variables/_shadow.scss | 50 ++++++------- scss/variables/bootstrap/_buttons.scss | 38 +++++----- scss/variables/bootstrap/_dropdown.scss | 2 +- scss/variables/bootstrap/_forms.scss | 2 +- scss/variables/bootstrap/_modals.scss | 2 +- scss/variables/bootstrap/_nav.scss | 46 ++++++------ scss/variables/bootstrap/_state.scss | 8 +- 49 files changed, 367 insertions(+), 367 deletions(-) diff --git a/docs/assets/js/src/index.js b/docs/assets/js/src/index.js index 275f0c3b..c14f4fc3 100644 --- a/docs/assets/js/src/index.js +++ b/docs/assets/js/src/index.js @@ -121,7 +121,7 @@ class Application { $(() => { let app = new Application() app.displayTypographyProperties() - $('.btn-clipboard').mdbRipples() + $('.btn-clipboard').bmdRipples() // FIXME: file inputs seems to be in flux, delete the offending one for now. $('#exampleInputFile').closest('.form-group').detach() diff --git a/docs/assets/scss/bmd/_clipboard-js.scss b/docs/assets/scss/bmd/_clipboard-js.scss index 145cdb60..c9ad2884 100644 --- a/docs/assets/scss/bmd/_clipboard-js.scss +++ b/docs/assets/scss/bmd/_clipboard-js.scss @@ -5,6 +5,6 @@ &:hover { color: $gray; // #fff; - background-color: $mdb-btn-focus-bg; // #027de7; + background-color: $bmd-btn-focus-bg; // #027de7; } } diff --git a/docs/getting-started/customization.md b/docs/getting-started/customization.md index 35ebba1f..f271f5dd 100644 --- a/docs/getting-started/customization.md +++ b/docs/getting-started/customization.md @@ -27,7 +27,7 @@ Installing via `npm` (recommended) or `bower`, customizing BMD is a breeze. ~~~~~~~~ $brand-primary: #3f51b5; // bootstrap variable -$mdb-label-color-focus: #303f9f; // mdb variable +$bmd-label-color-focus: #303f9f; // bmd variable @import "bootstrap-material-design/scss/core"; // make sure to use _core.scss! ~~~~~~~~ diff --git a/docs/material-design/drawers.md b/docs/material-design/drawers.md index 3be734c8..207dea47 100644 --- a/docs/material-design/drawers.md +++ b/docs/material-design/drawers.md @@ -302,8 +302,8 @@ The following positioning marker classes should be placed on the `bmd-layout-con Globally, you may alter the size of _x_ vs _y_ drawers with the following variables: -- `$mdb-drawer-x-size` -- `$mdb-drawer-y-size` +- `$bmd-drawer-x-size` +- `$bmd-drawer-y-size` ### Custom responsive drawer diff --git a/js/src/autofill.js b/js/src/autofill.js index 76d49e9b..2ada9ec6 100644 --- a/js/src/autofill.js +++ b/js/src/autofill.js @@ -8,8 +8,8 @@ const Autofill = (($) => { * ------------------------------------------------------------------------ */ const NAME = 'autofill' - const DATA_KEY = `mdb.${NAME}` - const JQUERY_NAME = `mdb${NAME.charAt(0).toUpperCase() + NAME.slice(1)}` + const DATA_KEY = `bmd.${NAME}` + const JQUERY_NAME = `bmd${NAME.charAt(0).toUpperCase() + NAME.slice(1)}` const JQUERY_NO_CONFLICT = $.fn[JQUERY_NAME] const Default = {} diff --git a/js/src/base.js b/js/src/base.js index 8bc9774c..31459dac 100644 --- a/js/src/base.js +++ b/js/src/base.js @@ -48,20 +48,20 @@ const Base = (($) => { addFormGroupFocus() { if (!this.$element.prop('disabled')) { - this.$mdbFormGroup.addClass(ClassName.IS_FOCUSED) + this.$bmdFormGroup.addClass(ClassName.IS_FOCUSED) } } removeFormGroupFocus() { - this.$mdbFormGroup.removeClass(ClassName.IS_FOCUSED) + this.$bmdFormGroup.removeClass(ClassName.IS_FOCUSED) } removeIsFilled() { - this.$mdbFormGroup.removeClass(ClassName.IS_FILLED) + this.$bmdFormGroup.removeClass(ClassName.IS_FILLED) } addIsFilled() { - this.$mdbFormGroup.addClass(ClassName.IS_FILLED) + this.$bmdFormGroup.addClass(ClassName.IS_FILLED) } // Find bmd-form-group diff --git a/js/src/baseInput.js b/js/src/baseInput.js index 56b8e7b8..da42a833 100644 --- a/js/src/baseInput.js +++ b/js/src/baseInput.js @@ -26,7 +26,7 @@ const BaseInput = (($) => { formGroup: { required: false }, - mdbFormGroup: { + bmdFormGroup: { template: ``, create: true, // create a wrapper if form-group not found required: true // not recommended to turn this off, only used for inline components @@ -36,9 +36,9 @@ const BaseInput = (($) => { // Prioritized find order for resolving the label to be used as an bmd-label if not specified in the markup // - a function(thisComponent); or - // - a string selector used like $mdbFormGroup.find(selector) + // - a string selector used like $bmdFormGroup.find(selector) // - // Note this only runs if $mdbFormGroup.find(Selector.BMD_LABEL_WILDCARD) fails to find a label (as authored in the markup) + // Note this only runs if $bmdFormGroup.find(Selector.BMD_LABEL_WILDCARD) fails to find a label (as authored in the markup) // selectors: [ `.form-control-label`, // in the case of horizontal or inline forms, this will be marked @@ -88,10 +88,10 @@ const BaseInput = (($) => { // Will add bmd-form-group to form-group or create an bmd-form-group // Performance Note: for those forms that are really performance driven, create the markup with the .bmd-form-group to avoid // rendering changes once added. - this.$mdbFormGroup = this.resolveMdbFormGroup() + this.$bmdFormGroup = this.resolveMdbFormGroup() - // Resolve and mark the mdbLabel if necessary as defined by the config - this.$mdbLabel = this.resolveMdbLabel() + // Resolve and mark the bmdLabel if necessary as defined by the config + this.$bmdLabel = this.resolveMdbLabel() // Signal to the bmd-form-group that a form-control-* variation is being used this.resolveMdbFormGroupSizing() @@ -102,7 +102,7 @@ const BaseInput = (($) => { dispose(dataKey) { super.dispose(dataKey) - this.$mdbFormGroup = null + this.$bmdFormGroup = null this.$formGroup = null } @@ -158,11 +158,11 @@ const BaseInput = (($) => { } addHasDanger() { - this.$mdbFormGroup.addClass(ClassName.HAS_DANGER) + this.$bmdFormGroup.addClass(ClassName.HAS_DANGER) } removeHasDanger() { - this.$mdbFormGroup.removeClass(ClassName.HAS_DANGER) + this.$bmdFormGroup.removeClass(ClassName.HAS_DANGER) } isEmpty() { @@ -173,20 +173,20 @@ const BaseInput = (($) => { resolveMdbFormGroup() { let mfg = this.findMdbFormGroup(false) if (mfg === undefined || mfg.length === 0) { - if (this.config.mdbFormGroup.create && (this.$formGroup === undefined || this.$formGroup.length === 0)) { + if (this.config.bmdFormGroup.create && (this.$formGroup === undefined || this.$formGroup.length === 0)) { // If a form-group doesn't exist (not recommended), take a guess and wrap the element (assuming no label). // note: it's possible to make this smarter, but I need to see valid cases before adding any complexity. - this.outerElement().wrap(this.config.mdbFormGroup.template) + this.outerElement().wrap(this.config.bmdFormGroup.template) } else { // a form-group does exist, add our marker class to it this.$formGroup.addClass(ClassName.BMD_FORM_GROUP) // OLD: may want to implement this after all, see how the styling turns out, but using an existing form-group is less manipulation of the dom and therefore preferable // A form-group does exist, so add an bmd-form-group wrapping it's internal contents - //fg.wrapInner(this.config.mdbFormGroup.template) + //fg.wrapInner(this.config.bmdFormGroup.template) } - mfg = this.findMdbFormGroup(this.config.mdbFormGroup.required) + mfg = this.findMdbFormGroup(this.config.bmdFormGroup.required) } return mfg @@ -201,7 +201,7 @@ const BaseInput = (($) => { // Will add bmd-label to bmd-form-group if not already specified resolveMdbLabel() { - let label = this.$mdbFormGroup.find(Selector.BMD_LABEL_WILDCARD) + let label = this.$bmdFormGroup.find(Selector.BMD_LABEL_WILDCARD) if (label === undefined || label.length === 0) { // we need to find it based on the configured selectors label = this.findMdbLabel(this.config.label.required) @@ -226,7 +226,7 @@ const BaseInput = (($) => { if ($.isFunction(selector)) { label = selector(this) } else { - label = this.$mdbFormGroup.find(selector) + label = this.$bmdFormGroup.find(selector) } if (label !== undefined && label.length > 0) { @@ -260,7 +260,7 @@ const BaseInput = (($) => { for (let inputSize in FormControlSizeMarkers) { if (this.$element.hasClass(inputSize)) { //this.$element.removeClass(inputSize) - this.$mdbFormGroup.addClass(FormControlSizeMarkers[inputSize]) + this.$bmdFormGroup.addClass(FormControlSizeMarkers[inputSize]) } } } diff --git a/js/src/baseSelection.js b/js/src/baseSelection.js index 24ff0afe..765d1c3d 100644 --- a/js/src/baseSelection.js +++ b/js/src/baseSelection.js @@ -14,9 +14,9 @@ const BaseSelection = (($) => { // Prioritized find order for resolving the label to be used as an bmd-label if not specified in the markup // - a function(thisComponent); or - // - a string selector used like $mdbFormGroup.find(selector) + // - a string selector used like $bmdFormGroup.find(selector) // - // Note this only runs if $mdbFormGroup.find(Selector.BMD_LABEL_WILDCARD) fails to find a label (as authored in the markup) + // Note this only runs if $bmdFormGroup.find(Selector.BMD_LABEL_WILDCARD) fails to find a label (as authored in the markup) // //selectors: [ // `.form-control-label`, // in the case of horizontal or inline forms, this will be marked diff --git a/js/src/bootstrapMaterialDesign.js b/js/src/bootstrapMaterialDesign.js index ce14e2ed..4caaa042 100644 --- a/js/src/bootstrapMaterialDesign.js +++ b/js/src/bootstrapMaterialDesign.js @@ -12,7 +12,7 @@ const BootstrapMaterialDesign = (($) => { * ------------------------------------------------------------------------ */ const NAME = 'bootstrapMaterialDesign' - const DATA_KEY = `mdb.${NAME}` + const DATA_KEY = `bmd.${NAME}` const JQUERY_NAME = NAME // retain this full name since it is long enough not to conflict const JQUERY_NO_CONFLICT = $.fn[JQUERY_NAME] @@ -129,9 +129,9 @@ const BootstrapMaterialDesign = (($) => { // mix in global options componentConfig = $.extend(true, {}, this.config.global, componentConfig) - // create the jquery fn name e.g. 'mdbText' for 'text' + // create the jquery fn name e.g. 'bmdText' for 'text' let componentName = `${component.charAt(0).toUpperCase() + component.slice(1)}` - let jqueryFn = `mdb${componentName}` + let jqueryFn = `bmd${componentName}` try { // safely instantiate component on selector elements with config, report errors and move on. diff --git a/js/src/checkbox.js b/js/src/checkbox.js index 05e4d21c..9b93f401 100644 --- a/js/src/checkbox.js +++ b/js/src/checkbox.js @@ -14,8 +14,8 @@ const Checkbox = (($) => { * ------------------------------------------------------------------------ */ const NAME = 'checkbox' - const DATA_KEY = `mdb.${NAME}` - const JQUERY_NAME = `mdb${NAME.charAt(0).toUpperCase() + NAME.slice(1)}` + const DATA_KEY = `bmd.${NAME}` + const JQUERY_NAME = `bmd${NAME.charAt(0).toUpperCase() + NAME.slice(1)}` const JQUERY_NO_CONFLICT = $.fn[JQUERY_NAME] const Default = { diff --git a/js/src/checkboxInline.js b/js/src/checkboxInline.js index cdae1fe0..4ad32d0f 100644 --- a/js/src/checkboxInline.js +++ b/js/src/checkboxInline.js @@ -8,12 +8,12 @@ const CheckboxInline = (($) => { * ------------------------------------------------------------------------ */ const NAME = 'checkboxInline' - const DATA_KEY = `mdb.${NAME}` - const JQUERY_NAME = `mdb${NAME.charAt(0).toUpperCase() + NAME.slice(1)}` + const DATA_KEY = `bmd.${NAME}` + const JQUERY_NAME = `bmd${NAME.charAt(0).toUpperCase() + NAME.slice(1)}` const JQUERY_NO_CONFLICT = $.fn[JQUERY_NAME] const Default = { - mdbFormGroup: { + bmdFormGroup: { create: false, // no bmd-form-group creation if form-group not present. It messes with the layout. required: false } diff --git a/js/src/collapseInline.js b/js/src/collapseInline.js index 72f16617..10d813f7 100644 --- a/js/src/collapseInline.js +++ b/js/src/collapseInline.js @@ -9,8 +9,8 @@ const CollapseInline = (($) => { * ------------------------------------------------------------------------ */ const NAME = 'collapseInline' - const DATA_KEY = `mdb.${NAME}` - const JQUERY_NAME = `mdb${NAME.charAt(0).toUpperCase() + NAME.slice(1)}` + const DATA_KEY = `bmd.${NAME}` + const JQUERY_NAME = `bmd${NAME.charAt(0).toUpperCase() + NAME.slice(1)}` const JQUERY_NO_CONFLICT = $.fn[JQUERY_NAME] const Selector = { @@ -37,7 +37,7 @@ const CollapseInline = (($) => { // i.e.