Changeset 709

Show
Ignore:
Timestamp:
04/02/08 21:28:11 (8 months ago)
Author:
singpoly..@gmail.com
Message:

Works with or without GM now -- but still breaks GM (menu) a bit

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/compiler/xpi-build/browser.js

    r646 r709  
    308308  this.menuCommanders = []; 
    309309  this.currentMenuCommander = null; 
    310   GM_updateVersion(); 
     310//  GM_updateVersion(); 
    311311  GM_listen(window, "load", GM_hitch(this, "chromeLoad")); 
    312312  GM_listen(window, "unload", GM_hitch(this, "chromeUnload")); 
    …… 
    321321  this.tabBrowser = document.getElementById("content"); 
    322322  this.appContent = document.getElementById("appcontent"); 
    323   this.contextMenu = document.getElementById("contentAreaContextMenu"); 
    324   this.generalMenuEnabledItem = document.getElementById("gm-general-menu-enabled-item"); 
    325   this.toolsMenu = document.getElementById("menu_ToolsPopup"); 
    326   this.bundle = document.getElementById("gm-browser-bundle"); 
     323  this.contextMenu = {};//document.getElementById("contentAreaContextMenu"); 
     324  this.generalMenuEnabledItem = {};//document.getElementById("gm-general-menu-enabled-item"); 
     325  this.toolsMenu = {};//document.getElementById("menu_ToolsPopup"); 
     326  this.bundle = {};//document.getElementById("gm-browser-bundle"); 
    327327 
    328328  // seamonkey compat 
    329   if (!this.toolsMenu) { 
     329/*  if (!this.toolsMenu) { 
    330330    this.toolsMenu = document.getElementById("taskPopup"); 
    331   } 
     331  }*/ 
    332332 
    333333  // songbird compat 
    …… 
    419419 */ 
    420420GM_BrowserUI.onLocationChange = function(a,b,c) { 
    421   if (this.currentMenuCommander != null) { 
     421/*  if (this.currentMenuCommander != null) { 
    422422    this.currentMenuCommander.detach(); 
    423423    this.currentMenuCommander = null; 
    …… 
    430430    this.currentMenuCommander = menuCommander; 
    431431    //this.currentMenuCommander.attach(); 
    432   } 
     432  }*/ 
    433433}; 
    434434 
    …… 
    533533function GM_showGeneralPopup(aEvent) { 
    534534  // set the enabled/disabled state 
    535   GM_BrowserUI.generalMenuEnabledItem.setAttribute("checked", GM_getEnabled()); 
     535//  GM_BrowserUI.generalMenuEnabledItem.setAttribute("checked", GM_getEnabled()); 
    536536}; 
    537537 
    538538function GM_showPopup(aEvent) { 
    539   var config = new Config(); 
     539/*  var config = new Config(); 
    540540  config.load(); 
    541541  var popup = aEvent.target; 
    …… 
    581581  } 
    582582 
    583   document.getElementById("gm-status-no-scripts").collapsed = foundInjectedScript; 
     583  document.getElementById("gm-status-no-scripts").collapsed = foundInjectedScript;*/ 
    584584}; 
    585585 

  • branches/compiler/xpi-build/browser.xul

    r646 r709  
    33<!-- Note: Contains Firefox-specific overlay --> 
    44 
    5 <overlay 
     5<overlay id="overlay-XPINAME" 
    66  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> 
    77 
    …… 
    1010  <script type="application/x-javascript" src="chrome://XPINAME/content/prefmanager.js" /> 
    1111  <script type="application/x-javascript" src="chrome://XPINAME/content/convert2RegExp.js" /> 
    12   <script type="application/x-javascript" src="chrome://XPINAME/content/versioning.js" /> 
     12<!--  <script type="application/x-javascript" src="chrome://XPINAME/content/versioning.js" /> --> 
    1313  <script type="application/x-javascript" src="chrome://XPINAME/content/menucommander.js" /> 
    1414  <script type="application/x-javascript" src="chrome://XPINAME/content/xmlhttprequester.js" /> 
    1515  <script type="application/x-javascript" src="chrome://XPINAME/content/miscapis.js" /> 
    1616  <script type="application/x-javascript" src="chrome://XPINAME/content/scriptdownloader.js" /> 
    17   <script type="application/x-javascript" src="chrome://XPINAME/content/config.js" /> 
     17<!--  <script type="application/x-javascript" src="chrome://XPINAME/content/config.js" /> --> 
    1818  <script type="application/x-javascript" src="chrome://XPINAME/content/accelimation.js" /> 
    1919  <script type="application/x-javascript" src="chrome://XPINAME/content/browser.js" /> 

  • branches/compiler/xpi-build/gm2xpi.rb

    r671 r709  
    6565`cp ../license.txt ./build/` 
    6666`cp ../chrome/chromeFiles/content/accelimation.js ./build/content/` 
    67 `cp ../chrome/chromeFiles/content/config.js ./build/content/` 
     67#`cp ../chrome/chromeFiles/content/config.js ./build/content/` 
    6868`cp ../chrome/chromeFiles/content/convert2RegExp.js ./build/content/` 
    6969`cp ../chrome/chromeFiles/content/default-config.xml ./build/content/` 
    …… 
    7474`cp ../chrome/chromeFiles/content/xmlhttprequester.js ./build/content/` 
    7575`cp ../chrome/chromeFiles/content/scriptdownloader.js ./build/content/` 
    76 `cp ../chrome/chromeFiles/content/versioning.js ./build/content/` 
     76#`cp ../chrome/chromeFiles/content/versioning.js ./build/content/` 
    7777 
    7878scriptmeta = File.open('./build/content/scriptmeta.js', "w")