Annotation of compactheader/www/CompactHeader-1.1.7-1.2.0.diff, revision 1.1

1.1     ! joachim.    1: diff -ru -bBw -U 10 1.1.7/chrome/CompactHeader/content/compactHeaderOverlay.js 1.2.0/chrome/CompactHeader/content/compactHeaderOverlay.js
        !             2: --- 1.1.7/chrome/CompactHeader/content/compactHeaderOverlay.js 2010-02-06 01:16:20 +0000
        !             3: +++ 1.2.0/chrome/CompactHeader/content/compactHeaderOverlay.js 2010-05-03 20:57:10 +0000
        !             4: @@ -68,21 +68,21 @@
        !             5:    var gCoheCollapsedHeaderViewMode = false;
        !             6:    var gCoheBuiltCollapsedView = false;
        !             7:    
        !             8:    /**
        !             9:     * The collapsed view: very lightweight. We only show a couple of fields.  See
        !            10:     * msgHdrViewOverlay.js for details of the field definition semantics.
        !            11:     */
        !            12:    var gCoheCollapsedHeader1LListLongAddresses = [
        !            13:      {name:"subject", outputFunction:coheOutputSubject},
        !            14:      {name:"from", useToggle:true, outputFunction:coheOutputEmailAddresses},
        !            15: -    {name:"toCcBcc", useToggle:true, outputFunction:coheOutputEmailAddresses},
        !            16: +//    {name:"toCcBcc", useToggle:true, outputFunction:coheOutputEmailAddresses},
        !            17:      {name:"date", outputFunction:coheUpdateDateValue}
        !            18:      ];
        !            19:    
        !            20:    var gCoheCollapsedHeader2LListLongAddresses = [
        !            21:      {name:"subject", outputFunction:coheOutputSubject},
        !            22:      {name:"from", useToggle:true, outputFunction:coheOutputEmailAddresses},
        !            23:      {name:"toCcBcc", useToggle:true, outputFunction:coheOutputEmailAddresses},
        !            24:      {name:"date", outputFunction:coheUpdateDateValue}
        !            25:      ];
        !            26:      
        !            27: @@ -141,28 +141,29 @@
        !            28:        // addresses to reach the cutoff valve yet then add it to the default (short) div.
        !            29:        var address = {};
        !            30:        address.emailAddress = addresses.value[index];
        !            31:        address.fullAddress = fullNames.value[index];
        !            32:        if (cohePrefBranch.getBoolPref("headersize.addressstyle")) {
        !            33:          address.displayName = address.emailAddress;
        !            34:          address.fullAddress = address.emailAddress;
        !            35:        } else {
        !            36:          address.displayName = names.value[index];
        !            37:        }
        !            38: -      if (headerEntry.useToggle)
        !            39: +      if (headerEntry.useToggle && (typeof headerEntry.enclosingBox.addAddressView == 'function')) {
        !            40:          headerEntry.enclosingBox.addAddressView(address);
        !            41: -      else
        !            42: +      } else {
        !            43:          updateEmailAddressNode(headerEntry.enclosingBox.emailAddressNode, address);
        !            44: +      }
        !            45:        index++;
        !            46:      }
        !            47:    
        !            48: -    if (headerEntry.useToggle)
        !            49: +    if (headerEntry.useToggle && (typeof headerEntry.enclosingBox.buildViews == 'function'))
        !            50:        headerEntry.enclosingBox.buildViews();
        !            51:      //OutputEmailAddresses(headerEntry, emailAddresses);
        !            52:    }
        !            53:    
        !            54:    // Now, for each view the message pane can generate, we need a global table
        !            55:    // of headerEntries. These header entry objects are generated dynamically
        !            56:    // based on the static data in the header lists (see above) and elements
        !            57:    // we find in the DOM based on properties in the header lists.
        !            58:    var gCoheCollapsedHeaderView = {};
        !            59:    
        !            60: @@ -669,35 +670,47 @@
        !            61:      org.mozdev.customizeHeaderToolbar.messenger.loadToolboxData();
        !            62:    
        !            63:      var hdrToolbox = document.getElementById("header-view-toolbox");
        !            64:      var hdrToolbar = document.getElementById("header-view-toolbar");
        !            65:      var firstPermanentChild = hdrToolbar.firstPermanentChild;
        !            66:      var lastPermanentChild = hdrToolbar.lastPermanentChild;
        !            67:      if (gCoheCollapsedHeaderViewMode) {
        !            68:        strLabel = strShowLabel;
        !            69:        var cBox = document.getElementById("collapsed2LButtonBox");
        !            70:        if (cBox.parentNode.id != hdrToolbox.parentNode.id) {
        !            71: -        var cloneToolboxPalette = hdrToolbox.palette.cloneNode(true);
        !            72: -        var cloneToolbarset = hdrToolbox.toolbarset.cloneNode(true);
        !            73: +        var cloneToolboxPalette;
        !            74: +        var cloneToolbarset;
        !            75: +        if (hdrToolbox.palette) {
        !            76: +          cloneToolboxPalette = hdrToolbox.palette.cloneNode(true);
        !            77: +        }
        !            78: +        if (hdrToolbox.toolbarset) {
        !            79: +          cloneToolbarset = hdrToolbox.toolbarset.cloneNode(true);
        !            80: +        }
        !            81:          cBox.parentNode.insertBefore(hdrToolbox, cBox);
        !            82:          hdrToolbox.palette = cloneToolboxPalette;
        !            83:          hdrToolbox.toolbarset = cloneToolbarset;
        !            84:          hdrToolbar = document.getElementById("header-view-toolbar");
        !            85:          hdrToolbar.firstPermanentChild = firstPermanentChild;
        !            86:          hdrToolbar.lastPermanentChild = lastPermanentChild;
        !            87:        }
        !            88:      } else {
        !            89:        strLabel = strHideLabel;
        !            90:        var cBox = document.getElementById("expandedHeaders");
        !            91:        if (cBox.parentNode.id != hdrToolbox.parentNode.id) {
        !            92: -        var cloneToolboxPalette = hdrToolbox.palette.cloneNode(true);
        !            93: -        var cloneToolbarset = hdrToolbox.toolbarset.cloneNode(true);
        !            94: +        var cloneToolboxPalette;
        !            95: +        var cloneToolbarset;
        !            96: +        if (hdrToolbox.palette) {
        !            97: +          cloneToolboxPalette = hdrToolbox.palette.cloneNode(true);
        !            98: +        }
        !            99: +        if (hdrToolbox.toolbarset) {
        !           100: +          cloneToolbarset = hdrToolbox.toolbarset.cloneNode(true);
        !           101: +        }
        !           102:          cBox.parentNode.appendChild(hdrToolbox);
        !           103:          hdrToolbox.palette = cloneToolboxPalette;
        !           104:          hdrToolbox.toolbarset = cloneToolbarset;
        !           105:          hdrToolbar = document.getElementById("header-view-toolbar");
        !           106:          hdrToolbar.firstPermanentChild = firstPermanentChild;
        !           107:          hdrToolbar.lastPermanentChild = lastPermanentChild;
        !           108:        }
        !           109:      }
        !           110:      
        !           111:      if (document.getElementById("hideDetailsMenu")) {
        !           112: @@ -760,21 +773,21 @@
        !           113:    }
        !           114:    
        !           115:    function addClass(el, strClass) {
        !           116:      var testnew = new RegExp('\\b'+strClass+'\\b').test(el.className);  
        !           117:      if (!testnew) {
        !           118:        el.className += el.className?' '+strClass:strClass;
        !           119:      }
        !           120:    }
        !           121:    
        !           122:    function removeClass(el, strClass) {
        !           123: -    var str = new RegExp(strClass, 'g');
        !           124: +    var str = new RegExp('(\\s|^)'+strClass+'(\\s|$)', 'g');
        !           125:      el.className = el.className.replace(str, '');
        !           126:    }
        !           127:    
        !           128:    function CoheCopyWebsiteAddress(websiteAddressNode)
        !           129:    {
        !           130:      if (websiteAddressNode)
        !           131:      {
        !           132:        var websiteAddress = websiteAddressNode.getAttribute("url");
        !           133:    
        !           134:        var contractid = "@mozilla.org/widget/clipboardhelper;1";
        !           135: diff -ru -bBw -U 10 1.1.7/chrome/CompactHeader/content/compactHeaderOverlay.xul 1.2.0/chrome/CompactHeader/content/compactHeaderOverlay.xul
        !           136: --- 1.1.7/chrome/CompactHeader/content/compactHeaderOverlay.xul        2010-02-18 21:03:32 +0000
        !           137: +++ 1.2.0/chrome/CompactHeader/content/compactHeaderOverlay.xul        2010-05-03 20:58:26 +0000
        !           138: @@ -14,21 +14,21 @@
        !           139:    %messengerDTD;
        !           140:  ]>
        !           141:  
        !           142:  <?xml-stylesheet href="chrome://CompactHeader/skin/CompactHeader.css" type="text/css"?>
        !           143:  <?xml-stylesheet href="chrome://CompactHeader-os/skin/osdef.css" type="text/css"?>
        !           144:  
        !           145:  
        !           146:  <overlay id="compactHeaderOverlay"
        !           147:           xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
        !           148:  
        !           149: -  <script type="application/javascript" src="chrome://CompactHeader/content/compactHeaderOverlay.js"/>
        !           150: +  <script type="application/javascript" src="chrome://CompactHeader-d/content/compactHeaderOverlay.js"/>
        !           151:  
        !           152:    <keyset>
        !           153:      <key id="hideDetailsKey" 
        !           154:           modifiers="shift" 
        !           155:           key="&toggleDetails.key;"
        !           156:           oncommand="org.mozdev.compactHeader.pane.coheToggleHeaderView();"/>
        !           157:    </keyset>
        !           158:  
        !           159:    <popup id="header-toolbar-context-menu">
        !           160:      <menuitem id="hidecohePreferencesButton" 
        !           161: @@ -139,25 +139,33 @@
        !           162:              <columns>
        !           163:                <column flex="0"/>
        !           164:              </columns>
        !           165:              <rows>
        !           166:                <row id="collapsed1LfromRow">
        !           167:                  <mail-multi-emailHeaderField id="collapsed1LfromBox" flex="0"/>
        !           168:                </row>
        !           169:              </rows>
        !           170:            </grid>
        !           171:          </hbox>
        !           172: +<!--
        !           173:          <grid id="collapsed1LtoCcBccOutBox" flex="1" hidden="true">
        !           174: +          <columns>
        !           175: +            <column flex="0"/>
        !           176: +            <column flex="1"/>
        !           177: +          </columns>
        !           178:            <row id="collapsed1LtoCcBccRow" align="baseline">
        !           179: +            <label id="collapsed1LtoCcBccLabel" class="headerName" 
        !           180: +                   value="&toField2.label;" control="collapsed1LtoCcBccBox"/>
        !           181:               <mail-multi-emailHeaderField id="collapsed1LtoCcBccBox" flex="1"/>
        !           182:            </row>
        !           183:          </grid>
        !           184: +-->
        !           185:          <hbox id="collapsed1LdateOutBox" align="start" pack="end" flex="0">
        !           186:            <row id="collapsed1LdateRow">
        !           187:              <label id="collapsed1LdateBox" class="dateLabel" flex="1"/>
        !           188:            </row>
        !           189:          </hbox>        
        !           190:          <header-view-button-box id="collapsed1LButtonBox" flex="0" align="start" hidden="true"/>
        !           191:        </hbox>
        !           192:        <hbox id="collapsed1LHeaderViewSecondLine" align="top" flex="1" collapsed="true">
        !           193:        </hbox>
        !           194:      </vbox>
        !           195: Only in 1.2.0/chrome/CompactHeader: content-31
        !           196: diff -ru -bBw -U 10 1.1.7/chrome/CustomizeHeaderToolbar/content/CHTDialogOverlay.js 1.2.0/chrome/CustomizeHeaderToolbar/content/CHTDialogOverlay.js
        !           197: --- 1.1.7/chrome/CustomizeHeaderToolbar/content/CHTDialogOverlay.js    2010-03-14 13:32:56 +0000
        !           198: +++ 1.2.0/chrome/CustomizeHeaderToolbar/content/CHTDialogOverlay.js    2010-03-27 15:16:20 +0000
        !           199: @@ -90,45 +90,29 @@
        !           200:      
        !           201:      overlayOnLoad();
        !           202:      CHToverlayRepositionDialog();
        !           203:  
        !           204:    }
        !           205:    
        !           206:    function CHToverlayRepositionDialog()
        !           207:    {
        !           208:      // Position the dialog so it is fully visible on the screen  
        !           209:      // (if possible)
        !           210: -    window.sizeToContent();
        !           211: -
        !           212: -    /* resize customization dialog so it fist on the screen */
        !           213: -    var maxHeight = window.screen.availHeight - window.screenX;
        !           214: -    var maxWidth  = window.screen.availWidth - window.screenY;
        !           215: -    
        !           216: -    var wH  = window.outerHeight;
        !           217: -    var wW  = window.outerWidth;
        !           218: -
        !           219: -    var newHeight = Math.min(wH, maxHeight);
        !           220: -    var newWidth  = Math.min(wW, maxWidth);
        !           221:      
        !           222:      // Seems to be necessary to get the correct dialog height/width
        !           223: +    window.sizeToContent();
        !           224:      var wH  = window.outerHeight;
        !           225:      var wW  = window.outerWidth;
        !           226:      var sH  = window.screen.height;
        !           227:      var sW  = window.screen.width;
        !           228:      var sX  = window.screenX;
        !           229:      var sY  = window.screenY;
        !           230:      var sAL = window.screen.availLeft;
        !           231:      var sAT = window.screen.availTop;
        !           232:      
        !           233: -    var maxHeight = window.screen.availHeight - window.screenX;
        !           234: -    var maxWidth  = window.screen.availWidth - window.screenY;
        !           235: -    
        !           236: -    var newX = Math.max(Math.min(sX, sW - wW), sAL);
        !           237: -    var newY = Math.max(Math.min(sY, sH - wH), sAT);
        !           238: -//    window.moveTo(newX, newY);
        !           239: -//    window.resizeTo(newWidth, newHeight);
        !           240: -    //window.moveTo(100, 100);
        !           241: -    window.resizeTo(200,200);
        !           242: +    var nX = Math.max(Math.min(sX, sW - wW), sAL);
        !           243: +    var nY = Math.max(Math.min(sY, sH - wH), sAT);
        !           244: +    window.moveTo(nX, nY);
        !           245:    }
        !           246:    
        !           247:    return pub;
        !           248:  }();
        !           249: \ No newline at end of file
        !           250: diff -ru -bBw -U 10 1.1.7/chrome/CustomizeHeaderToolbar/content/CHTMessenger.js 1.2.0/chrome/CustomizeHeaderToolbar/content/CHTMessenger.js
        !           251: --- 1.1.7/chrome/CustomizeHeaderToolbar/content/CHTMessenger.js        2010-01-29 22:44:56 +0000
        !           252: +++ 1.2.0/chrome/CustomizeHeaderToolbar/content/CHTMessenger.js        2010-05-02 22:19:36 +0000
        !           253: @@ -37,49 +37,194 @@
        !           254:  #
        !           255:  # ***** END LICENSE BLOCK *****
        !           256:  */
        !           257:  
        !           258:  if(!org) var org={};
        !           259:  if(!org.mozdev) org.mozdev={};
        !           260:  if(!org.mozdev.customizeHeaderToolbar) org.mozdev.customizeHeaderToolbar = {};
        !           261:  
        !           262:  org.mozdev.customizeHeaderToolbar.messenger = function(){
        !           263:    var pub = {};
        !           264: -      pub.CHTOnLoadMessenger = function() {
        !           265: -    pub.saveToolboxData();
        !           266: -    OnLoadMessenger();
        !           267: +  
        !           268: +  pub.init = function () {
        !           269: +    var onLoadFkt = document.getElementById("messengerWindow").getAttribute("onload");
        !           270: +    if (onLoadFkt) {
        !           271: +      var strTest = new RegExp('OnLoadMessenger', 'g');;
        !           272: +      onLoadFkt = onLoadFkt.replace(strTest, 
        !           273: +        "org.mozdev.customizeHeaderToolbar.messenger.CHTLoadMessenger");
        !           274: +      document.getElementById("messengerWindow").setAttribute("onload", onLoadFkt);
        !           275: +    }
        !           276:    }
        !           277:    
        !           278:    pub.saveToolboxData = function() {
        !           279:      var hdrToolbox = document.getElementById("header-view-toolbox");
        !           280:      var hdrToolbar = document.getElementById("header-view-toolbar");
        !           281:      var saveToolbox = document.getElementById("CHTSaveToolboxData");
        !           282:      var saveToolbar = document.getElementById("CHTSaveToolbarData");
        !           283:      if (hdrToolbox && hdrToolbar && saveToolbox && saveToolbar) {
        !           284:        saveToolbar.firstPermanentChild = hdrToolbar.firstPermanentChild;
        !           285:        saveToolbar.lastPermanentChild  = hdrToolbar.lastPermanentChild;
        !           286: +      if (hdrToolbox.palette) {
        !           287:        saveToolbox.palette    = hdrToolbox.palette.cloneNode(true);
        !           288: -      saveToolbox.setAttribute("gotData", "true");
        !           289: -      if (!hdrToolbox.toolbarset) {
        !           290: -      } else {
        !           291: +      }
        !           292: +      if (hdrToolbox.toolbarset) {
        !           293:          saveToolbox.toolbarset = hdrToolbox.toolbarset.cloneNode(true);
        !           294:        }
        !           295: +      saveToolbox.setAttribute("gotData", "true");
        !           296: +    }
        !           297: +    else {
        !           298: +      saveToolbox.setAttribute("gotData", "false");
        !           299:      }
        !           300:    }
        !           301:    
        !           302:    pub.loadToolboxData = function() {
        !           303:      var hdrToolbox = document.getElementById("header-view-toolbox");
        !           304:      var hdrToolbar = document.getElementById("header-view-toolbar");
        !           305:      var saveToolbox = document.getElementById("CHTSaveToolboxData");
        !           306:      var saveToolbar = document.getElementById("CHTSaveToolbarData");
        !           307:      if (hdrToolbox && hdrToolbar && saveToolbox && saveToolbar && saveToolbox.getAttribute("gotData") == "true") {
        !           308:        hdrToolbar.firstPermanentChild = saveToolbar.firstPermanentChild;
        !           309:        hdrToolbar.lastPermanentChild = saveToolbar.lastPermanentChild;
        !           310: +      if (saveToolbox.palette) {
        !           311:        hdrToolbox.palette = saveToolbox.palette.cloneNode(true);
        !           312: +      } else {
        !           313: +      }
        !           314:        if (saveToolbox.toolbarset) {
        !           315:          hdrToolbox.toolbarset = saveToolbox.toolbarset.cloneNode(true);
        !           316:        } else {
        !           317:        }
        !           318:      } 
        !           319:    }
        !           320: +  
        !           321: +  pub.UpdateMailPaneConfig = function(aMsgWindowInitialized) {
        !           322: +    const dynamicIds = ["messagesBox", "mailContent", "threadPaneBox"];
        !           323: +    const layouts = ["standard", "wide", "vertical"];
        !           324: +    var layoutView = gPrefBranch.getIntPref("mail.pane_config.dynamic");
        !           325: +    var desiredId = dynamicIds[layoutView];
        !           326: +    document.getElementById("mailContent")
        !           327: +            .setAttribute("layout", layouts[layoutView]);
        !           328: +    var messagePane = GetMessagePane();
        !           329: +    if (messagePane.parentNode.id != desiredId) {
        !           330: +      ClearAttachmentList();
        !           331: +      var hdrToolbox = document.getElementById("header-view-toolbox");
        !           332: +      var hdrToolbar = document.getElementById("header-view-toolbar");
        !           333: +      var firstPermanentChild = hdrToolbar.firstPermanentChild;
        !           334: +      var lastPermanentChild = hdrToolbar.lastPermanentChild;
        !           335: +      var messagePaneSplitter = GetThreadAndMessagePaneSplitter();
        !           336: +      var desiredParent = document.getElementById(desiredId);
        !           337: +  
        !           338: +      // Here the message pane including the header pane is moved to the
        !           339: +      // new layout by the appendChild() method below.  As described in bug
        !           340: +      // 519956 only elements in the DOM tree are copied to the new place
        !           341: +      // whereas javascript class variables of DOM tree elements get lost.
        !           342: +      // In this case the ToolboxPalette, Toolbarset first/lastPermanentChild
        !           343: +      // are removed which results in the message header pane not being
        !           344: +      // customizable any more.  A workaround for this problem is to clone
        !           345: +      // them first and add them to the DOM tree after the message pane has
        !           346: +      // been moved.
        !           347: +      var cloneToolboxPalette;
        !           348: +      var cloneToolbarset;
        !           349: +      if (hdrToolbox.palette) {
        !           350: +        cloneToolboxPalette = hdrToolbox.palette.cloneNode(true);
        !           351: +      }
        !           352: +      if (hdrToolbox.toolbarset) {
        !           353: +        cloneToolbarset = hdrToolbox.toolbarset.cloneNode(true);
        !           354: +      }
        !           355: +  
        !           356: +      // See Bug 381992. The ctor for the browser element will fire again when we
        !           357: +      // re-insert the messagePaneBox back into the document.  But the dtor
        !           358: +      // doesn't fire when the element is removed from the document.  Manually
        !           359: +      // call destroy here to avoid a nasty leak.
        !           360: +      document.getElementById("messagepane").destroy();
        !           361: +      desiredParent.appendChild(messagePaneSplitter);
        !           362: +      desiredParent.appendChild(messagePane);
        !           363: +      hdrToolbox.palette  = cloneToolboxPalette;
        !           364: +      hdrToolbox.toolbarset = cloneToolbarset;
        !           365: +      hdrToolbar = document.getElementById("header-view-toolbar");
        !           366: +      hdrToolbar.firstPermanentChild = firstPermanentChild;
        !           367: +      hdrToolbar.lastPermanentChild = lastPermanentChild;
        !           368: +      messagePaneSplitter.orient = desiredParent.orient;
        !           369: +      if (aMsgWindowInitialized)
        !           370: +      {
        !           371: +        messenger.setWindow(null, null);
        !           372: +        messenger.setWindow(window, msgWindow);
        !           373: +        if (gDBView && GetNumSelectedMessages() == 1)
        !           374: +          gDBView.reloadMessage();
        !           375: +      }
        !           376: +    }
        !           377: +  }
        !           378: +
        !           379: +  const CHTMailPrefObserver = {
        !           380: +    observe: function(subject, topic, prefName) {
        !           381: +      // verify that we're changing the mail pane config pref
        !           382: +      if (topic == "nsPref:changed")
        !           383: +      {
        !           384: +        if (prefName == "mail.pane_config.dynamic")
        !           385: +          pub.UpdateMailPaneConfig(true);
        !           386: +      }
        !           387: +    }
        !           388: +  }
        !           389: +    
        !           390: +  pub.CHTLoadMessenger = function () {   
        !           391: +    // update the pane config before we exit onload otherwise the user may see a flicker if we poke the document   
        !           392: +    // in delayedOnLoadMessenger...
        !           393: +    pub.UpdateMailPaneConfig(false);
        !           394: +    document.loadBindingDocument('chrome://global/content/bindings/textbox.xml');
        !           395: +
        !           396: +    // Set a sane starting width/height for all resolutions on new profiles.
        !           397: +    // Do this before the window loads.
        !           398: +    if (!document.documentElement.hasAttribute("width"))
        !           399: +    {
        !           400: +      // Prefer 1024xfull height.
        !           401: +      let defaultHeight = screen.availHeight;
        !           402: +      let defaultWidth = (screen.availWidth <= 1024) ? screen.availWidth : 1024;
        !           403: +
        !           404: +      // On small screens, default to maximized state.
        !           405: +      if (defaultHeight <= 600)
        !           406: +        document.documentElement.setAttribute("sizemode", "maximized");
        !           407: +      document.documentElement.setAttribute("width", defaultWidth);
        !           408: +      document.documentElement.setAttribute("height", defaultHeight);
        !           409: +      // Make sure we're safe at the left/top edge of screen
        !           410: +      document.documentElement.setAttribute("screenX", screen.availLeft);
        !           411: +      document.documentElement.setAttribute("screenY", screen.availTop);
        !           412: +    }
        !           413: +    
        !           414: +    gPrefBranch.QueryInterface(Components.interfaces.nsIPrefBranch2);
        !           415: +    gPrefBranch.addObserver("mail.pane_config.dynamic", CHTMailPrefObserver, false);
        !           416: +    
        !           417: +    MailOfflineMgr.init();
        !           418: +    CreateMailWindowGlobals();
        !           419: +    GetMessagePane().collapsed = true;
        !           420: +    
        !           421: +    // - initialize tabmail system
        !           422: +    // Do this before LoadPostAccountWizard since that code selects the first
        !           423: +    //  folder for display, and we want gFolderDisplay setup and ready to handle
        !           424: +    //  that event chain.
        !           425: +    // Also, we definitely need to register the tab type prior to the call to
        !           426: +    //  specialTabs.openSpecialTabsOnStartup below.
        !           427: +    let tabmail = document.getElementById('tabmail');
        !           428: +    if (tabmail)
        !           429: +    {
        !           430: +      // mailTabType is defined in mailWindowOverlay.js
        !           431: +      tabmail.registerTabType(mailTabType);
        !           432: +      // glodaFacetTab* in glodaFacetTab.js
        !           433: +      tabmail.registerTabType(glodaFacetTabType);
        !           434: +      tabmail.registerTabMonitor(QuickSearchTabMonitor);
        !           435: +      tabmail.registerTabMonitor(statusMessageCountsMonitor);
        !           436: +      tabmail.openFirstTab();
        !           437: +    }
        !           438: +    
        !           439: +    // verifyAccounts returns true if the callback won't be called
        !           440: +    // We also don't want the account wizard to open if any sort of account exists
        !           441: +    if (verifyAccounts(LoadPostAccountWizard, false, AutoConfigWizard))
        !           442: +      LoadPostAccountWizard();
        !           443: +    
        !           444: +    // This also registers the contentTabType ("contentTab")
        !           445: +    specialTabs.openSpecialTabsOnStartup();
        !           446: +    
        !           447: +    window.addEventListener("AppCommand", HandleAppCommandEvent, true);
        !           448: +  } 
        !           449: +  
        !           450:    return pub;
        !           451:  }();
        !           452: \ No newline at end of file
        !           453: +
        !           454: +org.mozdev.customizeHeaderToolbar.messenger.init();
        !           455: diff -ru -bBw -U 10 1.1.7/chrome/CustomizeHeaderToolbar/content/CHTMessenger.xul 1.2.0/chrome/CustomizeHeaderToolbar/content/CHTMessenger.xul
        !           456: --- 1.1.7/chrome/CustomizeHeaderToolbar/content/CHTMessenger.xul       2010-01-29 22:44:56 +0000
        !           457: +++ 1.2.0/chrome/CustomizeHeaderToolbar/content/CHTMessenger.xul       2010-03-27 15:16:20 +0000
        !           458: @@ -37,17 +37,16 @@
        !           459:     - ***** END LICENSE BLOCK ***** -->
        !           460:  
        !           461:  <!DOCTYPE overlay [
        !           462:  ]>
        !           463:  
        !           464:  
        !           465:  <overlay id="CHTmessengerWindow"
        !           466:           xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
        !           467:    <script type="application/x-javascript" 
        !           468:            src="chrome://CustomizeHeaderToolbar/content/CHTMessenger.js"/>
        !           469: -  <window id="messengerWindow" 
        !           470: -                              onload="org.mozdev.customizeHeaderToolbar.messenger.CHTOnLoadMessenger();">
        !           471: +  <window id="messengerWindow">
        !           472:      <toolbox id="CHTSaveToolboxData" collapsed="true">
        !           473:        <toolbar id="CHTSaveToolbarData" collapsed="true"/>
        !           474:      </toolbox>
        !           475:    </window>
        !           476:  </overlay>
        !           477: diff -ru -bBw -U 10 1.1.7/chrome/CustomizeHeaderToolbar/skin/pinstripe/messageHeader.css 1.2.0/chrome/CustomizeHeaderToolbar/skin/pinstripe/messageHeader.css
        !           478: --- 1.1.7/chrome/CustomizeHeaderToolbar/skin/pinstripe/messageHeader.css       2010-02-13 11:56:22 +0000
        !           479: +++ 1.2.0/chrome/CustomizeHeaderToolbar/skin/pinstripe/messageHeader.css       2010-05-04 18:01:24 +0000
        !           480: @@ -69,20 +69,21 @@
        !           481:  }
        !           482:  
        !           483:  .hdrReplyButton > .toolbarbutton-menubutton-button {
        !           484:    -moz-appearance: none;
        !           485:    padding: 0;
        !           486:    margin: 0;
        !           487:    -moz-padding-start: 0px;
        !           488:    -moz-padding-end: 0px;
        !           489:    -moz-margin-start: 0px;
        !           490:    -moz-margin-end: 0px;
        !           491: +  padding-bottom: 2px !important;
        !           492:    min-width: 1em;
        !           493:    min-height: 1ex;
        !           494:  }
        !           495:  
        !           496:  /* The default toolbarbutton CSS makes the dropmarker really tiny in icon mode;
        !           497:   * make the click target easier to hit.
        !           498:   */
        !           499:   .hdrReplyButton > .toolbarbutton-menubutton-dropmarker {
        !           500:    -moz-margin-start: 3px;
        !           501:    -moz-margin-end: 4px;
        !           502: diff -ru -bBw -U 10 1.1.7/chrome.manifest 1.2.0/chrome.manifest
        !           503: --- 1.1.7/chrome.manifest      2010-01-03 23:05:38 +0000
        !           504: +++ 1.2.0/chrome.manifest      2010-05-02 13:18:22 +0000
        !           505: @@ -1,38 +1,42 @@
        !           506: -content   CustomizeHeaderToolbar                 chrome/CustomizeHeaderToolbar/content/
        !           507: +content   CustomizeHeaderToolbar                 chrome/CustomizeHeaderToolbar/content/                                 appversion<3.1a1pre
        !           508: +content   CustomizeHeaderToolbar                 chrome/CompactHeader/content-31/                                          appversion>=3.1b2
        !           509:  
        !           510: -skin      CustomizeHeaderToolbar     global      chrome/CustomizeHeaderToolbar/skin/global/
        !           511: -skin      CustomizeHeaderToolbar-os  classic/1.0 chrome/CustomizeHeaderToolbar/skin/global/
        !           512: -skin      CustomizeHeaderToolbar-os  classic/1.0 chrome/CustomizeHeaderToolbar/skin/gnomestripe/  os=Linux
        !           513: -skin      CustomizeHeaderToolbar-os  classic/1.0 chrome/CustomizeHeaderToolbar/skin/qute/         os=WINNT
        !           514: -skin      CustomizeHeaderToolbar-os  classic/1.0 chrome/CustomizeHeaderToolbar/skin/pinstripe/    os=Darwin
        !           515: +skin      CustomizeHeaderToolbar     global      chrome/CustomizeHeaderToolbar/skin/global/                             appversion<3.1a1pre
        !           516: +skin      CustomizeHeaderToolbar-os  classic/1.0 chrome/CustomizeHeaderToolbar/skin/global/                             appversion<3.1a1pre
        !           517: +skin      CustomizeHeaderToolbar-os  classic/1.0 chrome/CustomizeHeaderToolbar/skin/gnomestripe/  os=Linux              appversion<3.1a1pre
        !           518: +skin      CustomizeHeaderToolbar-os  classic/1.0 chrome/CustomizeHeaderToolbar/skin/qute/         os=WINNT              appversion<3.1a1pre
        !           519: +skin      CustomizeHeaderToolbar-os  classic/1.0 chrome/CustomizeHeaderToolbar/skin/pinstripe/    os=Darwin             appversion<3.1a1pre
        !           520:  
        !           521: -locale    CustomizeHeaderToolbar     en-US   chrome/CustomizeHeaderToolbar/locale/en-US/
        !           522: +locale    CustomizeHeaderToolbar     en-US   chrome/CustomizeHeaderToolbar/locale/en-US/                                appversion<3.1a1pre
        !           523:  
        !           524: -overlay chrome://messenger/content/msgHdrViewOverlay.xul chrome://CustomizeHeaderToolbar/content/CHTPaneOverlay.xul
        !           525: -overlay chrome://global/content/customizeToolbar.xul     chrome://CustomizeHeaderToolbar/content/CHTDialogOverlay.xul
        !           526: +overlay chrome://messenger/content/msgHdrViewOverlay.xul chrome://CustomizeHeaderToolbar/content/CHTPaneOverlay.xul     appversion<3.1a1pre
        !           527: +overlay chrome://global/content/customizeToolbar.xul     chrome://CustomizeHeaderToolbar/content/CHTDialogOverlay.xul   appversion<3.1a1pre
        !           528:  overlay chrome://messenger/content/messenger.xul         chrome://CustomizeHeaderToolbar/content/CHTMessenger.xul
        !           529: -style   chrome://global/content/customizeToolbar.xul     chrome://messenger/skin/messageHeader.css
        !           530: -style   chrome://global/content/customizeToolbar.xul     chrome://CustomizeHeaderToolbar/skin/messageHeader.css
        !           531: -style   chrome://global/content/customizeToolbar.xul     chrome://CustomizeHeaderToolbar-os/skin/messageHeader.css
        !           532: +style   chrome://global/content/customizeToolbar.xul     chrome://messenger/skin/messageHeader.css                      appversion<3.1a1pre
        !           533: +style   chrome://global/content/customizeToolbar.xul     chrome://CustomizeHeaderToolbar/skin/messageHeader.css         appversion<3.1a1pre
        !           534: +style   chrome://global/content/customizeToolbar.xul     chrome://CustomizeHeaderToolbar-os/skin/messageHeader.css      appversion<3.1a1pre
        !           535:  
        !           536:  content   CompactHeader                 chrome/CompactHeader/content/
        !           537: +content   CompactHeader-d               chrome/CompactHeader/content/        appversion<3.1a1pre
        !           538: +content   CompactHeader-d               chrome/CompactHeader/content-31/     appversion>=3.1b2
        !           539:  
        !           540:  skin      CompactHeader     global      chrome/CompactHeader/skin/global/
        !           541:  skin      CompactHeader-os  classic/1.0 chrome/CompactHeader/skin/common/
        !           542:  skin      CompactHeader-os  classic/1.0 chrome/CompactHeader/skin/gnome/   os=Linux
        !           543:  skin      CompactHeader-os  classic/1.0 chrome/CompactHeader/skin/windows/ os=WINNT
        !           544:  skin      CompactHeader-os  classic/1.0 chrome/CompactHeader/skin/mac/     os=Darwin
        !           545:  
        !           546:  locale    CompactHeader     en-US   chrome/CompactHeader/locale/en-US/
        !           547:  locale    CompactHeader     de-DE   chrome/CompactHeader/locale/de-DE/
        !           548:  locale    CompactHeader     it-IT   chrome/CompactHeader/locale/it-IT/
        !           549:  
        !           550: -overlay chrome://messenger/content/msgHdrViewOverlay.xul chrome://CompactHeader/content/compactHeaderOverlay.xul
        !           551: +overlay chrome://messenger/content/msgHdrViewOverlay.xul chrome://CompactHeader-d/content/compactHeaderOverlay.xul
        !           552:  overlay chrome://global/content/customizeToolbar.xul     chrome://CompactHeader/content/customizeToolbarOverlay.xul
        !           553:  style   chrome://global/content/customizeToolbar.xul     chrome://CompactHeader-os/skin/osdef.css
        !           554:  style   chrome://global/content/customizeToolbar.xul     chrome://CompactHeader/skin/CompactHeader.css
        !           555:  
        !           556:  overlay chrome://messenger/content/messageWindow.xul     chrome://CompactHeader/content/buttonsOverlay.xul
        !           557:  overlay chrome://messenger/content/messenger.xul         chrome://CompactHeader/content/buttonsOverlay.xul
        !           558:  style   chrome://global/content/customizeToolbar.xul     chrome://CompactHeader-os/skin/buttonsOverlay.css
        !           559:  
        !           560: +overlay chrome://messenger/content/messenger.xul         chrome://CompactHeader/content/messengerOverlay.xul appversion<3.1a1pre
        !           561: diff -ru -bBw -U 10 1.1.7/install.rdf 1.2.0/install.rdf
        !           562: --- 1.1.7/install.rdf  2010-02-18 21:04:52 +0000
        !           563: +++ 1.2.0/install.rdf  2010-05-04 18:01:24 +0000
        !           564: @@ -1,29 +1,29 @@
        !           565:  <?xml version="1.0" encoding="UTF-8"?>
        !           566:  
        !           567:  <RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#        !           568:         xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#        !           569:         xmlns:em="http://www.mozilla.org/2004/em-rdf#">
        !           570:  
        !           571:        <RDF:Description about="urn:mozilla:install-manifest">
        !           572:                <em:name>CompactHeader</em:name>
        !           573: -              <em:version>1.1.7</em:version>
        !           574: +              <em:version>1.2.0</em:version>
        !           575:                <em:description>Add ability to reduce header size to one or two lines. Linkify subjects in RSS feeds.</em:description>
        !           576:                <em:creator>Joachim Herb</em:creator>
        !           577:                <em:contributor>Zamula</em:contributor>
        !           578:                <em:contributor>Alex Dedul (original author of RSS Linkify Subject</em:contributor>
        !           579:      <em:optionsURL>chrome://CompactHeader/content/preferences.xul</em:optionsURL>
        !           580:                <em:homepageURL>http://compactheader.mozdev.org/</em:homepageURL>
        !           581:  
        !           582:  
        !           583:                <em:id>{58D4392A-842E-11DE-B51A-C7B855D89593}</em:id>
        !           584:                <em:type>2</em:type>
        !           585:        <em:iconURL>chrome://CompactHeader/skin/cohe-icon.png</em:iconURL>
        !           586:                <em:targetApplication>
        !           587:                        <RDF:Description>
        !           588:                                <em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
        !           589:                                <em:minVersion>3.0</em:minVersion>
        !           590: -                              <em:maxVersion>3.0.*</em:maxVersion>
        !           591: +                              <em:maxVersion>3.2a1pre</em:maxVersion>
        !           592:                        </RDF:Description>
        !           593:                </em:targetApplication>
        !           594:        </RDF:Description>
        !           595:  </RDF>

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>