Skip to content

Commit

Permalink
passes JSHint + issue taitems#33 and taitems#34
Browse files Browse the repository at this point in the history
  • Loading branch information
@taitems
taitems committed Sep 11, 2012
1 parent 363ae4d commit 66e06a5
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 25 deletions.
50 changes: 26 additions & 24 deletions js/jquery.fn.gantt.js
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*jshint shadow:true*/
/*jshint shadow:true, unused:false, laxbreak:true, evil:true*/
/*globals jQuery, alert*/

(function ($) {
Expand Down Expand Up @@ -29,11 +29,11 @@

$.extend($.expr[":"], {
findday: function (a, i, m) {
var cd = new Date(parseInt(m[3],10));
var cd = new Date(parseInt(m[3], 10));
var id = $(a).attr("id");
id = id ? id : "";
var si = id.indexOf("-") + 1;
var ed = new Date(parseInt(id.substring(si, id.length),10));
var ed = new Date(parseInt(id.substring(si, id.length), 10));
cd = new Date(cd.getFullYear(), cd.getMonth(), cd.getDate());
ed = new Date(ed.getFullYear(), ed.getMonth(), ed.getDate());
return cd.getTime() === ed.getTime();
Expand All @@ -42,7 +42,7 @@

$.extend($.expr[":"], {
findweek: function (a, i, m) {
var cd = new Date(parseInt(m[3],10));
var cd = new Date(parseInt(m[3], 10));
var id = $(a).attr("id");
id = id ? id : "";
var si = id.indexOf("-") + 1;
Expand All @@ -54,7 +54,7 @@

$.extend($.expr[":"], {
findmonth: function (a, i, m) {
var cd = new Date(parseInt(m[3],10));
var cd = new Date(parseInt(m[3], 10));
cd = cd.getFullYear() + "-" + cd.getMonth();
var id = $(a).attr("id");
id = id ? id : "";
Expand Down Expand Up @@ -192,7 +192,7 @@

$(element).html(element.gantt);

element.scrollNavigation.panelMargin = parseInt($dataPanel.css("margin-left").replace("px", ""),10);
element.scrollNavigation.panelMargin = parseInt($dataPanel.css("margin-left").replace("px", ""), 10);
element.scrollNavigation.panelMaxPos = ($dataPanel.width() - $rightPanel.width());

element.scrollNavigation.canScroll = ($dataPanel.width() > $rightPanel.width());
Expand Down Expand Up @@ -259,7 +259,7 @@
var entries = [];
$.each(element.data, function (i, entry) {
if (i >= element.pageNum * settings.itemsPerPage && i < (element.pageNum * settings.itemsPerPage + settings.itemsPerPage)) {
entries.push('<div class="row name row' + i + (entry.desc ? '' : ' fn-wide') + '" id="rowheader' + i + '" offset="' + i * tools.getCellSize() + '">');
entries.push('<div class="row name row' + i + (entry.desc ? '' : ' fn-wide') + '" id="rowheader' + i + '" offset="' + i % settings.itemsPerPage * tools.getCellSize() + '">');
entries.push('<span class="fn-label' + (entry.cssClass ? ' ' + entry.cssClass : '') + '">' + entry.name + '</span>');
entries.push('</div>');

Expand Down Expand Up @@ -303,6 +303,8 @@
corrY = tools.getCellSize();
break;
case "hours":
corrY = tools.getCellSize() * 4;
break;
case "days":
corrY = tools.getCellSize() * 3;
break;
Expand Down Expand Up @@ -365,7 +367,7 @@
var holidays = settings.holidays ? settings.holidays.join() : '';

switch (settings.scale) {
// hours /////////////////////////////////////////////////////////////////////////////////////////
// hours /////////////////////////////////////////////////////////////////////////////////////////
case "hours":

range = tools.parseTimeRange(element.dateStart, element.dateEnd, element.scaleStep);
Expand Down Expand Up @@ -490,7 +492,7 @@

break;

// weeks /////////////////////////////////////////////////////////////////////////////////////////
// weeks /////////////////////////////////////////////////////////////////////////////////////////
case "weeks":
range = tools.parseWeeksRange(element.dateStart, element.dateEnd);
yearArr = ['<div class="row"/>'];
Expand Down Expand Up @@ -563,7 +565,7 @@


break;
// months ////////////////////////////////////////////////////////////////////////////////////////
// months ////////////////////////////////////////////////////////////////////////////////////////
case 'months':
range = tools.parseMonthsRange(element.dateStart, element.dateEnd);

Expand Down Expand Up @@ -622,7 +624,7 @@


break;
// days //////////////////////////////////////////////////////////////////////////////////////////
// days //////////////////////////////////////////////////////////////////////////////////////////
default:
range = tools.parseDateRange(element.dateStart, element.dateEnd);

Expand Down Expand Up @@ -788,7 +790,7 @@
core.navigateTo(element, tools.getCellSize() * -7);
} else if (settings.scale === 'weeks') {
core.navigateTo(element, tools.getCellSize() * -4);
} else if (settings.scale === 'months') {
} else if (settings.scale === 'months') {
core.navigateTo(element, tools.getCellSize() * -3);
}
}))
Expand Down Expand Up @@ -940,9 +942,9 @@
try {
colStr = colStr.replace("rgb(", "").replace(")", "");
var rgbArr = colStr.split(",");
var R = parseInt(rgbArr[0],10);
var G = parseInt(rgbArr[1],10);
var B = parseInt(rgbArr[2],10);
var R = parseInt(rgbArr[0], 10);
var G = parseInt(rgbArr[1], 10);
var B = parseInt(rgbArr[2], 10);
var gray = Math.round((255 - (0.299 * R + 0.587 * G + 0.114 * B)) * 0.9, 1);
return "rgb(" + gray + ", " + gray + ", " + gray + ")";
} catch (err) {
Expand Down Expand Up @@ -979,7 +981,7 @@
// find row
var topEl = $(element).find("#rowheader" + i);

var top = tools.getCellSize() * 5 + 2 + parseInt(topEl.attr("offset"),10);
var top = tools.getCellSize() * 5 + 2 + parseInt(topEl.attr("offset"), 10);
_bar.css({ 'margin-top': top, 'margin-left': Math.floor(cFrom) });

datapanel.append(_bar);
Expand Down Expand Up @@ -1020,7 +1022,7 @@
// find row
var topEl = $(element).find("#rowheader" + i);

var top = tools.getCellSize() * 3 + 2 + parseInt(topEl.attr("offset"),10);
var top = tools.getCellSize() * 3 + 2 + parseInt(topEl.attr("offset"), 10);
_bar.css({ 'margin-top': top, 'margin-left': Math.floor(cFrom) });

datapanel.append(_bar);
Expand Down Expand Up @@ -1059,13 +1061,13 @@
// find row
var topEl = $(element).find("#rowheader" + i);

var top = tools.getCellSize() * 2 + 2 + parseInt(topEl.attr("offset"),10);
var top = tools.getCellSize() * 2 + 2 + parseInt(topEl.attr("offset"), 10);
_bar.css({ 'margin-top': top, 'margin-left': Math.floor(cFrom) });

datapanel.append(_bar);
break;

// Days
// Days
default:
var dFrom = tools.genId(tools.dateDeserialize(day.from).getTime());
var dTo = tools.genId(tools.dateDeserialize(day.to).getTime());
Expand All @@ -1085,7 +1087,7 @@
// find row
var topEl = $(element).find("#rowheader" + i);

var top = tools.getCellSize() * 4 + 2 + parseInt(topEl.attr("offset"),10);
var top = tools.getCellSize() * 4 + 2 + parseInt(topEl.attr("offset"), 10);
_bar.css({ 'margin-top': top, 'margin-left': Math.floor(cFrom) });

datapanel.append(_bar);
Expand Down Expand Up @@ -1149,7 +1151,7 @@
default:
var max_left = (dataPanelWidth - rightPanelWidth) * -1;
var cur_marg = $dataPanel.css("margin-left").replace("px", "");
var val = parseInt(cur_marg,10) + val;
var val = parseInt(cur_marg, 10) + val;
if (val <= 0 && val >= max_left) {
$dataPanel.animate({
"margin-left": val + "px"
Expand Down Expand Up @@ -1293,7 +1295,7 @@
if (!element.scrollNavigation.canScroll) {
return false;
}
var _panelMargin = parseInt(element.scrollNavigation.panelMargin,10) + delta;
var _panelMargin = parseInt(element.scrollNavigation.panelMargin, 10) + delta;
if (_panelMargin > 0) {
element.scrollNavigation.panelMargin = 0;
$(element).find(".fn-gantt .dataPanel").css("margin-left", element.scrollNavigation.panelMargin + "px");
Expand Down Expand Up @@ -1549,8 +1551,8 @@
$("body").append(
$('<div style="display: none; position: absolute;" id="measureBarWidth" ><div class="fn-gantt"><div class="rightPanel"><div class="dataPanel"><div class="row day"><div class="bar" /></div></div></div></div></div>')
);
tools._getProgressBarMargin = parseInt($("#measureBarWidth .fn-gantt .rightPanel .day .bar").css("margin-left").replace("px", ""),10);
tools._getProgressBarMargin += parseInt($("#measureBarWidth .fn-gantt .rightPanel .day .bar").css("margin-right").replace("px", ""),10);
tools._getProgressBarMargin = parseInt($("#measureBarWidth .fn-gantt .rightPanel .day .bar").css("margin-left").replace("px", ""), 10);
tools._getProgressBarMargin += parseInt($("#measureBarWidth .fn-gantt .rightPanel .day .bar").css("margin-right").replace("px", ""), 10);
$("#measureBarWidth").empty().remove();
}
return tools._getProgressBarMargin;
Expand Down
Loading

0 comments on commit 66e06a5

Please sign in to comment.