Changeset d5349d
- Timestamp:
- Oct 15, 2014, 4:27:45 PM (6 years ago)
- Branches:
- ng_0.9
- Children:
- 162a67
- Parents:
- 71a4b1
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
content/prefDialog/vI_prefDialog_FolderPicker.js
r71a4b1 rd5349d 60 60 var tmplFolderPickerId = "msgStationeryFolderPicker"; 61 61 62 63 // patch for https://bugzilla.mozilla.org/show_bug.cgi?id=889022, see there 64 if (Components.classes["@mozilla.org/xre/app-info;1"].getService(Components.interfaces.nsIXULAppInfo).ID != "postbox@postbox-inc.com") 65 { 66 Components.utils.import("resource:///modules/MailUtils.js"); 67 } 68 69 if (typeof(GetMsgFolderFromUri) != "function") { 70 function GetMsgFolderFromUri(uri, checkFolderAttributes) 71 { 72 let msgfolder = null; 73 if (typeof MailUtils != 'undefined') { 74 return MailUtils.getFolderForURI(uri, checkFolderAttributes); 75 } 76 try { // Postbox 77 let resource = GetResourceFromUri(uri); 78 msgfolder = resource.QueryInterface(Components.interfaces.nsIMsgFolder); 79 if (checkFolderAttributes) { 80 if (!(msgfolder && (msgfolder.parent || msgfolder.isServer))) { 81 msgfolder = null; 82 } 83 } 84 } 85 catch (ex) { 86 //dump("failed to get the folder resource\n"); 87 } 88 return msgfolder; 89 } 62 var _GetMsgFolderFromUri = function(uri, checkFolderAttributes) 63 { 64 let msgfolder = null; 65 if (typeof MailUtils != 'undefined') { 66 return MailUtils.getFolderForURI(uri, checkFolderAttributes); 67 } 68 try { // Postbox 69 let resource = GetResourceFromUri(uri); 70 msgfolder = resource.QueryInterface(Components.interfaces.nsIMsgFolder); 71 if (checkFolderAttributes) { 72 if (!(msgfolder && (msgfolder.parent || msgfolder.isServer))) { 73 msgfolder = null; 74 } 75 } 76 } 77 catch (ex) { 78 //dump("failed to get the folder resource\n"); 79 } 80 return msgfolder; 90 81 } 91 82 92 function setDefaultCopiesAndFoldersPrefs(identity, server, accountData)83 var setDefaultCopiesAndFoldersPrefs = function(identity, server, accountData) 93 84 { 94 85 var am = Components.classes["@mozilla.org/messenger/account-manager;1"].getService(Components.interfaces.nsIMsgAccountManager); … … 112 103 113 104 114 function onInitCopiesAndFolders()105 var onInitCopiesAndFolders = function() 115 106 { 116 107 SetSpecialFolderNamesWithDelims(); … … 141 132 142 133 // Initialize the picker mode choices (account/folder picker) into global vars 143 function SetGlobalRadioElemChoices()134 var SetGlobalRadioElemChoices = function() 144 135 { 145 136 var pickerModeElement = document.getElementById("VIdent_identity.fccFolderPickerMode"); … … 165 156 * preferences file. 166 157 */ 167 function SetFolderDisplay(pickerMode, disableMode,158 var SetFolderDisplay = function(pickerMode, disableMode, 168 159 radioElemPrefix, 169 160 accountPickerId, … … 231 222 // Create a set of global special folder vars to be suffixed to the 232 223 // server URI of the selected account. 233 function SetSpecialFolderNamesWithDelims()224 var SetSpecialFolderNamesWithDelims = function() 234 225 { 235 226 var folderDelim = "/"; … … 241 232 } 242 233 243 function onSaveCopiesAndFolders()234 var onSaveCopiesAndFolders = function() 244 235 { 245 236 vI.SaveFolderSettings( gFccRadioElemChoice, … … 269 260 270 261 // Check the Fcc Self item and setup associated picker state 271 function setupFccItems()262 var setupFccItems = function() 272 263 { 273 264 var broadcaster = document.getElementById("VIdent_broadcaster_doFcc"); … … 285 276 286 277 // Set up picker settings for Sent Folder 287 function SetupFccPickerState(pickerMode, accountPickerId, folderPickerId)278 var SetupFccPickerState = function(pickerMode, accountPickerId, folderPickerId) 288 279 { 289 280 switch (pickerMode) { … … 308 299 309 300 // Enable and disable pickers based on the radio element clicked 310 function SetPickerEnabling(enablePickerId, disablePickerId)301 var SetPickerEnabling = function(enablePickerId, disablePickerId) 311 302 { 312 303 var activePicker = document.getElementById(enablePickerId); … … 318 309 319 310 // Set radio element choices and picker states 320 function setPickersState(enablePickerId, disablePickerId, event)311 var setPickersState = function(enablePickerId, disablePickerId, event) 321 312 { 322 313 SetPickerEnabling(enablePickerId, disablePickerId); … … 365 356 // This routine is to restore the correct radio element 366 357 // state when the fcc self checkbox broadcasts the change 367 function SetRadioButtons(selectPickerId, unselectPickerId)358 var SetRadioButtons = function(selectPickerId, unselectPickerId) 368 359 { 369 360 var activeRadioElem = document.getElementById(selectPickerId); … … 377 368 vI.gTmplRadioElemChoice = gTmplRadioElemChoice; 378 369 370 // patch for https://bugzilla.mozilla.org/show_bug.cgi?id=889022, see there 371 Components.utils.import("resource:///modules/MailUtils.js"); 372 if (typeof(GetMsgFolderFromUri) != "function") { 373 var GetMsgFolderFromUri = _GetMsgFolderFromUri; 374 } 375 379 376 }}); -
content/prefDialog/vI_prefDialog_TB3FolderPicker.js
r71a4b1 rd5349d 46 46 virtualIdentityExtension.ns(function() { with (virtualIdentityExtension.LIB) { 47 47 48 function InitFolderDisplays(msgFolder, accountPickerId, folderPickerId) {48 var InitFolderDisplays = function(msgFolder, accountPickerId, folderPickerId) { 49 49 var accountPicker = document.getElementById(accountPickerId); 50 50 var folderPicker = document.getElementById(folderPickerId); … … 54 54 55 55 // Initialize the folder display based on prefs values 56 function InitFolderDisplay(folder, folderPicker) {56 var InitFolderDisplay = function(folder, folderPicker) { 57 57 try { 58 58 folderPicker.firstChild.selectFolder(folder); … … 64 64 65 65 // Capture any menulist changes 66 function noteSelectionChange(radioItemId, aEvent)66 var noteSelectionChange = function(radioItemId, aEvent) 67 67 { 68 68 var checkedElem = document.getElementById(radioItemId); … … 93 93 94 94 // Save folder settings and radio element choices 95 function SaveFolderSettings(radioElemChoice,95 var SaveFolderSettings = function(radioElemChoice, 96 96 radioGroupId, 97 97 folderSuffix, -
content/vI_rdfDataTree.js
r71a4b1 rd5349d 39 39 40 40 //prepares an object for easy comparison against another. for strings, lowercases them 41 function prepareForComparison(element, field) {41 var prepareForComparison = function(element, field) { 42 42 if (field == "changedCol") { 43 43 field = "changed" … … 52 52 53 53 54 function rdfDataTree(treeType, rdfDatasource) {54 var rdfDataTree = function(treeType, rdfDatasource) { 55 55 this.treeType = treeType; 56 56 this._rdfDatasource = rdfDatasource; … … 282 282 }; 283 283 this.getCellProperties = function(row,col,props){ 284 if (rdfDataTreeCollection._braille) return; 285 var aserv=Components.classes["@mozilla.org/atom-service;1"]. 286 getService(Components.interfaces.nsIAtomService); 287 if (typeof props == 'undefined') { 288 // Requires Gecko 22 289 switch (table[row][col.id.substr(0,col.id.indexOf("_"))]) { 290 case "yes": return aserv.getAtom("yes"); break; 291 case "no": return aserv.getAtom("no"); break; 292 } 293 } else { 294 // Obsolete since Gecko 22 295 switch (table[row][col.id.substr(0,col.id.indexOf("_"))]) { 296 case "yes": props.AppendElement(aserv.getAtom("yes")); break; 297 case "no": props.AppendElement(aserv.getAtom("no")); break; 284 var returnValue = null; 285 if (!rdfDataTreeCollection._braille) { 286 var aserv=Components.classes["@mozilla.org/atom-service;1"]. 287 getService(Components.interfaces.nsIAtomService); 288 if (typeof props == 'undefined') { 289 // Requires Gecko 22 290 switch (table[row][col.id.substr(0,col.id.indexOf("_"))]) { 291 case "yes": returnValue = aserv.getAtom("yes"); break; 292 case "no": returnValue = aserv.getAtom("no"); break; 293 } 294 } else { 295 // Obsolete since Gecko 22 296 switch (table[row][col.id.substr(0,col.id.indexOf("_"))]) { 297 case "yes": props.AppendElement(aserv.getAtom("yes")); break; 298 case "no": props.AppendElement(aserv.getAtom("no")); break; 299 } 298 300 } 299 301 } 300 return "";302 return returnValue; 301 303 }; 302 304 }, … … 519 521 } 520 522 }; 523 521 524 vI.rdfDataTreeCollection = rdfDataTreeCollection; 522 525 vI.rdfDataTree = rdfDataTree; -
modules/vI_account.js
r71a4b1 rd5349d 483 483 return account._account; 484 484 }; 485 v Iaccount_cleanupSystem = account.cleanupSystem;486 v Iaccount_createAccount = account.createAccount;487 v Iaccount_removeUsedVIAccount = account.removeUsedVIAccount;485 var vIaccount_cleanupSystem = account.cleanupSystem; 486 var vIaccount_createAccount = account.createAccount; 487 var vIaccount_removeUsedVIAccount = account.removeUsedVIAccount; -
modules/vI_accountUtils.js
r71a4b1 rd5349d 55 55 function getAccountsArray() { 56 56 var accounts; 57 function sortAccounts(a, b) { 58 if (a.key == accountManager.defaultAccount.key) 59 return -1; 60 if (b.key == accountManager.defaultAccount.key) 61 return 1; 62 var aIsNews = a.incomingServer.type == "nntp"; 63 var bIsNews = b.incomingServer.type == "nntp"; 64 if (aIsNews && !bIsNews) 65 return 1; 66 if (bIsNews && !aIsNews) 67 return -1; 68 69 var aIsLocal = a.incomingServer.type == "none"; 70 var bIsLocal = b.incomingServer.type == "none"; 71 if (aIsLocal && !bIsLocal) 72 return 1; 73 if (bIsLocal && !aIsLocal) 74 return -1; 75 return 0; 76 } 57 77 if (Components.utils.import("resource:///modules/folderUtils.jsm") && Components.utils.import("resource:///modules/iteratorUtils.jsm") 58 78 && typeof(allAccountsSorted)=='function') { … … 68 88 // Ugly hack to work around bug 41133. :-( 69 89 accounts = accounts.filter(function isNonSuckyAccount(a) { return !!a.incomingServer; }); 70 function sortAccounts(a, b) {71 if (a.key == accountManager.defaultAccount.key)72 return -1;73 if (b.key == accountManager.defaultAccount.key)74 return 1;75 var aIsNews = a.incomingServer.type == "nntp";76 var bIsNews = b.incomingServer.type == "nntp";77 if (aIsNews && !bIsNews)78 return 1;79 if (bIsNews && !aIsNews)80 return -1;81 82 var aIsLocal = a.incomingServer.type == "none";83 var bIsLocal = b.incomingServer.type == "none";84 if (aIsLocal && !bIsLocal)85 return 1;86 if (bIsLocal && !aIsLocal)87 return -1;88 return 0;89 }90 90 accounts.sort(sortAccounts); 91 91 }
Note: See TracChangeset
for help on using the changeset viewer.