Added clean script to fix tabs cr/lf
authorKristian Kræmmer Nielsen <jkkn@jkkn.dk>
Wed, 26 Mar 2008 02:16:40 +0000 (03:16 +0100)
committerKristian Kræmmer Nielsen <jkkn@jkkn.dk>
Wed, 26 Mar 2008 02:16:40 +0000 (03:16 +0100)
Ran clean script, fixing tabs/crlf
Bumbed version

19 files changed:
clean_code.sh [new file with mode: 0644]
config_build.sh [changed mode: 0755->0644]
content/about.xul [changed mode: 0755->0644]
content/browser_overlay.xul [changed mode: 0755->0644]
content/options.js [changed mode: 0755->0644]
content/options.xul [changed mode: 0755->0644]
content/quickbox.js
content/quickbox.xul [changed mode: 0755->0644]
content/tv2developer.js [changed mode: 0755->0644]
content/util.js
defaults/preferences/tv2developer.js [changed mode: 0755->0644]
install.rdf [changed mode: 0755->0644]
locale/da-DK/tv2developer.dtd [changed mode: 0755->0644]
locale/da-DK/tv2developer.properties [changed mode: 0755->0644]
locale/en-US/tv2developer.dtd [changed mode: 0755->0644]
locale/en-US/tv2developer.properties [changed mode: 0755->0644]
skin/tv2developer.css [changed mode: 0755->0644]
version
webroot/index.html

diff --git a/clean_code.sh b/clean_code.sh
new file mode 100644 (file)
index 0000000..9a291cd
--- /dev/null
@@ -0,0 +1,11 @@
+#!/bin/sh
+cd `dirname $0`
+find . -type f -name '*.sh' -or -name '*.xul' -or -name '*.js' -or -name '*.properties' -or -name '*.dtd' -or -name '*.css' -or -name '*.html' -or -name '*.rdf' -or -name '*.htaccess' | while read file
+do
+    echo "Cleaning $file..."
+    dos2unix "$file"
+    expand -t 4 "$file" > "$file~"
+    mv "$file~" "$file"
+done
+
+echo "Done."
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
index af3229d..a1fa475
@@ -3,10 +3,10 @@
 <!DOCTYPE dialog SYSTEM "chrome://tv2developer/locale/tv2developer.dtd">
 <dialog
     id="tv2developer_about"
-       title="&aboutDialog.title;"
-       orient="vertical"
-       buttons="accept"
-       xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+    title="&aboutDialog.title;"
+    orient="vertical"
+    buttons="accept"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 <script type="application/x-javascript" src="chrome://browser/content/utilityOverlay.js"/>
 
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
index a438698..d6e4291
@@ -4,10 +4,10 @@
 
 <prefwindow id="tv2developer_options"
             xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-               title="&optionsDialog.title;"
-               onload="TV2Options.init()"
-               ondialogaccept="TV2Options.save()">
-               
+            title="&optionsDialog.title;"
+            onload="TV2Options.init()"
+            ondialogaccept="TV2Options.save()">
+            
   <script type="application/x-javascript" src="util.js" />
   <script type="application/x-javascript" src="options.js" />
         
index 1ecdba751722d5041d0be099589a184628fbde53..2c4164bbbc6eb72fe42111a29ccb992b1cf8a242 100644 (file)
@@ -2,21 +2,21 @@
 /* @author Kristian Kræmmer Nielsen <jkkn@tv2.dk> */
 
 var TV2DeveloperQuickBox = {
-       
-       _addCheckbox: function(here, id, label, accesskey) {
-               var radio = document.createElement('radio');
-               radio.setAttribute('id', id);
-               radio.setAttribute('label', label);
-               radio.setAttribute('accesskey', accesskey);
-               here.appendChild(radio);
-       },
-       
-       _autoChange: false,
-       _saveInitials: false, /* save the alternative initials field */
-       
-       /* assemble a final url */
-       _makeUrl: function(protocol, env, sitetype, php4, username, site, uri, dynsite) {
-         var domain;
+        
+    _addCheckbox: function(here, id, label, accesskey) {
+        var radio = document.createElement('radio');
+        radio.setAttribute('id', id);
+        radio.setAttribute('label', label);
+        radio.setAttribute('accesskey', accesskey);
+        here.appendChild(radio);
+    },
+    
+    _autoChange: false,
+    _saveInitials: false, /* save the alternative initials field */
+    
+    /* assemble a final url */
+    _makeUrl: function(protocol, env, sitetype, php4, username, site, uri, dynsite) {
+      var domain;
       // Assemble domain
       // Always remove -dyn on test and -static on live
       if (env != 'live' && site.substr(-4) == '-dyn') {
@@ -67,26 +67,26 @@ var TV2DeveloperQuickBox = {
       
       return protocol + '://' + domain + uri;
     },
-       
-       /* determind if action requires us to create a site URL */ 
-       _shouldMakeURL: function(action) {
-           switch (action) {
-              case 'go-site':
-              case 'go-tango-page':
-              case 'go-tango-requeue':
-              case 'go-dynamic':
-              case 'go-viewcvs':
-              case 'go-pdolog':
-              return true;
-              default:
-              return false;
-           }
-       },
-       
-       /* Change action manually */
-       setManuel: function(target) {
+    
+    /* determind if action requires us to create a site URL */ 
+    _shouldMakeURL: function(action) {
+        switch (action) {
+           case 'go-site':
+           case 'go-tango-page':
+           case 'go-tango-requeue':
+           case 'go-dynamic':
+           case 'go-viewcvs':
+           case 'go-pdolog':
+           return true;
+           default:
+           return false;
+        }
+    },
+    
+    /* Change action manually */
+    setManuel: function(target) {
         var action = document.getElementById('action').selectedItem.id;
-           var makeSiteURL = this._shouldMakeURL(action);
+        var makeSiteURL = this._shouldMakeURL(action);
         var environment = document.getElementById('environment').selectedItem;
         if (target.id == 'environment') {
             document.getElementById('testname').disabled = (target.selectedItem.id != 'othertest');
@@ -103,16 +103,16 @@ var TV2DeveloperQuickBox = {
         }
         document.getElementById('php4site').disabled = (!makeSiteURL || action == 'go-pdolog' || action == 'go-viewcvs')
                                                       || (environment && environment.id == 'live');
-           if (!this._autoChange) { /* avoid updating if this was triggered by updateQuickbox() */
-               if (target.id == 'testname' &&
-                   document.getElementById('environment').selectedItem.id != 'othertest') {
-                       document.getElementById('environment').selectedItem =
-                           document.getElementById('othertest');
-               }
-               this.updateQuickbox(true);
-               document.getElementById('shorturl').focus();
-           }
-       },
+        if (!this._autoChange) { /* avoid updating if this was triggered by updateQuickbox() */
+            if (target.id == 'testname' &&
+                document.getElementById('environment').selectedItem.id != 'othertest') {
+                    document.getElementById('environment').selectedItem =
+                        document.getElementById('othertest');
+            }
+            this.updateQuickbox(true);
+            document.getElementById('shorturl').focus();
+        }
+    },
 
     _reg_nodeid: /^(?!1234$)[0-9]+$/,
     _reg_ttv: /^[0-9]{3}$/,
@@ -123,13 +123,13 @@ var TV2DeveloperQuickBox = {
     _reg_cvs_rootfolders: /^\/(((Java|build|inc|opdatering|robot|scripts|sql|template|views|php|php5|fonts|webroot)(\/|$)|\/))/,
     _sitetypes: ['opdatering', 'robot', 'template'],
     _envs:      ['test', 'snapshot'],
-       updateQuickbox: function(manual) {
-           if (!manual) manual = false;
-           var current_user = TV2Util.getPref('developer-initials');
-               var username = current_user;
-               var shorturl = document.getElementById('shorturl').value;
-               var auto_action;
-               
+    updateQuickbox: function(manual) {
+        if (!manual) manual = false;
+        var current_user = TV2Util.getPref('developer-initials');
+        var username = current_user;
+        var shorturl = document.getElementById('shorturl').value;
+        var auto_action;
+        
         var tv2 = this._reg_shortlink.exec(shorturl);
         if (tv2) {
             var protocol = tv2[2];
@@ -234,20 +234,20 @@ var TV2DeveloperQuickBox = {
                 }
             } else {
                 // determind action
-               var cur_action = document.getElementById('action').selectedItem;
-                       if (this._reg_ttv.exec(site)) {
-                       auto_action = 'go-ttv-page';
-                       } else if (this._reg_nodeid.exec(site)) {
-                       auto_action = 'go-node';
-                   } else if (this._reg_classname.exec(shorturl)) {
-                       auto_action = 'go-viewcvs';
-                   } else {
-                       // if we are using the user input as an url we keep an eventually already selected action
-                       if (!this._shouldMakeURL(cur_action.id)) {
-                           auto_action = 'go-site';
-                       } else {
-                           auto_action = cur_action.id;
-                       }
+                var cur_action = document.getElementById('action').selectedItem;
+                if (this._reg_ttv.exec(site)) {
+                    auto_action = 'go-ttv-page';
+                } else if (this._reg_nodeid.exec(site)) {
+                    auto_action = 'go-node';
+                } else if (this._reg_classname.exec(shorturl)) {
+                    auto_action = 'go-viewcvs';
+                } else {
+                    // if we are using the user input as an url we keep an eventually already selected action
+                    if (!this._shouldMakeURL(cur_action.id)) {
+                        auto_action = 'go-site';
+                    } else {
+                        auto_action = cur_action.id;
+                    }
                 }
                 // set options
                 env = auto_env;
@@ -435,9 +435,9 @@ var TV2DeveloperQuickBox = {
             
             document.getElementById('tv2developer_quickbox').getButton('accept').disabled = !validState;
         }
-       },
-       
-       /* method to extract short url */
+    },
+    
+    /* method to extract short url */
     _reg_fromviewcvs: /^http:\/\/viewcvs\.tv2.dk:7467\/cgi-bin\/viewvc\.cgi\/(([^/.]+)(?:\.tv2\.dk)?(?:\/(?:(webroot|robot|opdatering|template\/))|(\/[^#?/]*))([^#?]*)(.*)?)?/,
     _reg_viewcvsbranch: /^\?(?:.*&)?pathrev=PHP5(?:&|$)/,
     _reg_viewcvsviewsource: /^\?(?:.*&)?view=markup(?:&|$)/,
@@ -513,33 +513,33 @@ var TV2DeveloperQuickBox = {
     },
     
     /* onload */
-       setupQuickbox: function() {
-           if (window.arguments && window.arguments[0]) {
-               this._extractURL(window.arguments[0]);
-           }
-           this.updateQuickbox();
-           document.getElementById('php4site').addEventListener('CheckboxStateChange',
-               function() { TV2DeveloperQuickBox.setManuel(this); }, false);
-           document.getElementById('php5branch').addEventListener('CheckboxStateChange',
-               function() { TV2DeveloperQuickBox.setManuel(this); }, false);
-           document.getElementById('viewsource').addEventListener('CheckboxStateChange',
-               function() { TV2DeveloperQuickBox.setManuel(this); }, false);
-           // init saved fields
-               document.getElementById('testname').value = TV2Util.getPref('alternativ-initials', '');
+    setupQuickbox: function() {
+        if (window.arguments && window.arguments[0]) {
+            this._extractURL(window.arguments[0]);
+        }
+        this.updateQuickbox();
+        document.getElementById('php4site').addEventListener('CheckboxStateChange',
+            function() { TV2DeveloperQuickBox.setManuel(this); }, false);
+        document.getElementById('php5branch').addEventListener('CheckboxStateChange',
+            function() { TV2DeveloperQuickBox.setManuel(this); }, false);
+        document.getElementById('viewsource').addEventListener('CheckboxStateChange',
+            function() { TV2DeveloperQuickBox.setManuel(this); }, false);
+        // init saved fields
+        document.getElementById('testname').value = TV2Util.getPref('alternativ-initials', '');
         // auto go (ALT+4)
-           if (window.arguments && window.arguments[1]) {
-               this.goQuickbox();
-           }
-       },
-       
-       goQuickbox: function() {
-           // init saved fields
-           if (this._saveInitials) {
-                   TV2Util.setPref('alternativ-initials', document.getElementById('testname').value);
-               }
+        if (window.arguments && window.arguments[1]) {
+            this.goQuickbox();
+        }
+    },
+    
+    goQuickbox: function() {
+        // init saved fields
+        if (this._saveInitials) {
+            TV2Util.setPref('alternativ-initials', document.getElementById('testname').value);
+        }
         window.close();
         opener.openUILink(document.getElementById('url').value, 'current', false, false, false);
         /* allow ctrl, alt, but don't google */
-       }
-       
+    }
+    
 };
old mode 100755 (executable)
new mode 100644 (file)
index 67e297b..5309f4d
@@ -3,11 +3,11 @@
 <!DOCTYPE prefwindow SYSTEM "chrome://tv2developer/locale/tv2developer.dtd">
 <dialog
     id="tv2developer_quickbox"
-       title=""
-       buttons="accept,cancel"
-       xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-       onload="TV2DeveloperQuickBox.setupQuickbox()"
-       ondialogaccept="TV2DeveloperQuickBox.goQuickbox()">
+    title=""
+    buttons="accept,cancel"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+    onload="TV2DeveloperQuickBox.setupQuickbox()"
+    ondialogaccept="TV2DeveloperQuickBox.goQuickbox()">
 <script type="application/x-javascript" src="util.js" />
 <script type="application/x-javascript" src="quickbox.js" />
 
@@ -34,8 +34,8 @@
         </radiogroup>
       </groupbox>
       <groupbox flex="1">
-       <caption label="&quickbox.environment;"/>
-       <radiogroup id="environment" onselect="TV2DeveloperQuickBox.setManuel(this)">
+        <caption label="&quickbox.environment;"/>
+        <radiogroup id="environment" onselect="TV2DeveloperQuickBox.setManuel(this)">
           <radio id="live"      label="Live site"       accesskey="l"/>
           <radio id="test"      label="Test site"       accesskey="t"/>
           <radio id="snapshot"  label="Snapshot site"   accesskey="s"/>
old mode 100755 (executable)
new mode 100644 (file)
index 67b7849..60062b8
@@ -560,18 +560,18 @@ var TV2Developer = {
         } catch(ex) {}
     },
 
-       openQuickbox: function(event, autogo) {
+    openQuickbox: function(event, autogo) {
       var startUrl = '';
       var urlbar = document.getElementById('urlbar');
       if (typeof(autogo)=='undefined') autogo = false;
       if (urlbar) {
           startUrl = urlbar.value;
       }
-           window.openDialog('chrome://tv2developer/content/quickbox.xul','tv2quickbox','modal,centerscreen,chrome,resizable=no,title=no', startUrl, autogo);
-       },
-       
-       /* Options */
-       openOptionsDialog: function(event) {
+        window.openDialog('chrome://tv2developer/content/quickbox.xul','tv2quickbox','modal,centerscreen,chrome,resizable=no,title=no', startUrl, autogo);
+    },
+    
+    /* Options */
+    openOptionsDialog: function(event) {
       var instantApply = getBoolPref("browser.preferences.instantApply", false);
       var features = "chrome,titlebar,toolbar,centerscreen" + (instantApply ? ",dialog=no" : ",modal");
       window.openDialog('chrome://tv2developer/content/options.xul', 'tv2options', features);
index fe6ab5ec43c838b8eb12072664d921dd7c37f019..92d28e0cc21abcb2dedfc6f4aad23e5cda759141 100644 (file)
-\r
-/* Utility class for TV2 Developer Plugin */\r
-/* @author Kristian Kræmmer Nielsen <jkkn@tv2.dk> */\r
-\r
-var TV2Util = {\r
-    /* string methods for localizations */\r
-    _strs: null,\r
-    get strs() {\r
-        if (!this._strs) {\r
-            \r
-            this._strs = document.getElementById('tv2developer_strings');\r
-        }\r
-        return this._strs;\r
-    },\r
-    \r
-    getStr: function(str) {\r
-        try {\r
-            return this.strs.getString(str);\r
-        } catch(e) {\r
-            alert('Missing string: ' + str);\r
-                       return '';\r
-        }\r
-    },\r
-    \r
-    /* preference functions */\r
-    _prefs: null,\r
-    get prefs() {\r
-        if (!this._prefs)\r
-            this._prefs =\r
-                Components.classes["@mozilla.org/preferences-service;1"].getService(Components.interfaces.nsIPrefService).getBranch('tv2developer.');\r
-        return this._prefs;\r
-    },\r
-    \r
-    /* default preference functions */\r
-    _defPrefs: null,\r
-    get defPrefs() {\r
-        if (!this._defPrefs)\r
-            this._defPrefs =\r
-                Components.classes["@mozilla.org/preferences-service;1"].getService(Components.interfaces.nsIPrefService).getDefaultBranch('tv2developer.');\r
-        return this._defPrefs;\r
-    },\r
-\r
-    getPref: function(name, defValue) {\r
-        const CI=Components.interfaces.nsIPrefBranch;\r
-        const prefs=this.prefs;\r
-        try {\r
-          switch(prefs.getPrefType(name)) {\r
-            case CI.PREF_STRING:\r
-              return prefs.getCharPref(name);\r
-            case CI.PREF_INT:\r
-              return prefs.getIntPref(name);\r
-            case CI.PREF_BOOL:\r
-              return prefs.getBoolPref(name);\r
-          }\r
-        } catch(e) {alert(e)}\r
-        return defValue;\r
-    },\r
-  \r
-    setPref: function(name, value) {\r
-        const prefs=this.prefs;\r
-        switch(typeof(value)) {\r
-          case 'string':\r
-              prefs.setCharPref(name, value);\r
-              break;\r
-          case 'boolean':\r
-            prefs.setBoolPref(name, value);\r
-            break;\r
-          case 'number':\r
-            prefs.setIntPref(name, value);\r
-            break;\r
-          default:\r
-            throw new Error('Unsupported type '+typeof(value)+' for preference '+name);\r
-        }\r
-    },\r
-    \r
-    hasPref: function(name) {\r
-        return this.prefs.prefHasUserValue(name);\r
-    },\r
-    \r
-    clearPref: function(name) {\r
-        this.prefs.clearUserPref(name);\r
-    },\r
-    \r
-    getDefaultPref: function(name) {\r
-        const CI=Components.interfaces.nsIPrefBranch;\r
-        const prefs=this.defPrefs;\r
-        try {\r
-          switch(prefs.getPrefType(name)) {\r
-            case CI.PREF_STRING:\r
-              return prefs.getCharPref(name);\r
-            case CI.PREF_INT:\r
-              return prefs.getIntPref(name);\r
-            case CI.PREF_BOOL:\r
-              return prefs.getBoolPref(name);\r
-          }\r
-        } catch(e) {alert(e)}\r
-        return defValue;\r
-    }\r
-    \r
-    \r
-};\r
+
+/* Utility class for TV2 Developer Plugin */
+/* @author Kristian Kræmmer Nielsen <jkkn@tv2.dk> */
+
+var TV2Util = {
+    /* string methods for localizations */
+    _strs: null,
+    get strs() {
+        if (!this._strs) {
+            
+            this._strs = document.getElementById('tv2developer_strings');
+        }
+        return this._strs;
+    },
+    
+    getStr: function(str) {
+        try {
+            return this.strs.getString(str);
+        } catch(e) {
+            alert('Missing string: ' + str);
+            return '';
+        }
+    },
+    
+    /* preference functions */
+    _prefs: null,
+    get prefs() {
+        if (!this._prefs)
+            this._prefs =
+                Components.classes["@mozilla.org/preferences-service;1"].getService(Components.interfaces.nsIPrefService).getBranch('tv2developer.');
+        return this._prefs;
+    },
+    
+    /* default preference functions */
+    _defPrefs: null,
+    get defPrefs() {
+        if (!this._defPrefs)
+            this._defPrefs =
+                Components.classes["@mozilla.org/preferences-service;1"].getService(Components.interfaces.nsIPrefService).getDefaultBranch('tv2developer.');
+        return this._defPrefs;
+    },
+
+    getPref: function(name, defValue) {
+        const CI=Components.interfaces.nsIPrefBranch;
+        const prefs=this.prefs;
+        try {
+          switch(prefs.getPrefType(name)) {
+            case CI.PREF_STRING:
+              return prefs.getCharPref(name);
+            case CI.PREF_INT:
+              return prefs.getIntPref(name);
+            case CI.PREF_BOOL:
+              return prefs.getBoolPref(name);
+          }
+        } catch(e) {alert(e)}
+        return defValue;
+    },
+  
+    setPref: function(name, value) {
+        const prefs=this.prefs;
+        switch(typeof(value)) {
+          case 'string':
+              prefs.setCharPref(name, value);
+              break;
+          case 'boolean':
+            prefs.setBoolPref(name, value);
+            break;
+          case 'number':
+            prefs.setIntPref(name, value);
+            break;
+          default:
+            throw new Error('Unsupported type '+typeof(value)+' for preference '+name);
+        }
+    },
+    
+    hasPref: function(name) {
+        return this.prefs.prefHasUserValue(name);
+    },
+    
+    clearPref: function(name) {
+        this.prefs.clearUserPref(name);
+    },
+    
+    getDefaultPref: function(name) {
+        const CI=Components.interfaces.nsIPrefBranch;
+        const prefs=this.defPrefs;
+        try {
+          switch(prefs.getPrefType(name)) {
+            case CI.PREF_STRING:
+              return prefs.getCharPref(name);
+            case CI.PREF_INT:
+              return prefs.getIntPref(name);
+            case CI.PREF_BOOL:
+              return prefs.getBoolPref(name);
+          }
+        } catch(e) {alert(e)}
+        return defValue;
+    }
+    
+    
+};
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
diff --git a/version b/version
index e3e180701e2ae694f8818779c4e28321a6b11b32..7e310bae19960a3c44b9f9095f1f95b1e4c49ad9 100644 (file)
--- a/version
+++ b/version
@@ -1 +1 @@
-0.9.8
+0.9.9
index 7b1e49cbcaf46fad211bcc05df8f3808271b6bb9..9e92d24b2d7252e95893a254c92f281a1c33cd79 100644 (file)
             <div class="center">
                 <a href="https://jkkn.dk/tv2developer/tv2developer.xpi">Install now</a>
             </div>
-           <br/>
-           <h2>Git Repository</h2>
-           <ul>
-               <li>Hent kildekoden via GIT: "<code>git clone git://git.jkkn.net/tv2developer</code>"</li>
-               <li>Se seneste ændringer via <a href=" http://git.jkkn.net/?p=tv2developer;a=summary">GitWeb</a>.</li>
+        <br/>
+        <h2>Git Repository</h2>
+        <ul>
+            <li>Hent kildekoden via GIT: "<code>git clone git://git.jkkn.net/tv2developer</code>"</li>
+        <li>Se seneste ændringer via <a href=" http://git.jkkn.net/?p=tv2developer;a=summary">GitWeb</a>.</li>
         <li>Lav dit patch via "<code>git format-patch origin</code>" og send det til <a href="mailto:jkkn@jkkn.dk">jkkn@jkkn.dk</a>.</li>
-           </ul>
+        </ul>
         </div>
     </body>
 </html>