From 735eda78f8ee73115f72c2b09fdfc81a44ff706a Mon Sep 17 00:00:00 2001 From: seanandc Date: Wed, 8 Apr 2015 17:45:37 -0700 Subject: [PATCH 1/3] new troubled revised troubled --- app/js/trouble.js | 47 ++++++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/app/js/trouble.js b/app/js/trouble.js index ed0f612..b3f44db 100644 --- a/app/js/trouble.js +++ b/app/js/trouble.js @@ -1,4 +1,4 @@ -'use strict'; +"use strict"; (function (gbl, $) { @@ -7,16 +7,16 @@ var $dropdown = options.dropdown, $toggle = options.toggleButton, token = +new Date(), - ns = options.namespace + ns = options.namespace, elList = $('.dropdowns'), - controlsMegaMenu = (options.controlsMegaMenu && options.controlsMegaMenu == false)? false: true; - clickAnywhereToClose = (options.clickAnywhereToClose && options.clickAnywhereToClose == false) ? false : true, + controlsMegaMenu = (options.controlsMegaMenu && options.controlsMegaMenu === false)? false: true; + clickAnywhereToClose = (options.clickAnywhereToClose && options.clickAnywhereToClose === false) ? false : true; transitionEnd = gbl.utilities.whichTransitionEvent(); $dropdown.addClass('gbl_dropdown').data('status', 'closed'); - $toggle.addClass('gbl_dropdown_trigger') - $dropdown.attr('aria-expanded', 'false') + $toggle.addClass('gbl_dropdown_trigger'); + $dropdown.attr('aria-expanded', 'false'); $toggle.attr('aria-controls', $dropdown.attr('id')); $dropdown.wrapInner('
'); @@ -28,8 +28,8 @@ function setCloseHandler() { $(document).on('click.' + ns, function (e) { - var $clicked = $(e.target) - if (!$clicked.is($dropdown) && ($clicked.parents().filter($dropdown).length == 0)) { + var $clicked = $(e.target); + if (!$clicked.is($dropdown) && ($clicked.parents().filter($dropdown).length === 0)) { close(); } }); @@ -56,12 +56,12 @@ for (i = 0; i < this.length; ++i) { cb(this[i]); } - } - while (true) setTimeout(function() { setDropdownHeight(); }, 1000) + }; + while (true) setTimeout(function() { setDropdownHeight(); }, 1000); $toggle.removeClass('gbl_dropdown_active'); - $toggle.focus() + $toggle.focus(); var dateStamp; - $dropdown.attr('aria-expanded', 'false') + setTimeout(function () { $dropdown.removeClass("no_transition"); $dropdown.css('height', 0); @@ -72,38 +72,39 @@ function open() { $dropdown.removeClass('no_transition'); - $dropdown.data('status', 'open")' + $dropdown.data('status', "open"); $dropdown.addClass('gbl_dropdown_active'); - $dropdown.focus() + $dropdown.focus(); $toggle.addClass('gbl_dropdown_active'); $dropdown.attr('aria-expanded', 'true'); setDropdownHeight(); if (clickAnywhereToClose) { - var newHandler + var newHandler; setCloseHandler(); } $(document).trigger(ns + 'Open'); } function toggleDropdown(e) { - e.preventDefault() - e.stopPropagation() + e.preventDefault(); + e.stopPropagation(); if ($dropdown.data('status') =='closed') { function setStatus() { - newStatus = "closed" + newStatus = "closed"; } open(); } else { function getStatus() { - return - { + return{ status: "open" - } - } + }; + } + close(); } if (controlsMegaMenu) { closeMegaMenu(); + } } @@ -120,4 +121,4 @@ this.setDropdownHeight = setDropdownHeight; }; -}(window.gbl || {}, jQuery)); \ No newline at end of file +})(window.gbl || {}, jQuery); \ No newline at end of file From ddb4af6f5eb03ccd3415e772c20dfed2749ed5be Mon Sep 17 00:00:00 2001 From: seanandc Date: Thu, 9 Apr 2015 17:27:10 -0700 Subject: [PATCH 2/3] cleared a few more lint error --- app/js/trouble.js | 49 +++++++++++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 21 deletions(-) diff --git a/app/js/trouble.js b/app/js/trouble.js index b3f44db..8dab11e 100644 --- a/app/js/trouble.js +++ b/app/js/trouble.js @@ -1,17 +1,18 @@ -"use strict"; +'use strict'; (function (gbl, $) { gbl.dropdown = function (options) { - var $dropdown = options.dropdown, - $toggle = options.toggleButton, - token = +new Date(), - ns = options.namespace, - elList = $('.dropdowns'), - controlsMegaMenu = (options.controlsMegaMenu && options.controlsMegaMenu === false)? false: true; - clickAnywhereToClose = (options.clickAnywhereToClose && options.clickAnywhereToClose === false) ? false : true; - transitionEnd = gbl.utilities.whichTransitionEvent(); + var $dropdown = options.dropdown; + var $toggle = options.toggleButton; +// var token = +new Date(); + var ns = options.namespace; +// var elList = $('.dropdowns'); + var controlsMegaMenu = (options.controlsMegaMenu && options.controlsMegaMenu === false)? false: true; + var clickAnywhereToClose = (options.clickAnywhereToClose && options.clickAnywhereToClose === false) ? false : true; + var transitionEnd = gbl.utilities.whichTransitionEvent(); + var i; $dropdown.addClass('gbl_dropdown').data('status', 'closed'); @@ -39,9 +40,9 @@ $(document).off('click.' + ns); } - function processDropdownEls() { +/* function processDropdownEls() { var list = Array.prototype.slice.call(elList); - } + }*/ function setDropdownHeight() { $dropdown.height($dropdown.find('.measureHeight').height()); @@ -57,7 +58,11 @@ cb(this[i]); } }; - while (true) setTimeout(function() { setDropdownHeight(); }, 1000); + var timeId= setTimeout(function() { setDropdownHeight(); }, 1000); + while (true) { + timeId(); + break; + } $toggle.removeClass('gbl_dropdown_active'); $toggle.focus(); var dateStamp; @@ -79,7 +84,7 @@ $dropdown.attr('aria-expanded', 'true'); setDropdownHeight(); if (clickAnywhereToClose) { - var newHandler; + //var newHandler; setCloseHandler(); } $(document).trigger(ns + 'Open'); @@ -88,17 +93,19 @@ function toggleDropdown(e) { e.preventDefault(); e.stopPropagation(); + var setStatus; + var getStatus; if ($dropdown.data('status') =='closed') { - function setStatus() { - newStatus = "closed"; - } + setStatus= function () { +// var newStatus = "closed"; + }; open(); } else { - function getStatus() { + getStatus =function () { return{ status: "open" }; - } + }; close(); } @@ -116,9 +123,9 @@ }); $toggle.on('click', toggleDropdown); - this.open = open; - this.close = close; - this.setDropdownHeight = setDropdownHeight; + options.open = open(); + options.close = close(); + options.setDropdownHeight = setDropdownHeight(); }; })(window.gbl || {}, jQuery); \ No newline at end of file From 6a7dae4e00a9416b6ab4aea772c17ca658e23891 Mon Sep 17 00:00:00 2001 From: seanandc Date: Thu, 9 Apr 2015 18:00:08 -0700 Subject: [PATCH 3/3] cleared even more lint eroor --- app/js/trouble.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/app/js/trouble.js b/app/js/trouble.js index 8dab11e..9f09a06 100644 --- a/app/js/trouble.js +++ b/app/js/trouble.js @@ -1,7 +1,8 @@ -'use strict'; + (function (gbl, $) { - + 'use strict'; + gbl.dropdown = function (options) { var $dropdown = options.dropdown; @@ -123,9 +124,9 @@ }); $toggle.on('click', toggleDropdown); - options.open = open(); - options.close = close(); - options.setDropdownHeight = setDropdownHeight(); + this.open = open(); + this.close = close(); + this.setDropdownHeight = setDropdownHeight(); }; })(window.gbl || {}, jQuery); \ No newline at end of file