Changeset 493

Timestamp:

2007-07-08 20:59:15 (2 years ago)

Author:

StefanoVerna

Message:

- joined remove() and restore() Filter methods code
- fixed UI refresh probles on filters preferences

Files:

• trunk/chrome/content/preferences/filtersPane.js (modified) (15 diffs)
• trunk/components/filterManager.js (modified) (4 diffs)

trunk/chrome/content/preferences/filtersPane.js

@@ -45 +45 @@
-FilterTree.prototype = {
-        reloadFilters: function() {
-                Debug.dump("reloadFilters");
-                
-                // something has changed..
@@ -95 +94 @@
-        selectFilter : function(filter) {
-                // this is the reference to our filter
-                Debug.dump("we wanna select " + filter.id);
-                var selectedFilter = this._filters.filter(function(f){return f.id==filter.id}); 
-                // if that old selected filter still exists..
@@ -101 +99 @@
-                        // let's select it
-                        this._table.view.selection.select(this._filters.indexOf(selectedFilter[0]));
-                        Debug.dump("Let's select row "+ this._filters.indexOf(selectedFilter[0]));
-                }
-        },
@@ -230 +227 @@
-                this._filterTree = new FilterTree(this._table);
-                this._table.view = this._filterTree;
-
-this._table.view.selection.select(-1
+if (this._filterTree.rowCount >= 1)
+       this._table.view.selection.select(0
-        },
-        getSelectedRow: function() {
@@ -244 +241 @@
-        onTableSelectionChange: function() {
-                var idx = this.getSelectedRow();
-                Debug.dump("onTableSelectionChange: " + idx);
-                
-                if (idx==-1) {
@@ -250 +246 @@
-                        $("filterLabel", "filterTest").forEach(function(a){a.value=""});
-                        $("filterText", "filterImage", "filterIsRegex").forEach(function(a){a.checked=false});
-                        $("restoreremovebutton").label = _('removebutton');
-                        return;
-                }
@@ -271 +266 @@
-        },
-        doCheckboxValidation : function() {
-                Debug.dump("doCheckboxValidation");
-                
-                var idx = this.getSelectedRow();
@@ -311 +305 @@
-        },
-        onIsRegexClick: function() {
-                Debug.dump("onIsRegexClick");
-                
-                var test = $("filterTest").value;
@@ -327 +320 @@
-        },
-        onCheckboxChange : function() {
-                Debug.dump("onCheckboxChange");
-                
-                this.onFilterEdit();
@@ -333 +325 @@
-        },
-        isValidFilter : function() {
-                Debug.dump("isValidFilter");
-                
-                var filter = $("filterTest").value;
@@ -346 +337 @@
-        },
-        onFilterEdit: function() {
-                Debug.dump("onFilterEdit");
-                
-                var idx = this.getSelectedRow();
@@ -372 +362 @@
-                        currentFilter.test = $("filterTest").value;
-                        
-                        Debug.dump("invalido riga e setto come filtro da salvare");
-                        this._table.treeBoxObject.invalidateRow(idx);
-                        this._lastRowEdited = idx;
@@ -378 +367 @@
-        },
-        onFinishedFilterEdit : function() {
-                Debug.dump("onFinishedFilterEdit");
-                
-                if (this._lastRowEdited != -1) {
-                        Debug.dump("salvo");
-                        this.getFilter(this._lastRowEdited).save();
-                        this._lastRowEdited = -1;
@@ -387 +374 @@
-        },
-        createFilter: function() {
-                Debug.dump("createFilter");
-                
-                var id = DTA_FilterManager.create(
@@ -398 +384 @@
-        },
-        removeFilter: function() {
-                Debug.dump("remove");
-                var currentFilter = this.getFilter(this.getSelectedRow());
-                this._table.view.selection.select(-1);

trunk/components/filterManager.js

@@ -58 +58 @@
-        LINK_FILTER: (1 << 0),
-        IMAGE_FILTER: (1 << 1),
-        
-        defaultFilters: {
-                deffilter0: {
-                        test: "/.*/i",
-                        regex: true,
-                        type: this.LINK_FILTER + this.IMAGE_FILTER
-                },
-                deffilter1: {
-                        test: "/\\.(?:z(?:ip|[0-9]{2})|r(?:ar|[0-9]{2})|jar|bz2|gz|tar|rpm)$/i",
-                        regex: true,
-                        type: this.LINK_FILTER
-                },
-                deffilter2: {
-                        test: "/\\.(?:mpeg|rm|mpe|avi|mpg|mp4|mov|divx|asf|qt|wmv|ram|m1v|m2v|rv|vob|asx)$/i",
-                        regex: true,
-                        type: this.LINK_FILTER + this.IMAGE_FILTER
-                },
-                deffilter3: {
-                        test: "/\\.(?:jp(?:e?g|e|2)|gif|png|tif|tiff|bmp|ico)$/i",
-                        regex: true,
-                        type: this.LINK_FILTER + this.IMAGE_FILTER
-                },
-                deffilter4: {
-                        test: "/\\.(?:exe|msi|dmg|bin|xpi)$/i",
-                        regex: true,
-                        type: this.LINK_FILTER
-                },
-                deffilter5: {
-                        test: "/\\.jp(e?g|e|2)$/i",
-                        regex: true,
-                        type: this.LINK_FILTER + this.IMAGE_FILTER
-                }
-        },
-
-        _modified: false,
@@ -230 +197 @@
-                        this._label = localizedLabel;
-                }
+                
-                this._test = this.getMultiBytePref(this.pref('test'));
-                this._active = this._prefs.getBoolPref(this.pref('active'));
@@ -256 +224 @@
-        },
-
+        _reset: function F_reset() {
+                // BEWARE: 1.8, no implementation for resetBranch
+                var c = {value: 0};
+                var prefs = this._prefs.getChildList(this._id, c);
+                for (var i = 0; i < c.value; ++i) {
+                        if (this._prefs.prefHasUserValue(prefs[i])) {
+                                this._prefs.clearUserPref(prefs[i]);
+                        }
+                }
+        },
+
-        // exported
-        restore: function F_restore() {
@@ -261 +240 @@
-                        throw new Components.Exception("only default filters can be restored!");
-                }
-
-
-
-
-
-
+
-        },
-
-        // exported
-        remove: function F_remove() {
-                // BEWARE: 1.8, no implementation for resetBranch
-                if (this._defFilter) {
-                        throw new Components.Exception("default filters cannot be deleted!");
-                }
-
-
-
-
-
+
-        },
-