Changeset 344

Timestamp:

01/13/08 19:31:14 (10 months ago)

Author:

t-bone

Message:

begin replacing kabl references with tubelube

Location:

extension/tubelube/content

Files:

• tubelube-config.js (moved) (moved from extension/tubelube/content/kabl-config.js) (1 diff)
• tubelube-config.xul (moved) (moved from extension/tubelube/content/kabl-config.xul) (1 diff)
• tubelube-inserter-bindings.xml (moved) (moved from extension/tubelube/content/kabl-inserter-bindings.xml)
• tubelube-inserter.js (moved) (moved from extension/tubelube/content/kabl-inserter.js) (7 diffs)
• tubelube-overlay.js (moved) (moved from extension/tubelube/content/kabl-overlay.js)
• tubelube-overlay.xul (moved) (moved from extension/tubelube/content/kabl-overlay.xul) (3 diffs)
• tubelube-parse.js (moved) (moved from extension/tubelube/content/kabl-parse.js)
• tubelube-policy.js (moved) (moved from extension/tubelube/content/kabl-policy.js)
• tubelube-pref.js (moved) (moved from extension/tubelube/content/kabl-pref.js)
• tubelube-prefobs.js (moved) (moved from extension/tubelube/content/kabl-prefobs.js)

extension/tubelube/content/tubelube-config.js

@@ -32 +32 @@
 // ***** END LICENSE BLOCK *****
 
-function gKablConfigOpen() {
-    document.getElementById('enabled').setAttribute('checked', gKablEnabled);
-
-    var textbox=document.getElementById('rules');
-    textbox.value=gKablRules;
-    textbox.selectionStart=0;
-    textbox.selectionEnd=0;
-    textbox.focus();
-}
-
-function gKablConfigAccept() {
-    var parseOk=gKablCheckConfig();
-
-    if (!parseOk) {
-        return confirm('Parse error.\nReally save rules?');
-    }
-
-    // extract pref vals
-    gKablEnabled=document.getElementById('enabled').checked;
-    gKablRules=document.getElementById('rules').value;
-
-    gKablSave();
-
-    return true;
-}
-
-function gKablCheckConfig() {
-    var textbox=document.getElementById('rules');
-
-    var parsed=gKablRulesObj.parse(textbox.value);
-
-    if (parsed instanceof Array) {
-        textbox.selectionStart=parseInt(parsed[0]);
-        textbox.selectionEnd=parseInt(parsed[1]);
-
-        gKablSetStatusLabel('err', parsed[2]);
-    } else {
-        gKablSetStatusLabel('ok');
-    }
-
-    // return the focus here for continued editing
-    textbox.focus();
-
-    return !(parsed instanceof Array);
-}
-
-function gKablSetStatusLabel(type, msg) {
-    for (label in {'unk':1, 'ok':1, 'err':1}) {
-        document.getElementById('status_'+label).setAttribute(
-            'hidden', (label!=type)
-        );
-    }
-
-    var errmsg=document.getElementById('status_errmsg');
-    if ('err'==type) {
-        errmsg.setAttribute('value', msg);
-        errmsg.setAttribute('hidden', false);
-    } else {
-        errmsg.setAttribute('hidden', true);
-    }
-}
-
 // This function originates from AdBlock Plus, reused under MPL.
 function gKablLoadInBrowser(url) {

extension/tubelube/content/tubelube-config.xul

@@ -1 +1 @@
 <?xml version='1.0'?>
 <?xml-stylesheet href='chrome://global/skin/global.css' type='text/css'?>
-<?xml-stylesheet href='chrome://kabl/skin/kabl-config.css' type='text/css'?>
-<dialog title='Karma Blocker - Configuration'
+<prefwindow
     xmlns='http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul'
-    buttons='accept,cancel,extra2'
-    
-    buttonlabelaccept='Save'
-    buttonlabelcancel='Cancel'
-    buttonlabelextra2='Help'
+    title='Tube Lube Options'
+    type='prefwindow' 
+>
+<prefpane>
+    <preferences>
+        <preference id='enabled' name='extensions.tubelube.enabled' type='bool'/>
+    </preferences>
 
-    onload='return gKablConfigOpen();'
-    ondialogaccept='return gKablConfigAccept();'
-    ondialogcancel='return true;'
-    ondialogextra2='gKablLoadInBrowser("http://trac.arantius.com/wiki/Extensions/KarmaBlocker");'
-
-    id='kabl-config-dialog'
-    persist="screenX screenY width height sizemode"
->
-<script type='application/javascript' src='chrome://kabl/content/kabl-config.js'></script>
-<script type='application/javascript' src='chrome://kabl/content/kabl-pref.js'></script>
-<script type='application/javascript' src='chrome://kabl/content/kabl-parse.js'></script>
-
-<dialogheader title='Karma Blocker' description='Configuration'/>
-
-<checkbox id='enabled' label='Enabled' />
-<textbox id='rules' cols='80' rows='15' multiline='true' flex='1' />
-
-<hbox id='status_box' align='center'>
-    <button oncommand='gKablCheckConfig();' label='Status' accesskey='S' />
-
-    <textbox id='status_line' readonly='readonly' flex='1'>
-        <label id='status_unk' value='Click button to check...' hidden='false' />
-        <label id='status_ok' value='OK' hidden='true' style='color: green;'/>
-        <label id='status_err' value='Error' hidden='true' style='color: red;' />
-        <label id='status_errmsg' value='' hidden='true' />
-    </textbox>
-
-</hbox>
-
-</dialog>
+    <vbox>
+        <checkbox label="Enabled" preference="enabled"?>
+    </vbox>
+</prefpane>
+</prefwindow>

extension/tubelube/content/tubelube-inserter.js

@@ -42 +42 @@
 ////////////////////////////////////////////////////////////////////////////////
 
-var gKablInserter={};
+var TubeLubePreLoad={};
 
-gKablInserter.initialize=function() {
-    this.browser=document.getElementById('kablInserterBrowser');
-    this.browser.addEventListener('load', gKablInserter.setup, true);
+TubeLubePreLoad.initialize=function() {
+    var browser=document.getElementById('TubeLubePreLoadBrowser');
+    browser.addEventListener('load', TubeLubePreLoad.setup, true);
 }
 
-gKablInserter.setup=function(event) {
-    gKablInserter.addObserver();
+TubeLubePreLoad.setup=function(event) {
+    TubeLubePreLoad.addObserver();
 }
 
-gKablInserter.shutdown=function() {
+TubeLubePreLoad.shutdown=function() {
     try {
         this.removeObserver();
@@ -61 +61 @@
 ////////////////////////////////////////////////////////////////////////////////
 
-gKablInserter.addObserver=function() {
+TubeLubePreLoad.addObserver=function() {
     var tabBrowser=document.getElementById('content');
-    tabBrowser.addProgressListener(gKablInserterTabProgressListener,
+    tabBrowser.addProgressListener(TubeLubePreLoadTabProgressListener,
         Components.interfaces.nsIWebProgress.NOTIFY_STATE_DOCUMENT);
 
@@ -72 +72 @@
 }
 
-gKablInserter.removeObserver=function() {
+TubeLubePreLoad.removeObserver=function() {
     var tabBrowser=document.getElementById('content');
-    tabBrowser.removeProgressListener(gKablInserterTabProgressListener);
+    tabBrowser.removeProgressListener(TubeLubePreLoadTabProgressListener);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 
-gKablInserter.attachToWindow=function(win) {
+TubeLubePreLoad.attachToWindow=function(win) {
     if ('about:blank'==win.location.href) return;
 
     var browser=this.getBrowserByWindow(win);
     if (browser && !browser.attachedKablInserter) {
-        browser.addProgressListener(gKablInserterFrameProgressListener,
+        browser.addProgressListener(TubeLubePreLoadFrameProgressListener,
             Components.interfaces.nsIWebProgress.NOTIFY_DOCUMENT);
         browser.attachedKablInserter=true;
@@ -90 +90 @@
 }
 
-gKablInserter.attachToLoadingWindow=function(win) {
+TubeLubePreLoad.attachToLoadingWindow=function(win) {
     if (!gKablEnabled) return;
     var whereFlag=false;
@@ -108 +108 @@
 }
 
-gKablInserter.getBrowserByWindow=function(win) {
+TubeLubePreLoad.getBrowserByWindow=function(win) {
     var tabBrowser=document.getElementById('content');
     for (var i=0; i<tabBrowser.browsers.length; ++i) {
@@ -120 +120 @@
 ////////////////////////////////////////////////////////////////////////////////
 
-function gKablInserterWebProgressListener() {}
-gKablInserterWebProgressListener.prototype={
+function TubeLubePreLoadWebProgressListener() {}
+TubeLubePreLoadWebProgressListener.prototype={
     stateIsRequest: false,
 
@@ -143 +143 @@
 };
 
-var gKablInserterTabProgressListener=new gKablInserterWebProgressListener();
-gKablInserterTabProgressListener.onLocationChange=function(progress, request, loc) {
+var TubeLubePreLoadTabProgressListener=new TubeLubePreLoadWebProgressListener();
+TubeLubePreLoadTabProgressListener.onLocationChange=function(progress, request, loc) {
     // Only attach to windows that are their own parent - e.g. not frames
     if (progress.DOMWindow.parent==progress.DOMWindow) {
-        gKablInserter.attachToWindow(progress.DOMWindow);
+        TubeLubePreLoad.attachToWindow(progress.DOMWindow);
     }
 }
 
-var gKablInserterFrameProgressListener=new gKablInserterWebProgressListener();
-gKablInserterFrameProgressListener.onStateChange=function(progress, request, flag, status) {
+var TubeLubePreLoadFrameProgressListener=new TubeLubePreLoadWebProgressListener();
+TubeLubePreLoadFrameProgressListener.onStateChange=function(progress, request, flag, status) {
     // When the load of the top-level page or a frame within begins
     if (flag & Components.interfaces.nsIWebProgressListener.STATE_START) {
-        gKablInserter.attachToLoadingWindow(progress.DOMWindow);
+        TubeLubePreLoad.attachToLoadingWindow(progress.DOMWindow);
     }
 }

extension/tubelube/content/tubelube-overlay.xul

@@ -1 +1 @@
 <?xml version='1.0'?>
 <overlay id='kabl-overlay' xmlns='http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul'>
-
-<script type='application/x-javascript' src='chrome://kabl/content/kabl-pref.js'></script>
-<script type='application/x-javascript' src='chrome://kabl/content/kabl-parse.js'></script>
-<script type='application/x-javascript' src='chrome://kabl/content/kabl-overlay.js'></script>
-<script type='application/x-javascript' src='chrome://kabl/content/kabl-inserter.js'></script>
 
 <!--
@@ -13 +8 @@
 <vbox id='appcontent'>
     <box >
-        <browser id='kablInserterBrowser'
-            style='-moz-binding: url("chrome://kabl/content/kabl-inserter-bindings.xml#content");'
+        <browser id='TubeLubePreLoadBrowser'
+            style='-moz-binding: url("chrome://tubelube/content/tubelube-preload-bindings.xml#content");'
         />
     </box>
@@ -41 +36 @@
     <key id='kabl-key-toggle'
         modifiers='control,alt'
-        key='K'
-        oncommand='gKabl.toggle();'
+        key='t'
+        oncommand='/*gKabl.toggle();*/'
     />
 </keyset>