Skip to content

gjslint fixes #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
lightsofapollo wants to merge 2 commits into from
Closed

gjslint fixes #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e9a5532
gjslint fixes
lightsofapollo Jul 23, 2012
dd36262
fix duration
lightsofapollo Jul 23, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
351 changes: 182 additions & 169 deletions designData.js
View file
Open in desktop

Large diffs are not rendered by default.

73 changes: 37 additions & 36 deletions icalcomponent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */"use strict";
* You can obtain one at http://mozilla.org/MPL/2.0/. */'use strict';

var ICAL = ICAL || {};
(function () {
(function() {
ICAL.icalcomponent = function icalcomponent(data, parent) {
this.wrappedJSObject = this;
this.parent = parent;
Expand All @@ -13,23 +13,23 @@ var ICAL = ICAL || {};
ICAL.icalcomponent.prototype = {

data: null,
name: "",
name: '',
components: null,
properties: null,

icalclass: "icalcomponent",
icalclass: 'icalcomponent',

clone: function clone() {
return new ICAL.icalcomponent(this.undecorate(), this.parent);
},

fromData: function fromData(data) {
if(!data) {
if (!data) {
data = ICAL.helpers.initComponentData(null);
}
this.data = data;
this.data.value = this.data.value || [];
this.data.type = this.data.type || "COMPONENT";
this.data.type = this.data.type || 'COMPONENT';
this.components = {};
this.properties = {};

Expand All @@ -40,9 +40,9 @@ var ICAL = ICAL || {};

var value = this.data.value;

for(var key in value) {
for (var key in value) {
var keyname = value[key].name;
if(value[key].type == "COMPONENT") {
if (value[key].type == 'COMPONENT') {
value[key] = new ICAL.icalcomponent(value[key], this);
ICAL.helpers.ensureKeyExists(this.components, keyname, []);
this.components[keyname].push(value[key]);
Expand All @@ -61,20 +61,21 @@ var ICAL = ICAL || {};
}
return {
name: this.name,
type: "COMPONENT",
type: 'COMPONENT',
value: newdata
};
},

getFirstSubcomponent: function getFirstSubcomponent(aType) {
var comp = null;
if(aType) {
if (aType) {
var ucType = aType.toUpperCase();
if(ucType in this.components && this.components[ucType] && this.components[ucType].length > 0) {
if (ucType in this.components &&
this.components[ucType] && this.components[ucType].length > 0) {
comp = this.components[ucType][0];
}
} else {
for(var thiscomp in this.components) {
for (var thiscomp in this.components) {
comp = this.components[thiscomp][0];
break;
}
Expand All @@ -84,16 +85,16 @@ var ICAL = ICAL || {};

getAllSubcomponents: function getAllSubcomponents(aType) {
var comps = [];
if(aType && aType != "ANY") {
if (aType && aType != 'ANY') {
var ucType = aType.toUpperCase();
if(ucType in this.components) {
for(var compKey in this.components[ucType]) {
if (ucType in this.components) {
for (var compKey in this.components[ucType]) {
comps.push(this.components[ucType][compKey]);
}
}
} else {
for(var compName in this.components) {
for(var compKey in this.components[compName]) {
for (var compName in this.components) {
for (var compKey in this.components[compName]) {
comps.push(this.components[compName][compKey]);
}
}
Expand All @@ -104,7 +105,7 @@ var ICAL = ICAL || {};
addSubcomponent: function addSubcomponent(aComp, aCompName) {
var ucName, comp;
var comp;
if(aComp.icalclass == "icalcomponent") {
if (aComp.icalclass == 'icalcomponent') {
ucName = aComp.name;
comp = aComp.clone();
comp.parent = this;
Expand All @@ -122,7 +123,7 @@ var ICAL = ICAL || {};
var ucName = aName.toUpperCase();
for each(var comp in this.components[ucName]) {
var pos = this.data.value.indexOf(comp);
if(pos > -1) {
if (pos > -1) {
this.data.value.splice(pos, 1);
}
}
Expand All @@ -132,14 +133,14 @@ var ICAL = ICAL || {};

hasProperty: function hasProperty(aName) {
var ucName = aName.toUpperCase();
return(ucName in this.properties);
return (ucName in this.properties);
},

getFirstProperty: function getFirstProperty(aName) {
var prop = null;
if(aName) {
if (aName) {
var ucName = aName.toUpperCase();
if(ucName in this.properties && this.properties[ucName]) {
if (ucName in this.properties && this.properties[ucName]) {
prop = this.properties[ucName][0];
}
} else {
Expand All @@ -159,13 +160,13 @@ var ICAL = ICAL || {};

getAllProperties: function getAllProperties(aName) {
var props = [];
if(aName && aName != "ANY") {
if (aName && aName != 'ANY') {
var ucType = aName.toUpperCase();
if(ucType in this.properties) {
if (ucType in this.properties) {
props = this.properties[ucType].concat([]);
}
} else {
for(var propName in this.properties) {
for (var propName in this.properties) {
props = props.concat(this.properties[propName]);
}
}
Expand All @@ -180,30 +181,30 @@ var ICAL = ICAL || {};
});

var prop = ICAL.icalproperty.fromData(lineData);
ICAL.helpers.dumpn("Adding property " + ucName + "=" + aValue);
ICAL.helpers.dumpn('Adding property ' + ucName + '=' + aValue);
return this.addProperty(prop);
},

addProperty: function addProperty(aProp) {
ICAL.helpers.dumpn("Adding property " + aProp + "STK " + STACK());
ICAL.helpers.dumpn('Adding property ' + aProp + 'STK ' + STACK());
var prop = aProp;
if(aProp.parent) {
if (aProp.parent) {
prop = aProp.clone();
}
aProp.parent = this;

ICAL.helpers.ensureKeyExists(this.properties, aProp.name, []);
this.properties[aProp.name].push(aProp);
ICAL.helpers.dumpn("DATA IS: " + this.data.toSource());
ICAL.helpers.dumpn('DATA IS: ' + this.data.toSource());
this.data.value.push(aProp);
ICAL.helpers.dumpn("Adding property " + aProp);
ICAL.helpers.dumpn('Adding property ' + aProp);
},

removeProperty: function removeProperty(aName) {
var ucName = aName.toUpperCase();
for each(var prop in this.properties[ucName]) {
var pos = this.data.value.indexOf(prop);
if(pos > -1) {
if (pos > -1) {
this.data.value.splice(pos, 1);
}
}
Expand All @@ -213,19 +214,19 @@ var ICAL = ICAL || {};

clearAllProperties: function clearAllProperties() {
this.properties = {};
for(var i = this.data.value.length - 1; i >= 0; i--) {
if(this.data.value[i].type != "COMPONENT") {
for (var i = this.data.value.length - 1; i >= 0; i--) {
if (this.data.value[i].type != 'COMPONENT') {
delete this.data.value[i];
}
}
},

toString: function toString() {
var str = ICAL.helpers.foldline("BEGIN:" + this.name) + ICAL.newLineChar;
for(var key in this.data.value) {
var str = ICAL.helpers.foldline('BEGIN:' + this.name) + ICAL.newLineChar;
for (var key in this.data.value) {
str += this.data.value[key].toString() + ICAL.newLineChar;
}
str += ICAL.helpers.foldline("END:" + this.name);
str += ICAL.helpers.foldline('END:' + this.name);
return str;
}
};
Expand Down
63 changes: 36 additions & 27 deletions icalduration.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */"use strict";
* You can obtain one at http://mozilla.org/MPL/2.0/. */

'use strict';

var ICAL = ICAL || {};
(function () {
(function() {
ICAL.icalduration = function icalduration(data) {
this.wrappedJSObject = this;
this.fromData(data);
Expand All @@ -17,16 +19,19 @@ var ICAL = ICAL || {};
minutes: 0,
seconds: 0,
isNegative: false,
icalclass: "icalduration",
icaltype: "DURATION",
icalclass: 'icalduration',
icaltype: 'DURATION',

clone: function clone() {
return ICAL.icalduration.fromData(this);
},

toSeconds: function toSeconds() {
var seconds = this.seconds + 60 * this.minutes + 3600 * this.hours + 86400 * this.days + 7 * 86400 * this.weeks;
return(this.isNegative ? -seconds : seconds);
var seconds = this.seconds + 60 *
this.minutes + 3600 *
this.hours + 86400 * this.days + 7 * 86400 * this.weeks;

return (this.isNegative ? -seconds : seconds);
},

fromSeconds: function fromSeconds(aSeconds) {
Expand All @@ -36,7 +41,7 @@ var ICAL = ICAL || {};
this.days = ICAL.helpers.trunc(secs / 86400);

// If we have a flat number of weeks, use them.
if(this.days % 7 == 0) {
if (this.days % 7 == 0) {
this.weeks = this.days / 7;
this.days = 0;
} else {
Expand All @@ -56,17 +61,21 @@ var ICAL = ICAL || {};
},

fromData: function fromData(aData) {
const propsToCopy = ["weeks", "days", "hours", "minutes", "seconds", "isNegative"];
const propsToCopy = [
'weeks', 'days', 'hours',
'minutes', 'seconds', 'isNegative'
];

for each(var key in propsToCopy) {
if(aData && key in aData) {
if (aData && key in aData) {
this[key] = aData[key];
} else {
this[key] = 0;
}
}

if(aData && "factor" in aData) {
this.isNegative = (aData.factor == "-1");
if (aData && 'factor' in aData) {
this.isNegative = (aData.factor == '-1');
}
},

Expand All @@ -82,7 +91,7 @@ var ICAL = ICAL || {};
compare: function compare(aOther) {
var thisSeconds = this.toSeconds();
var otherSeconds = aOther.toSeconds();
return(thisSeconds > otherSeconds) - (thisSeconds < otherSeconds);
return (thisSeconds > otherSeconds) - (thisSeconds < otherSeconds);
},

normalize: function normalize() {
Expand All @@ -91,32 +100,32 @@ var ICAL = ICAL || {};
},

toString: function toString() {
if(this.toSeconds() == 0) {
return "PT0S";
if (this.toSeconds() == 0) {
return 'PT0S';
} else {
var str = "";
if(this.isNegative) str += "-";
str += "P";
if(this.weeks) str += this.weeks + "W";
if(this.days) str += this.days + "D";

if(this.hours || this.minutes || this.seconds) {
str += "T";
if(this.hours) str += this.hours + "H";
if(this.minutes) str += this.minutes + "M";
if(this.seconds) str += this.seconds + "S";
var str = '';
if (this.isNegative) str += '-';
str += 'P';
if (this.weeks) str += this.weeks + 'W';
if (this.days) str += this.days + 'D';

if (this.hours || this.minutes || this.seconds) {
str += 'T';
if (this.hours) str += this.hours + 'H';
if (this.minutes) str += this.minutes + 'M';
if (this.seconds) str += this.seconds + 'S';
}
return str;
}
}
};

ICAL.icalduration.fromSeconds = function icalduration_from_seconds(aSeconds) {
return(new ICAL.icalduration()).fromSeconds();
return (new ICAL.icalduration()).fromSeconds();
};

ICAL.icalduration.fromString = function icalduration_from_string(aStr) {
var data = ICAL.icalparser.parseValue(aStr, "DURATION");
var data = ICAL.icalparser.parseValue(aStr, 'DURATION');
return ICAL.icalduration.fromData(data);
};

Expand Down
Loading