Skip to content
This repository has been archived by the owner on Feb 12, 2022. It is now read-only.

Commit

Permalink
(1027---clean-up-code-formatting) cleans up codebase according to ET …
Browse files Browse the repository at this point in the history 
…standards
  • Loading branch information
@cmcculloh
cmcculloh committed Feb 3, 2015
1 parent a50401b commit 89820be
Show file tree
Hide file tree
Showing 18 changed files with 1,654 additions and 1,316 deletions.
117 changes: 62 additions & 55 deletions js/checkbox.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
* Licensed under the BSD New license.
*/

// -- BEGIN UMD WRAPPER PREFACE --
// -- BEGIN UMD WRAPPER PREFACE --

// For more information on UMD visit:
// https://github.com/umdjs/umd/blob/master/jqueryPlugin.js
// For more information on UMD visit:
// https://github.com/umdjs/umd/blob/master/jqueryPlugin.js

(function (factory) {
if (typeof define === 'function' && define.amd) {
Expand All @@ -36,20 +36,23 @@
this.$label = this.$element.parent();
this.$parent = this.$label.parent('.checkbox');
this.$toggleContainer = this.$element.attr('data-toggle');
this.state = { disabled: false, checked: false };
this.state = {
disabled: false,
checked: false
};

if( this.$parent.length === 0 ) {
if (this.$parent.length === 0) {
this.$parent = null;
}

if( Boolean( this.$toggleContainer ) ) {
this.$toggleContainer = $( this.$toggleContainer );
if (Boolean(this.$toggleContainer)) {
this.$toggleContainer = $(this.$toggleContainer);
} else {
this.$toggleContainer = null;
}

// handle events
this.$element.on('change.fu.checkbox', $.proxy( this.itemchecked, this ));
this.$element.on('change.fu.checkbox', $.proxy(this.itemchecked, this));
this.$label.unbind('click', $.proxy(this.toggle, this));//unbind previous binds so that double clickage doesn't happen (thus making checkbox appear to not work)
this.$label.on('click', $.proxy(this.toggle, this));//make repeated label clicks work

Expand All @@ -61,11 +64,11 @@

constructor: Checkbox,

setState: function( $chk ) {
setState: function ($chk) {
$chk = $chk || this.$element;

this.state.disabled = Boolean( $chk.prop('disabled') );
this.state.checked = Boolean( $chk.is(':checked') );
this.state.disabled = Boolean($chk.prop('disabled'));
this.state.checked = Boolean($chk.is(':checked'));

this._resetClasses();

Expand All @@ -77,80 +80,84 @@
this.toggleContainer();
},

enable: function() {
enable: function () {
this.state.disabled = false;
this.$element.removeAttr('disabled');
this.$element.prop('disabled', false);
this._resetClasses();
this.$element.trigger( 'enabled.fu.checkbox' );
this.$element.trigger('enabled.fu.checkbox');
},

disable: function() {
disable: function () {
this.state.disabled = true;
this.$element.prop('disabled', true);
this.$element.attr('disabled', 'disabled');
this._setDisabledClass();
this.$element.trigger( 'disabled.fu.checkbox' );
this.$element.trigger('disabled.fu.checkbox');
},

check: function () {
this.state.checked = true;
this.$element.prop('checked', true);
this.$element.attr('checked','checked');
this.$element.attr('checked', 'checked');
this._setCheckedClass();
this.$element.trigger( 'checked.fu.checkbox' );
this.$element.trigger('checked.fu.checkbox');
},

uncheck: function () {
this.state.checked = false;
this.$element.prop('checked', false);
this.$element.removeAttr('checked');
this._resetClasses();
this.$element.trigger( 'unchecked.fu.checkbox' );
this.$element.trigger('unchecked.fu.checkbox');
},

isChecked: function () {
return this.state.checked;
},

toggle: function(e) {
toggle: function (e) {
//keep checkbox from being used if it is disabled. You can't rely on this.state.disabled, because on bind time it might not be disabled, but, state.disabled may be set to true after bind time (and this.state.disabled won't be updated for this bound instance)
//To see how this works, uncomment the next line of code and go to http://0.0.0.0:8000/index.html click the "disable #myCustomCheckbox1" and then click on the first checkbox and see the disparity in the output between this.state and this.$element.attr
//console.log('is disabled? this.state says, "' + this.state.disabled + '"; this.$element.attr says, "' + this.$element.attr('disabled') + '"');
if(/* do not change this to this.state.disabled. It will break edge cases */ this.$element.prop('disabled')){return;}
if (/* do not change this to this.state.disabled. It will break edge cases */ this.$element.prop('disabled')) {
return;
}

//keep event from firing twice in Chrome
if (!e || (e.target === e.originalEvent.target)) {
this.state.checked = !this.state.checked;

this._toggleCheckedState();

if(Boolean(e)){
if (Boolean(e)) {
//stop bubbling, otherwise event fires twice in Firefox.
e.preventDefault();
//make change event still fire (prevented by preventDefault to avoid firefox bug, see preceeding line)
this.$element.trigger('change', e);
}

}
},

toggleContainer: function(){
if( Boolean( this.$toggleContainer ) ) {
if( this.state.checked ) {
toggleContainer: function () {
if (Boolean(this.$toggleContainer)) {
if (this.state.checked) {
this.$toggleContainer.removeClass('hide hidden');
this.$toggleContainer.attr('aria-hidden', 'false');
}else {
} else {
this.$toggleContainer.addClass('hidden');
this.$toggleContainer.attr('aria-hidden', 'true');
}

}
},

itemchecked: function( element ) {
this.setState( $( element.target ) );
itemchecked: function (element) {
this.setState($(element.target));
},

destroy: function() {
destroy: function () {
this.$parent.remove();
// remove any external bindings
// [none]
Expand All @@ -159,54 +166,54 @@
return this.$parent[0].outerHTML;
},

_resetClasses: function() {
_resetClasses: function () {
var classesToRemove = [];

if( !this.state.checked ) {
classesToRemove.push( 'checked' );
if (!this.state.checked) {
classesToRemove.push('checked');
}

if( !this.state.disabled ) {
classesToRemove.push( 'disabled' );
if (!this.state.disabled) {
classesToRemove.push('disabled');
}

classesToRemove = classesToRemove.join( ' ' );
classesToRemove = classesToRemove.join(' ');

this.$label.removeClass( classesToRemove );
this.$label.removeClass(classesToRemove);

if( this.$parent ) {
this.$parent.removeClass( classesToRemove );
if (this.$parent) {
this.$parent.removeClass(classesToRemove);
}
},

_toggleCheckedState: function() {
if( this.state.checked ) {
_toggleCheckedState: function () {
if (this.state.checked) {
this.check();
} else {
this.uncheck();
}
},

_toggleDisabledState: function() {
if( this.state.disabled ) {
_toggleDisabledState: function () {
if (this.state.disabled) {
this.disable();
} else {
this.enable();
}
},

_setCheckedClass: function() {
_setCheckedClass: function () {
this.$label.addClass('checked');

if( this.$parent ) {
if (this.$parent) {
this.$parent.addClass('checked');
}
},

_setDisabledClass: function() {
_setDisabledClass: function () {
this.$label.addClass('disabled');

if( this.$parent ){
if (this.$parent) {
this.$parent.addClass('disabled');
}
}
Expand All @@ -216,24 +223,24 @@
// CHECKBOX PLUGIN DEFINITION

$.fn.checkbox = function (option) {
var args = Array.prototype.slice.call( arguments, 1 );
var args = Array.prototype.slice.call(arguments, 1);
var methodReturn;

var $set = this.each(function () {
var $this = $( this );
var data = $this.data('fu.checkbox');
var $this = $(this);
var data = $this.data('fu.checkbox');
var options = typeof option === 'object' && option;

if( !data ) {
if (!data) {
$this.data('fu.checkbox', (data = new Checkbox(this, options)));
}

if( typeof option === 'string' ) {
methodReturn = data[ option ].apply( data, args );
if (typeof option === 'string') {
methodReturn = data[option].apply(data, args);
}
});

return ( methodReturn === undefined ) ? $set : methodReturn;
return (methodReturn === undefined) ? $set : methodReturn;
};

$.fn.checkbox.defaults = {};
Expand All @@ -249,7 +256,7 @@

$(document).on('mouseover.fu.checkbox.data-api', '[data-initialize=checkbox]', function (e) {
var $control = $(e.target).closest('.checkbox').find('[type=checkbox]');
if ( !$control.data('fu.checkbox') ) {
if (!$control.data('fu.checkbox')) {
$control.checkbox($control.data());
}
});
Expand All @@ -264,6 +271,6 @@
});
});

// -- BEGIN UMD WRAPPER AFTERWORD --
// -- BEGIN UMD WRAPPER AFTERWORD --
}));
// -- END UMD WRAPPER AFTERWORD --
// -- END UMD WRAPPER AFTERWORD --
Loading

0 comments on commit 89820be

Please sign in to comment.