Changeset d4e540
- Timestamp:
- Sep 10, 2018, 1:42:12 PM (4 years ago)
- Branches:
- ng_0.9
- Children:
- 2d2cb7
- Parents:
- f2a2d5
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
content/bindings/v_identity.xml
rf2a2d5 rd4e540 77 77 <method name="popupshowing"> 78 78 <body><![CDATA[ 79 virtualIdentityExtension.MyLog.debug("v_identity.xml vI_tooltipPopupset popupshowing.")79 //virtualIdentityExtension.MyLog.debug("v_identity.xml vI_tooltipPopupset popupshowing.") 80 80 if (!this._identityInfo) { 81 81 this._identityInfo = … … 87 87 "</td>" + 88 88 "</tr></table>" 89 virtualIdentityExtension.MyLog.debug("v_identity.xml added tooltip with id='" + this.elem.identityData.id.key + "'")89 //virtualIdentityExtension.MyLog.debug("v_identity.xml added tooltip with id='" + this.elem.identityData.id.key + "'") 90 90 this._tooltipBrowser.outputString = this._identityInfo; 91 91 } 92 virtualIdentityExtension.MyLog.debug("v_identity.xml vI_tooltipPopupset popupshowing done.")92 //virtualIdentityExtension.MyLog.debug("v_identity.xml vI_tooltipPopupset popupshowing done.") 93 93 ]]></body> 94 94 </method> … … 188 188 <xul:hbox> 189 189 <!--<xul:label id="msgIdentity_base_id_label" class="menu_clone-description" xbl:inherits="hidden=base_id_key_hidden" crop="right" hidden="true"/>--> 190 <xul:label id="virtualIdentityExtension_msgIdentityClone_label" class="menu_clone-description" xbl:inherits="value=description" crop="right"/> 190 <xul:label id="virtualIdentityExtension_msgIdentityClone_label" class="menu_clone-description" 191 xbl:inherits="value=description, vid" crop="right"/> 192 <xul:label id="virtualIdentityExtension_msgIdentityClone_idLabel" class="menu_clone-idDescription" 193 xbl:inherits="value=idDescription, vid" crop="right"/> 194 <!-- <xul:label class="menupopup_clone-smtp virtualIdentityExtension_debug_interface" 195 xbl:inherits="value=smtp,style=smtpStyle" crop="right"/> 196 <xul:label class="menupopup_clone-accountkey virtualIdentityExtension_debug_interface" 197 xbl:inherits="value=accountkey" crop="right"/> 198 <xul:label class="menupopup_clone-identitykey virtualIdentityExtension_debug_interface" 199 xbl:inherits="value=identitykey" crop="right"/>--> 191 200 </xul:hbox> 192 201 <xul:spacer flex="1" /></xul:vbox> … … 224 233 <parameter name="localIdentityData" /> 225 234 <body><![CDATA[ 226 //var existingItem = this._isExistingCloneMenuItem(localIdentityData);227 var existingItem = localIdentityData.isExistingIdentity();235 var existingItem = this._isExistingCloneMenuItem(localIdentityData); 236 // var existingItem = localIdentityData.isExistingIdentity(); 228 237 if (!existingItem) { 229 238 var MenuItem = document.createElement("menuitem"); … … 261 270 <setter><![CDATA[ 262 271 virtualIdentityExtension.MyLog.debug("v_identity.xml selectedMenuItem setter. " + val) 272 if (val) { 273 // remove previous selected MenuItem, else a change to the same Item won't takeOver all settings 274 this.setSelectionInternal(null); 263 275 264 if (typeof(val) == "object") this.selectedItem = val 265 else if (val == "default") 266 this.selectedItem = this._getMenuItemForIdentity(this._AccountManager.defaultAccount.defaultIdentity.key) 267 else this.selectedItem = this._getMenuItemForIdentity(val) 268 269 this._identityDataStorage.takeOverAvailableData(this.selectedItem.identityData); 270 271 LoadIdentity(); 276 if (typeof(val) == "object") this.selectedItem = val 277 else if (val == "default") 278 this.selectedItem = this._getMenuItemForIdentity(this._AccountManager.defaultAccount.defaultIdentity.key) 279 else this.selectedItem = this._getMenuItemForIdentity(val) 280 281 this._identityDataStorage.takeOverAvailableData(this.selectedItem.identityData); 282 283 LoadIdentity(); 284 } 272 285 ]]></setter> 273 286 </property> … … 275 288 <parameter name="localIdentityData" /> 276 289 <body><![CDATA[ 290 //virtualIdentityExtension.MyLog.debug("v_identity.xml _isExistingCloneMenuItem " + localIdentityData.id) 277 291 var MenuItems = this._popupElem.childNodes 278 292 for (var j = 0; j < MenuItems.length; j++) { 279 if (!MenuItems[j].identityKey) continue; 280 if (MenuItems[j].identityData.equals(localIdentityData)) return MenuItems[j]; 281 } 293 if (MenuItems[j].command == "cmd_customizeFromAddress" || 294 MenuItems[j].tagName == "menuseparator") 295 continue; 296 297 if (MenuItems[j].identityData.equals(localIdentityData)) { 298 virtualIdentityExtension.MyLog.debug("v_identity.xml _isExistingCloneMenuItem found: " + MenuItems[j].value); 299 return MenuItems[j]; 300 } 301 } 302 virtualIdentityExtension.MyLog.debug("v_identity.xml _isExistingCloneMenuItem didn't found: " + localIdentityData.email); 282 303 return null; 283 304 ]]></body> … … 322 343 <property name="identityData"> 323 344 <getter><![CDATA[ 324 virtualIdentityExtension.MyLog.debug("v_identity.xml identityData getter")345 //virtualIdentityExtension.MyLog.debug("v_identity.xml identityData getter") 325 346 if (this._identityDataStorage) { 326 347 this._identityDataStorage.extras.getValuesFromEnvironment(); // update with current data … … 352 373 353 374 <binding id="fromPopupItem_new" extends="chrome://global/content/bindings/menu.xml#menuitem"> 354 <content excludes="template,observes,menupopup">375 <content class="vI_menupopupItem" excludes="template,observes,menupopup"> 355 376 <xul:image class="menupopup_clone-icon" xbl:inherits="src"/> 356 377 <xul:label class="menupopup_clone-text" xbl:inherits="value=label,accesskey,crop" crop="right" flex="1"/> 357 <xul:label value="&vident.accPane.prettyName.prefix; " class="menupopup_clone-vid virtIdLabel" vid="false" xbl:inherits="vid" crop="right"/>378 <xul:label value="&vident.accPane.prettyName.prefix; - " class="menupopup_clone-vid virtIdLabel" vid="false" xbl:inherits="vid" crop="right"/> 358 379 <xul:label class="menupopup_clone-description" xbl:inherits="value=description" crop="right"/> 359 <!--<xul:label class="menupopup_clone-smtp" xbl:inherits="value=smtp,style=smtpStyle" crop="right"/>--> 380 <xul:label class="menupopup_clone-idDescription" xbl:inherits="value=idDescription" crop="right"/> 381 <!-- <xul:label class="menupopup_clone-smtp virtualIdentityExtension_debug_interface" xbl:inherits="value=smtp,style=smtpStyle" crop="right"/> 382 <xul:label class="menupopup_clone-accountkey virtualIdentityExtension_debug_interface" xbl:inherits="value=accountkey" crop="right"/> 383 <xul:label class="menupopup_clone-identitykey virtualIdentityExtension_debug_interface" xbl:inherits="value=identitykey" crop="right"/>--> 360 384 </content> 361 385 <implementation> … … 397 421 398 422 399 virtualIdentityExtension.MyLog.debug("v_identity.xml fromPopupItem_new set identityData");423 //virtualIdentityExtension.MyLog.debug("v_identity.xml fromPopupItem_new set identityData"); 400 424 this._identityData = val; 401 425 … … 407 431 this._setAttributeIfNotEmpty("value", this._identityData.combinedName); 408 432 this._setAttributeIfNotEmpty("smtp", this._identityData.id.smtpServerName); 409 this._setAttributeIfNotEmpty("description", ""); 433 this._setAttributeIfNotEmpty("description", this._identityData.id.accountIncomingServerPrettyName); 434 this._setAttributeIfNotEmpty("idDescription", this._identityData.id.value); 410 435 411 436 412 437 this.setAttribute("vid", this._identityData.isExistingIdentity()?"false":"true"); 413 438 414 virtualIdentityExtension.MyLog.debug("v_identity.xml fromPopupItem_new set identityData done.");439 //virtualIdentityExtension.MyLog.debug("v_identity.xml fromPopupItem_new set identityData done."); 415 440 ]]></setter> 416 441 <getter><![CDATA[
Note: See TracChangeset
for help on using the changeset viewer.