Skip to content

Commit

Permalink
Fix up warnings reported by jshint.
Browse files Browse the repository at this point in the history
Remove jslint global declarations.

Open-webOS-DCO-1.0-Signed-off-by: Jason Lai <jason.lai@palm.com>

Change-Id: I84c1338761e4581ad03deb61c7af15dd916bebd9
  • Loading branch information
Jason Lai committed Sep 25, 2012
1 parent 80da791 commit 2e37683
Show file tree
Hide file tree
Showing 35 changed files with 199 additions and 215 deletions.
2 changes: 2 additions & 0 deletions com.palm.app.email/.jshintignore
@@ -0,0 +1,2 @@
util/lib/
util/urlparser.js
3 changes: 1 addition & 2 deletions com.palm.app.email/accounts/source/AccountWizard.js
Expand Up @@ -740,8 +740,7 @@ AccountWizard.prototype.makeEasUsernameFromEmail = function (email) {
username = email.replace("@" + domain, ""); // get left side of email address
}
return username;
}

};

/**
* Special fn for creating palm and related account accounts
Expand Down
4 changes: 2 additions & 2 deletions com.palm.app.email/accounts/source/CRUDAccounts.js
Expand Up @@ -418,11 +418,11 @@ enyo.kind({
useSmtpAuth: true,
encryption: "",
port: "",
server: "",
server: ""
},
type: (this.wizardTemplate.templateId === "com.palm.eas" ? AccountWizard.EAS : ""),
templateId: this.wizardTemplate.templateId
}
};
},

/**
Expand Down
60 changes: 30 additions & 30 deletions com.palm.app.email/accounts/source/ManualConfig.js
Expand Up @@ -55,8 +55,8 @@ enyo.kind({
onChange: "accountTypeChanged",
items: [
{caption: $L("IMAP"), value: AccountWizard.IMAP},
{caption: $L("POP"), value: AccountWizard.POP}
/* {caption: $L("EAS"), value: AccountWizard.EAS} /* , showing: false */
{caption: $L("POP"), value: AccountWizard.POP},
{caption: $L("EAS"), value: AccountWizard.EAS, showing: false}
]
}
]},
Expand All @@ -66,7 +66,7 @@ enyo.kind({
className: "accounts-group",
caption: $L("EMAIL ADDRESS"),
components: [
{name: "email", kind: "Input", inputType: "email", value: "", onkeypress: "isFormComplete", onkeydown: "checkEnter", onkeydown: "checkEnter", spellcheck: false, autocorrect: false, className: "babelfish", onblur: "isFormComplete", autoCapitalize: "lowercase"}
{name: "email", kind: "Input", inputType: "email", value: "", onkeypress: "isFormComplete", onkeydown: "checkEnter", spellcheck: false, autocorrect: false, className: "babelfish", onblur: "isFormComplete", autoCapitalize: "lowercase"}
]
},
{
Expand All @@ -75,27 +75,27 @@ enyo.kind({
caption: $L("INCOMING MAIL SERVER"),
components: [
{kind: "InputBox", components: [
{name: "inHost", kind: "Input", className: "enyo-first", flex: 1, value: "", hint: $L("Server"), spellcheck: false, autocorrect: false, className: "babelfish", autoCapitalize: "lowercase", onkeypress: "isFormComplete", onkeydown: "checkEnter", onblur: "isFormComplete", components: [
{name: "inHost", kind: "Input", className: "enyo-first babelfish", flex: 1, value: "", hint: $L("Server"), spellcheck: false, autocorrect: false, autoCapitalize: "lowercase", onkeypress: "isFormComplete", onkeydown: "checkEnter", onblur: "isFormComplete", components: [
{content: $L("Server")}
]},
]}
]},

{name: "inEas", components: [
{kind: "InputBox", components: [
{name: "domain", kind: "Input", className: "enyo-middle", flex: 1, value: "", hint: $L("Domain"), spellcheck: false, autocorrect: false, className: "babelfish", autoCapitalize: "lowercase", onkeypress: "isFormComplete", onkeydown: "checkEnter", onblur: "isFormComplete", components: [
{name: "domain", kind: "Input", className: "enyo-middle babelfish", flex: 1, value: "", hint: $L("Domain"), spellcheck: false, autocorrect: false, autoCapitalize: "lowercase", onkeypress: "isFormComplete", onkeydown: "checkEnter", onblur: "isFormComplete", components: [
{content: $L("Domain")}
]},
]}
]}
]},
{kind: "InputBox", components: [
{name: "inUser", kind: "Input", className: "enyo-middle", flex: 1, value: "", hint: $L("Username"), spellcheck: false, autocorrect: false, className: "babelfish", autoCapitalize: "lowercase", onblur: "copyUserToOut", onkeypress: "isFormComplete", onkeydown: "checkEnter", components: [
{name: "inUser", kind: "Input", className: "enyo-middle babelfish", flex: 1, value: "", hint: $L("Username"), spellcheck: false, autocorrect: false, autoCapitalize: "lowercase", onblur: "copyUserToOut", onkeypress: "isFormComplete", onkeydown: "checkEnter", components: [
{content: $L("Username")}
]},
]}
]},
{kind: "InputBox", components: [
{name: "inPassword", kind: "Input", className: "enyo-middle", flex: 1, inputType: "password", value: "", hint: $L("Password"), spellcheck: false, autocorrect: false, className: "babelfish", autoCapitalize: "lowercase", onblur: "copyPassToOut", onkeypress: "isFormComplete", onkeydown: "checkEnter", onfocus: "checkInPass", components: [
{name: "inPassword", kind: "Input", className: "enyo-middle babelfish", flex: 1, inputType: "password", value: "", hint: $L("Password"), spellcheck: false, autocorrect: false, autoCapitalize: "lowercase", onblur: "copyPassToOut", onkeypress: "isFormComplete", onkeydown: "checkEnter", onfocus: "checkInPass", components: [
{content: $L("Password")}
]},
]}
]},
{name: "popImapIncoming", components: [
{
Expand All @@ -113,9 +113,9 @@ enyo.kind({

]},
{kind: "InputBox", name: "inPortWrapper", components: [
{name: "inPort", kind: "Input", className: "enyo-last", inputType: "number", value: "", hint: $L("Port"), spellcheck: false, autocorrect: false, className: "babelfish", flex: 1, autoCapitalize: "lowercase", onkeypress: "isFormComplete", onkeydown: "checkEnter", onblur: "isFormComplete", components: [
{name: "inPort", kind: "Input", className: "enyo-last babelfish", inputType: "number", value: "", hint: $L("Port"), spellcheck: false, autocorrect: false, flex: 1, autoCapitalize: "lowercase", onkeypress: "isFormComplete", onkeydown: "checkEnter", onblur: "isFormComplete", components: [
{content: $L("Port")}
]},
]}
]}

]
Expand All @@ -127,9 +127,9 @@ enyo.kind({
caption: $L("OUTGOING MAIL SERVER"),
components: [
{kind: "InputBox", components: [
{name: "outHost", kind: "Input", className: "enyo-first", flex: 1, value: "", hint: $L("Server"), spellcheck: false, autocorrect: false, className: "babelfish", autoCapitalize: "lowercase", onkeypress: "isFormComplete", onkeydown: "checkEnter", onblur: "isFormComplete", components: [
{name: "outHost", kind: "Input", className: "enyo-first babelfish", flex: 1, value: "", hint: $L("Server"), spellcheck: false, autocorrect: false, autoCapitalize: "lowercase", onkeypress: "isFormComplete", onkeydown: "checkEnter", onblur: "isFormComplete", components: [
{content: $L("Server")}
]},
]}
]},
{kind: "HFlexBox", align: "center", components: [
{flex: 1, content: $L("Use Authentication")},
Expand All @@ -138,17 +138,17 @@ enyo.kind({
{name: "outAuthBlock", kind: "Drawer", style: "margin:-10px;", open: false, components: [
{kind: "enyo.RowItem", components: [
{kind: "InputBox", components: [
{name: "outUser", kind: "Input", className: "enyo-middle", flex: 1, value: "", className: "babelfish", hint: $L("Username"), spellcheck: false, autocorrect: false, autoCapitalize: "lowercase", onkeypress: "isFormComplete", onkeydown: "checkEnter", onblur: "isFormComplete", components: [
{name: "outUser", kind: "Input", className: "enyo-middle babelfish", flex: 1, value: "", hint: $L("Username"), spellcheck: false, autocorrect: false, autoCapitalize: "lowercase", onkeypress: "isFormComplete", onkeydown: "checkEnter", onblur: "isFormComplete", components: [
{content: $L("Username")}
]},
]},
]}
]}
]},
{kind: "enyo.RowItem", components: [
{kind: "InputBox", components: [
{name: "outPassword", kind: "Input", className: "enyo-middle", flex: 1, inputType: "password", value: "", className: "babelfish", hint: $L("Password"), spellcheck: false, autocorrect: false, autoCapitalize: "lowercase", onkeypress: "isFormComplete", onkeydown: "checkEnter", onblur: "isFormComplete", onfocus: "checkOutPass", components: [
{name: "outPassword", kind: "Input", className: "enyo-middle babelfish", flex: 1, inputType: "password", value: "", hint: $L("Password"), spellcheck: false, autocorrect: false, autoCapitalize: "lowercase", onkeypress: "isFormComplete", onkeydown: "checkEnter", onblur: "isFormComplete", onfocus: "checkOutPass", components: [
{content: $L("Password")}
]},
]},
]}
]}
]},
{kind: "enyo.RowItem", components: [
{
Expand All @@ -162,15 +162,15 @@ enyo.kind({
{caption: $L("SSL"), value: ProtocolSettings.SSL},
{caption: $L("TLS"), value: ProtocolSettings.TLS}
]
},
}
]},
{kind: "enyo.RowItem", className: "enyo-last", components: [
{kind: "InputBox", components: [
{name: "outPort", kind: "Input", className: "enyo-last", inputType: "number", value: "", hint: $L("Port"), spellcheck: false, autocorrect: false, flex: 1, autoCapitalize: "lowercase", onkeypress: "isFormComplete", onkeydown: "checkEnter", className: "babelfish", onblur: "isFormComplete", components: [
{name: "outPort", kind: "Input", className: "enyo-last babelfish", inputType: "number", value: "", hint: $L("Port"), spellcheck: false, autocorrect: false, flex: 1, autoCapitalize: "lowercase", onkeypress: "isFormComplete", onkeydown: "checkEnter", onblur: "isFormComplete", components: [
{content: $L("Port")}
]},
]}
]}
]},
]}
]}

]
Expand Down Expand Up @@ -281,7 +281,7 @@ enyo.kind({
}

if (acctType === AccountWizard.POP) {
this.$.inPort.setValue((inEncryption === ProtocolSettings.SSL) ? 995 : 110)
this.$.inPort.setValue((inEncryption === ProtocolSettings.SSL) ? 995 : 110);
return;
}
}
Expand Down Expand Up @@ -376,7 +376,7 @@ enyo.kind({
return false;
}

var outPort = this.$.outPort.getValue()
var outPort = this.$.outPort.getValue();
if (outPort < 1 || outPort > 65535) {
// console.log("### invalid out ports");
return false;
Expand Down Expand Up @@ -441,7 +441,7 @@ enyo.kind({
}
this.$.createButton.setActive(true);
var toUse = this.makeAccountJson();
toUse.dontValidate = dontValidate // used for forcing account creation
toUse.dontValidate = dontValidate; // used for forcing account creation
var successCall = !!this.isEditMode ? this.handleSaveAccount : this.createSuccess;
var failCall = this.createError;
this.wizard.accountValidateManual(toUse, successCall, failCall);
Expand Down Expand Up @@ -470,10 +470,10 @@ enyo.kind({
port: this.$.outPort.getValue(),
server: this.$.outHost.getValue(),
password: this.$.outPassword.getValue(),
username: this.$.outUser.getValue(),
username: this.$.outUser.getValue()
}
}
}
};

// Add protocol-specific stuff
if (this.account.getType() === AccountWizard.IMAP && this.isEditMode) {
Expand Down
6 changes: 0 additions & 6 deletions com.palm.app.email/accounts/source/ProtocolSettings.js
Expand Up @@ -16,12 +16,6 @@
//
// LICENSE@@@

/*global Mojo, $L, Class, window, document, PalmSystem, AppAssistant, palmGetResource, Foundations, _,
App, console, Throttler, $H, $A, Event, $break, Element,
Poly9, MailtoURIParser,
EmailFlags, EmailRecipient, EmailAppDepot, AccountpreferencesAssistant, Email, EmailAccount, EmailDecorator,
AccountWizard, EmailAccountValidation */

/**ProtocolSettings: {
name : accountName
Expand Down
4 changes: 2 additions & 2 deletions com.palm.app.email/accounts/source/SimpleConfig.js
Expand Up @@ -74,7 +74,7 @@ enyo.kind({
{ name: "createButton", kind: "ActivityButton", caption: $L("Sign In"), onclick: "validateAccount", className: "enyo-button-dark"},
{ name: "manualButton", showing: false, kind: "Button", caption: $L("Manual Setup"), onclick: "manualSetup"},
{ name: "removeButton", showing: false, kind: "Accounts.RemoveAccount", onAccountsRemove_Done: "doRemovalDone"}
]},
]}
]},
{className: "accounts-footer-shadow"},
{kind: "Toolbar", className: "enyo-toolbar-light", components: [
Expand Down Expand Up @@ -208,7 +208,7 @@ enyo.kind({
emailAddress: this.$.email.getValue(),
password: this.$.password.getValue(),
easUser: ((this.account.getType() === AccountWizard.EAS) ? this.$.username.getValue() : undefined)
}
};

this.wizard.determineAccountSettings(wizardPkg, this.createSuccess.bind(this), this.createError.bind(this));
/*
Expand Down
19 changes: 9 additions & 10 deletions com.palm.app.email/app/compose/ComposeWindow.js
Expand Up @@ -16,9 +16,6 @@
//
// LICENSE@@@

/*global enyo, window, console, mail, EmailApp, Email, EmailRecipient, setTimeout, $L
*/

// FIXME ComposeWindow needs to be refactored to make logic more transparent/maintainable

enyo.string.isBlankRegExp = /^\s*$/;
Expand Down Expand Up @@ -82,7 +79,7 @@ enyo.kind({
kind: "VFlexBox",
className: "basic-back",
statics: {
kForwardDraftDelimiter: "<span id='FORWARD_DRAFT_TEXT' class='display:none'></span>",
kForwardDraftDelimiter: "<span id='FORWARD_DRAFT_TEXT' class='display:none'></span>"
},
published: {
draftIsDirty: false,
Expand All @@ -100,7 +97,7 @@ enyo.kind({
{name: "otherMenu", kind: "Menu", lazy: false, components: [
{name: "priorityMenuItem", caption: $L("Mark as High Priority"), onclick: "priorityMenuItemClicked"},
{name: "saveAsDraftMenuItem", caption: $L("Save As Draft"), onclick: "saveDraftClicked"},
{name: "discardMessageMenuItem", caption: $L("Discard Message"), onclick: "discardMessage"},
{name: "discardMessageMenuItem", caption: $L("Discard Message"), onclick: "discardMessage"}
]}
]},
{name: "attachButton", className: "attachment-button", kind: "CustomButton", onclick: "attachClick", style: "", components: []},
Expand All @@ -117,7 +114,7 @@ enyo.kind({
{name: "composeScroller", className: "compose-scroller", style: "background-color: white;", kind: "Scroller", accelerated: false, height: "100%", flex: "1", onscroll: "scrollerScroll", components: [
{kind: "VFlexBox", components: [
{kind: "VFlexBox", className: "compose-header", style: "background-color: #f1f1f1;", components: [
{className: "enyo-row", className: "dotted-bottom", components: [
{className: "enyo-row dotted-bottom", components: [
{kind: "HFlexBox", height: "54px", style: "padding: 0 14px;", components: [
{name: "fromLabel", className: "compose-to-text", style: "line-height:54px;margin-right:4px;", content: $L("from:")},
{name: "from", kind: "ListSelector", style: "font-size:16px;", onChange: "senderAccountChanged", flex: 1, value: 0, items: []}
Expand All @@ -138,15 +135,15 @@ enyo.kind({
{name: "subjectInput", style: "font-size:16px;", kind: "Input", className: "enyo-middle", flex: 1, onkeydown: "subjectKeydown", tabIndex: 40, oninput: "changeHandler"},
{name: "priorityFlag", kind: "Image", src: "../images/compose-priority-flag.png", className: "compose-red-flag"}
]}
]},
]}
]},
{name: "attachments", kind: "AttachmentsDrawer", className: "compose-attachments-drawer", composeMode: true, collapsible: true, onAttachmentsRemoved: "handleAttachmentsRemoved"},
{name: "bodyContainer", style: " background-color: white; ", components: [
{name: "bodyInput", kind: "RichText", hint: "", placeholderClassName: "", flex: 1, styled: false, tabIndex: 50, style: "padding:14px 14px 0px 14px; min-height: 75px; background-color: white;font-size:16px;", oninput: "changeHandler"},
{name: "originalMessageBody", kind: "RichText", hint: "", placeholderClassName: "", styled: false, showing: false, flex: 1, style: "padding:0px 14px 14px 14px; background-color: white;", oninput: "changeHandler"},
{name: "originalMessageBody", kind: "RichText", hint: "", placeholderClassName: "", styled: false, showing: false, flex: 1, style: "padding:0px 14px 14px 14px; background-color: white;", oninput: "changeHandler"}
]}
]}
]},
]}
]},
{kind: "FilePicker", allowMultiSelect: true, onPickFile: "attachFiles"}
]},
Expand Down Expand Up @@ -195,11 +192,13 @@ enyo.kind({
// Uncomment the ApplicationEvents component when removing this workaround.
var that = this,
$$ = this.$;

var unloadFunc = function (e) {
console.info("WINLOG: Compose window UNLOAD: " + window.name);
that.unloadHandler(e);
window.removeEventListener('unload', unloadFunc);
}
};

window.addEventListener('unload', unloadFunc);

this.populateMessage(enyo.windowParams);
Expand Down
5 changes: 1 addition & 4 deletions com.palm.app.email/app/compose/Composition.js
Expand Up @@ -16,9 +16,6 @@
//
// LICENSE@@@

/*global enyo, console, mail, EmailApp, EmailRecipient, $L
*/

EmailApp = EmailApp || {};

/*
Expand Down Expand Up @@ -849,7 +846,7 @@ EmailApp.Composition.prototype = {
// NOTE: must not contain any "undefined" fields
var newPart = {
type: part.type || "attachment",
name: part.name || "",
name: part.name || ""
};

// Copy _id
Expand Down

0 comments on commit 2e37683

Please sign in to comment.