From aa46c8fc08a0903c98fa3cf0c40d03177f75c5ed Mon Sep 17 00:00:00 2001 From: Eduardo Lundgren Date: Fri, 25 Apr 2014 15:41:02 -0300 Subject: [PATCH] AUI-1174 Source formatting --- .jshintrc | 4 ++-- demos/popover/index.html | 2 +- package.json | 2 +- src/aui-datatable/js/aui-datatable-edit.js | 6 ++++-- .../js/aui-diagram-builder-base.js | 3 ++- src/aui-palette/js/aui-palette.js | 7 ++++--- src/aui-popover/tests/unit/js/tests.js | 4 ++-- src/aui-scheduler/js/aui-scheduler-base-view.js | 14 +++++++------- src/aui-scheduler/js/aui-scheduler-base.js | 2 +- src/aui-scheduler/js/aui-scheduler-view-agenda.js | 3 ++- src/aui-tree/tests/unit/js/tests.js | 3 +-- 11 files changed, 27 insertions(+), 23 deletions(-) diff --git a/.jshintrc b/.jshintrc index e697b6cb219..ca02a0fb013 100644 --- a/.jshintrc +++ b/.jshintrc @@ -14,12 +14,12 @@ "forin": true, "funcscope": false, "globals": { + "ace": true, "A": true, "Y": true, "AUI": true, "YUI": true, - "YUITest": true, - "ace": true + "YUITest": true }, "globalstrict": false, "immed": true, diff --git a/demos/popover/index.html b/demos/popover/index.html index ace16367912..9ba26748b6a 100644 --- a/demos/popover/index.html +++ b/demos/popover/index.html @@ -37,7 +37,7 @@

AlloyUI - Popover

var popoverBottom = new Y.Popover({ align: { - node: triggerBottom + node: '#triggerBottom' }, bodyContent: 'Another fine body…', headerContent: 'Header content', diff --git a/package.json b/package.json index 98178474c2f..e7a0020600a 100755 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "grunt-contrib-clean": "0.5.0", "grunt-contrib-compress": "~0.6.0", "grunt-contrib-copy": "~0.5.0", - "grunt-contrib-jshint": "~0.8.0", + "grunt-contrib-jshint": "~0.10.0", "grunt-jsbeautifier": "~0.2.6", "which": "1.0.5" }, diff --git a/src/aui-datatable/js/aui-datatable-edit.js b/src/aui-datatable/js/aui-datatable-edit.js index 808caca3a49..53f44eb4c4d 100644 --- a/src/aui-datatable/js/aui-datatable-edit.js +++ b/src/aui-datatable/js/aui-datatable-edit.js @@ -1653,7 +1653,8 @@ var TextCellEditor = A.Component.create({ EXTENDS: A.BaseCellEditor, prototype: { - ELEMENT_TEMPLATE: '' + ELEMENT_TEMPLATE: '' } }); @@ -1689,7 +1690,8 @@ var TextAreaCellEditor = A.Component.create({ EXTENDS: A.BaseCellEditor, prototype: { - ELEMENT_TEMPLATE: '' + ELEMENT_TEMPLATE: '' } }); diff --git a/src/aui-diagram-builder/js/aui-diagram-builder-base.js b/src/aui-diagram-builder/js/aui-diagram-builder-base.js index a25dd806828..d0b989f9fa4 100644 --- a/src/aui-diagram-builder/js/aui-diagram-builder-base.js +++ b/src/aui-diagram-builder/js/aui-diagram-builder-base.js @@ -725,7 +725,8 @@ var DiagramBuilderBase = A.Component.create({ CANVAS_TEMPLATE: '
', CONTENT_CONTAINER_TEMPLATE: '
', DROP_CONTAINER_TEMPLATE: '
', - FIELDS_CONTAINER_TEMPLATE: '', + FIELDS_CONTAINER_TEMPLATE: '', TOOLBAR_CONTAINER_TEMPLATE: '
', fieldsNode: null, diff --git a/src/aui-palette/js/aui-palette.js b/src/aui-palette/js/aui-palette.js index d2e453555ab..0009209ee42 100644 --- a/src/aui-palette/js/aui-palette.js +++ b/src/aui-palette/js/aui-palette.js @@ -30,11 +30,12 @@ var Lang = A.Lang, Palette = A.Base.create('palette', A.Widget, [A.WidgetCssClass, A.WidgetToggle], { CONTAINER_TEMPLATE: '
{content}
', - ITEMS_CONTAINER_TEMPLATE: '', + ITEMS_CONTAINER_TEMPLATE: '', ITEM_TEMPLATE: '
  • ' + - '' + '
    • ', + ' {selectedClassName}" data-column={column} data-index={index} data-row={row} data-value="{value}">' + + '' + '', _items: null, diff --git a/src/aui-popover/tests/unit/js/tests.js b/src/aui-popover/tests/unit/js/tests.js index d979ef31662..f2d85c7e9b9 100644 --- a/src/aui-popover/tests/unit/js/tests.js +++ b/src/aui-popover/tests/unit/js/tests.js @@ -23,7 +23,7 @@ YUI.add('aui-popover-tests', function(Y) { popoverTop = new Y.Popover({ align: { - node: triggerTop + node: '#triggerTop' }, bodyContent: 'One fine body…', headerContent: 'Header content', @@ -33,7 +33,7 @@ YUI.add('aui-popover-tests', function(Y) { popoverBottom = new Y.Popover({ align: { - node: triggerBottom + node: '#triggerBottom' }, bodyContent: 'Another fine body…', headerContent: 'Header content', diff --git a/src/aui-scheduler/js/aui-scheduler-base-view.js b/src/aui-scheduler/js/aui-scheduler-base-view.js index 3cd3c6a0226..d4390874c15 100644 --- a/src/aui-scheduler/js/aui-scheduler-base-view.js +++ b/src/aui-scheduler/js/aui-scheduler-base-view.js @@ -5,15 +5,15 @@ * @submodule aui-scheduler-base-view */ - var Lang = A.Lang, - isBoolean = Lang.isBoolean, - isFunction = Lang.isFunction, - isString = Lang.isString, +var Lang = A.Lang, + isBoolean = Lang.isBoolean, + isFunction = Lang.isFunction, + isString = Lang.isString, - DateMath = A.DataType.DateMath, + DateMath = A.DataType.DateMath, - CSS_SCHEDULER_VIEW_NOSCROLL = A.getClassName('scheduler-view', 'noscroll'), - CSS_SCHEDULER_VIEW_SCROLLABLE = A.getClassName('scheduler-view', 'scrollable'); + CSS_SCHEDULER_VIEW_NOSCROLL = A.getClassName('scheduler-view', 'noscroll'), + CSS_SCHEDULER_VIEW_SCROLLABLE = A.getClassName('scheduler-view', 'scrollable'); /** * A base class for `SchedulerView`. diff --git a/src/aui-scheduler/js/aui-scheduler-base.js b/src/aui-scheduler/js/aui-scheduler-base.js index d6facc05ffe..3ee898639d0 100644 --- a/src/aui-scheduler/js/aui-scheduler-base.js +++ b/src/aui-scheduler/js/aui-scheduler-base.js @@ -5,7 +5,7 @@ * @submodule aui-scheduler-base */ - var CSS_SCHEDULER_VIEW_ = A.getClassName('scheduler-base', 'view', ''), +var CSS_SCHEDULER_VIEW_ = A.getClassName('scheduler-base', 'view', ''), CSS_SCHEDULER_VIEW_SELECTED = A.getClassName('active'), DateMath = A.DataType.DateMath, diff --git a/src/aui-scheduler/js/aui-scheduler-view-agenda.js b/src/aui-scheduler/js/aui-scheduler-view-agenda.js index 3030d01daa5..54629fedd43 100644 --- a/src/aui-scheduler/js/aui-scheduler-view-agenda.js +++ b/src/aui-scheduler/js/aui-scheduler-view-agenda.js @@ -399,7 +399,8 @@ var SchedulerAgendaView = A.Component.create({ color: schedulerEvent.get('color'), content: schedulerEvent.get('content'), dates: eventsDateFormatter.call(instance, startDate, endDate), - eventClassName: (startDate.getTime() < today.getTime()) ? CSS_EVENT_PAST : '', + eventClassName: (startDate.getTime() < today.getTime()) ? + CSS_EVENT_PAST : '', firstClassName: (seIndex === 0) ? CSS_EVENT_FIRST : '', lastClassName: (seIndex === schedulerEventsLength - 1) ? CSS_EVENT_LAST : '' }) diff --git a/src/aui-tree/tests/unit/js/tests.js b/src/aui-tree/tests/unit/js/tests.js index 89ae2f480f0..495496d5bab 100644 --- a/src/aui-tree/tests/unit/js/tests.js +++ b/src/aui-tree/tests/unit/js/tests.js @@ -438,8 +438,7 @@ YUI.add('aui-tree-tests', function(Y) { rootTreeNode.get('children')[0].ioSuccessHandler(null, null, { responseText: '[{"label": "subchild-one","leaf": true,"type": "node"},' + '{"label": "subchild-two","leaf": true,"type": "node"},' + - '{"label": "subchild-three","leaf": true, "type": "node"}' + - ']' + '{"label": "subchild-three","leaf": true, "type": "node"}]' }); paginatorLink = rootTreeNodeBB.one('a');