Browse Source

browser-omni: first KM-Goanna build fixes (omni.ja dated 2017-12-17 22:47)

master
roytam1 1 year ago
parent
commit
baa701d2c9
  1. 1
      browser-omni/chrome/en-US/locale/kmprefs/kplugins/macros.properties
  2. 1
      browser-omni/chrome/en-US/locale/kmprefs/pref-privacy.dtd
  3. 5
      browser-omni/chrome/kmeleon/content/console2/console2.xml
  4. 2
      browser-omni/chrome/kmeleon/content/console2/console2.xul
  5. 2
      browser-omni/chrome/kmeleon/content/flashblock/flashblock.xml
  6. 2
      browser-omni/chrome/kmeleon/content/flashblock/version.dtd
  7. 5
      browser-omni/chrome/kmeleon/content/history/history.xul
  8. 7
      browser-omni/chrome/kmeleon/content/kmeleon/about.xhtml
  9. 1
      browser-omni/chrome/kmeleon/content/kmprefs/pref-appearance.xul
  10. 1
      browser-omni/chrome/kmeleon/content/kmprefs/pref-privacy.xul
  11. 6
      browser-omni/components/kmHelper.js

1
browser-omni/chrome/en-US/locale/kmprefs/kplugins/macros.properties

@ -2,6 +2,7 @@ custom=(user-defined)
accel=Sets keyboard and mouse accelerators
cfg=Provides acces to K-Meleon's configuration files
compat=Updates preferences to the current version of K-Meleon
compat75=Adds more compatibility with old settings
console2=Integrates the Console\u00B2 extension (enhanced error console)
docinfo=Provides document information (links, images, linked images)
domcomplete=Provides keyboard accelerators for manual domain completion

1
browser-omni/chrome/en-US/locale/kmprefs/pref-privacy.dtd

@ -9,6 +9,7 @@
<!ENTITY cookies.accept.noForeign "From the originating website only">
<!ENTITY cookies.accept.p3p "According to privacy settings">
<!ENTITY cookies.accept.never "Never (Block cookies)">
<!ENTITY cookies.accept.visited "From visited sites only">
<!ENTITY cookies.keep "Keep Cookies">
<!ENTITY cookies.keep.normally "Until time of expiration">
<!ENTITY cookies.keep.session "Until end of session">

5
browser-omni/chrome/kmeleon/content/console2/console2.xml

@ -209,9 +209,14 @@
if (aMessage.sourceLine)
{
// malformed-xml errors include their own caret -----v
if(aMessage.sourceLine.length > 100){row.setAttribute("code", aMessage.sourceLine.substring(0,100).replace(/\n\-+\^$/, "").replace(/\s/g, " ")+"/* ... */");
row.setAttribute("column", aMessage.columnNumber || 0);
row.setAttribute("errorDots", this.repeatChar(" ", (aMessage.columnNumber > 100) ? 105 : aMessage.columnNumber));
} else {
row.setAttribute("code", aMessage.sourceLine.replace(/\n\-+\^$/, "").replace(/\s/g, " "));
row.setAttribute("column", aMessage.columnNumber || 0);
row.setAttribute("errorDots", this.repeatChar(" ", aMessage.columnNumber));
}
}
if (("nsIScriptError2" in Components.interfaces &&
aMessage instanceof Components.interfaces.nsIScriptError2 &&

2
browser-omni/chrome/kmeleon/content/console2/console2.xul

@ -20,7 +20,7 @@
windowtype="global:console"
width="640" height="480"
persist="width height screenX screenY sizemode zlevel"
onload="window.sizeToContent();ConsoleStartUp();" onunload="ConsoleShutDown();"
onload="ConsoleStartUp();" onunload="ConsoleShutDown();"
onclose="return closeWindow(false);"
>
<script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"/>

2
browser-omni/chrome/kmeleon/content/flashblock/flashblock.xml

@ -118,7 +118,7 @@ function flashblockIsWhitelisted(node, type) {
var evt = type == "silverlight" ? "silverblockCheckLoad" : "flashblockCheckLoad";
flashblockEvent.initEvent(evt, true, true);
node.dispatchEvent(flashblockEvent);
if(flashblockEvent.getPreventDefault() || node.hasAttribute("data-flashblockWhitelisted")) {
if(flashblockEvent.defaultPrevented || node.hasAttribute("data-flashblockWhitelisted")) {
// Whitelisted
return true;
}

2
browser-omni/chrome/kmeleon/content/flashblock/version.dtd

@ -1 +1 @@
<!ENTITY extension.version "1.5.17">
<!ENTITY extension.version "1.5.20">

5
browser-omni/chrome/kmeleon/content/history/history.xul

@ -9,12 +9,9 @@
%viewSourceDTD;
]>
<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
orient="vertical"
title="&window.title;"
windowtype="kmeleon:history"
height="550px"
width="440px"
onload="window.sizeToContent();HistorySidebarInit();"
onload="HistorySidebarInit();"
onclose="SidebarUtils.setMouseoverURL('');">
<script type="application/javascript" src="chrome://history/content/sidebarUtils.js"/>
<script type="application/javascript" src="chrome://history/content/history.js"/>

7
browser-omni/chrome/kmeleon/content/kmeleon/about.xhtml

@ -8,8 +8,8 @@
<!ENTITY home "http://kmeleon.sourceforge.net/">
<!ENTITY faq "&home;wiki/FAQ">
<!ENTITY kmYear "2015">
<!ENTITY notes "&home;wiki/ReleaseNotes75">
<!ENTITY kmYear "2017">
<!ENTITY notes "&home;wiki/ReleaseNotesGoanna">
<!ENTITY contrib "Contributors">
<!ENTITY copyright "Copyright &copy;">
@ -96,6 +96,8 @@
<div id="creditsScrollBox">
<div id="dummy1"></div>
<ul class="credits">
<!-- Goanna build -->
<li>Roy Tam</li>
<!-- 1.0+ -->
<li>Dorian Boissonnade</li>
<!-- 1.0, 1.1, 1.5 -->
@ -143,6 +145,7 @@
This Mozilla Copyright notice must stay untouched!
You are not allowed to remove or modify this notice.
--><li>Portions of this software are &copyright; <span id="mozYear">1998-&kmYear;</span> by <a href="http://www.mozilla.org/credits/">&contrib;</a> to the <a href="http://www.mozilla.org/">Mozilla</a> codebase under the <a href="https://www.mozilla.org/MPL/2.0/">Mozilla Public License</a> and <a href="http://www.mozilla.org/MPL/NPL-1.1.html">Netscape Public License</a>. &allrights;</li>
<li>Portions of this software are &copyright; <span id="mozYear">2009-&kmYear;</span> by <a href="http://www.palemoon.org/info.shtml">&contrib;</a> to the <a href="http://www.palemoon.org/">Moonchild Productions</a> codebase under the <a href="https://www.mozilla.org/MPL/2.0/">Mozilla Public License</a> and <a href="http://www.mozilla.org/MPL/NPL-1.1.html">Netscape Public License</a>. &allrights;</li>
<li>Portions of this software are &copyright; 1994 The Regents of the University of California. &allrights;</li>
<li>Portions of this software are &copyright; 2000-2002 Japan Network Information Center. &allrights;</li>
<li>This software may contain portions that are &copyright; 1998-2002 <a href="http://www.supportsoft.com/">SupportSoft</a>, Inc. &allrights;</li>

1
browser-omni/chrome/kmeleon/content/kmprefs/pref-appearance.xul

@ -19,6 +19,7 @@ function init() {
initCheckbox("kmeleon.display.accelInMenus");
initCheckbox("kmeleon.favicons.show");
initCheckbox("kmeleon.favicons.titleBar");
initCheckbox("kmeleon.display.hideTitleBar");
document.getElementById("kmeleon.favicons.titleBar").disabled = !pref.getBoolPref("kmeleon.favicons.show");
initTextbox("kmeleon.display.title", false);
initTextbox("kmeleon.display.toolbars_size", false);

1
browser-omni/chrome/kmeleon/content/kmprefs/pref-privacy.xul

@ -167,6 +167,7 @@ var UserAgent = {
<radio value="2" label="&cookies.accept.never;"/>
<radio value="0" label="&cookies.accept.always;"/>
<radio value="1" label="&cookies.accept.noForeign;"/>
<radio value="3" label="&cookies.accept.visited;"/>
<vbox id="p3p" hidden="true">
<radio value="3" label="&cookies.accept.p3p;"/>
<hbox>

6
browser-omni/components/kmHelper.js

@ -9,6 +9,10 @@ Cu.import('resource://gre/modules/AddonManager.jsm');
Cu.import("resource://gre/modules/NetUtil.jsm");
Cu.import("resource://gre/modules/Log.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "UserAgentOverrides",
"resource://gre/modules/UserAgentOverrides.jsm");
XPCOMUtils.defineLazyModuleGetter(this,
"LoginManagerContent", "resource://gre/modules/LoginManagerContent.jsm");
@ -100,6 +104,7 @@ kmHelper.prototype = {
case 'kmeleon-init':
this.updatePrefs();
this.initAddon();
UserAgentOverrides.init();
Services.obs.removeObserver(this, 'kmeleon-init');
break;
/*case 'content-document-global-created':
@ -111,6 +116,7 @@ kmHelper.prototype = {
Services.obs.removeObserver(this, 'content-document-global-created');
break;*/
case 'xpcom-shutdown' :
UserAgentOverrides.uninit();
//Services.obs.removeObserver(this, 'content-document-global-created');
Services.obs.removeObserver(this, "addon-install-blocked");
Services.obs.removeObserver(this, "addon-install-failed");

Loading…
Cancel
Save