From da2621b473c13663abad0e5213a55ce902cd5ee5 Mon Sep 17 00:00:00 2001 From: eileen Date: Mon, 24 Jun 2013 12:13:32 +1200 Subject: [PATCH] CRM-12887 get jshint happy with our code --- .../CRM/Case/Form/ActivityChangeStatus.js | 2 +- templates/CRM/Contribute/Page/DashBoard.js | 96 ++++++++++--------- 2 files changed, 53 insertions(+), 45 deletions(-) diff --git a/templates/CRM/Case/Form/ActivityChangeStatus.js b/templates/CRM/Case/Form/ActivityChangeStatus.js index ec150e76bb..694f61a4eb 100644 --- a/templates/CRM/Case/Form/ActivityChangeStatus.js +++ b/templates/CRM/Case/Form/ActivityChangeStatus.js @@ -62,6 +62,6 @@ cj(function($) { ); return false; }); -}); +} diff --git a/templates/CRM/Contribute/Page/DashBoard.js b/templates/CRM/Contribute/Page/DashBoard.js index af9a7eeb19..a02121fc79 100644 --- a/templates/CRM/Contribute/Page/DashBoard.js +++ b/templates/CRM/Contribute/Page/DashBoard.js @@ -1,49 +1,57 @@ // http://civicrm.org/licensing -cj(document).ready( function( ) { - getChart( ); - cj('#chart_view').click(function( ) { - if ( cj('#chart_view').hasClass('ui-state-default') ) { - cj('#chart_view').removeClass('ui-state-default').addClass('ui-state-active ui-tabs-selected'); - cj('#table_view').removeClass('ui-state-active ui-tabs-selected').addClass('ui-state-default'); - getChart( ); - cj('#tableData').children().html(''); - } - }); - cj('#table_view').click(function( ) { - if ( cj('#table_view').hasClass('ui-state-default') ) { - cj('#table_view').removeClass('ui-state-default').addClass('ui-state-active ui-tabs-selected'); - cj('#chart_view').removeClass('ui-state-active ui-tabs-selected').addClass('ui-state-default'); - buildTabularView(); - cj('#chartData').children().html(''); - } - }); -}); +//http://wiki.civicrm.org/confluence/display/CRMDOC43/Javascript+Reference +/*jslint indent: 2 */ +/*global CRM, cj */ +cj(function ($) { + 'use strict'; -function getChart( ) { - var year = cj('#select_year').val( ); - var charttype = cj('#chart_type').val( ); - var date = new Date() - var currentYear = date.getFullYear( ); - if ( !charttype ) charttype = 'bvg'; - if ( !year ) year = currentYear; + function getChart() { + var year = $('#select_year').val(); + var charttype = $('#chart_type').val(); + var date = new Date(); + var currentYear = date.getFullYear(); + if (!charttype) { + charttype = 'bvg'; + } + if (!year) { + year = currentYear; + } + var chartUrl = CRM.url("civicrm/ajax/chart", {snippet : 4}); + chartUrl += "&year=" + year + "&type=" + charttype; + $.ajax({ + url : chartUrl, + success : function(html) { + $("#chartData").html(html); + } + }); + } - var chartUrl = CRM.url("civicrm/ajax/chart", {snippet : 4}); - chartUrl += "&year=" + year + "&type=" + charttype; - cj.ajax({ - url : chartUrl, - success : function(html){ - cj( "#chartData" ).html( html ); - } - }); + function buildTabularView() { + var tableUrl = CRM.url("civicrm/contribute/ajax/tableview", {showtable: 1, snippet: 4}); + $.ajax({ + url : tableUrl, + success : function(html) { + $("#tableData").html(html); + } + }); + } -} + getChart(); + $('#chart_view').click(function() { + if ($('#chart_view').hasClass('ui-state-default')) { + $('#chart_view').removeClass('ui-state-default').addClass('ui-state-active ui-tabs-selected'); + $('#table_view').removeClass('ui-state-active ui-tabs-selected').addClass('ui-state-default'); + getChart(); + $('#tableData').children().html(''); + } + }); + $('#table_view').click(function() { + if ($('#table_view').hasClass('ui-state-default')) { + $('#table_view').removeClass('ui-state-default').addClass('ui-state-active ui-tabs-selected'); + $('#chart_view').removeClass('ui-state-active ui-tabs-selected').addClass('ui-state-default'); + buildTabularView(); + $('#chartData').children().html(''); + } + }); +}); -function buildTabularView( ) { - var tableUrl = CRM.url("civicrm/contribute/ajax/tableview", {showtable:1, snippet:4}); - cj.ajax({ - url : tableUrl, - success : function(html){ - cj( "#tableData" ).html( html ); - } - }); -} \ No newline at end of file -- 2.25.1