[gnome-documents] filter: rename filterController.js -> filters.js
- From: Cosimo Cecchi <cosimoc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-documents] filter: rename filterController.js -> filters.js
- Date: Wed, 19 Oct 2011 23:03:38 +0000 (UTC)
commit f9a60f6c59de462079349162f0f25771a21e4b47
Author: Cosimo Cecchi <cosimoc gnome org>
Date: Thu Oct 13 18:51:45 2011 -0400
filter: rename filterController.js -> filters.js
And FilterController -> SearchFilterController, so we can add more
filters to the file.
src/Makefile-js.am | 2 +-
src/application.js | 4 ++--
src/{filterController.js => filters.js} | 8 ++++----
src/mainToolbar.js | 4 ++--
src/query.js | 4 ++--
src/trackerController.js | 7 +++----
6 files changed, 14 insertions(+), 15 deletions(-)
---
diff --git a/src/Makefile-js.am b/src/Makefile-js.am
index 3b7365f..dff929c 100644
--- a/src/Makefile-js.am
+++ b/src/Makefile-js.am
@@ -8,7 +8,7 @@ dist_js_DATA = \
embed.js \
error.js \
errorBox.js \
- filterController.js \
+ filters.js \
gDataMiner.js \
global.js \
iconView.js \
diff --git a/src/application.js b/src/application.js
index 6b8078b..c6c0101 100644
--- a/src/application.js
+++ b/src/application.js
@@ -37,7 +37,7 @@ const ChangeMonitor = imports.changeMonitor;
const Collections = imports.collections;
const Documents = imports.documents;
const Error = imports.error;
-const FilterController = imports.filterController;
+const Filters = imports.filters;
const Format = imports.format;
const Global = imports.global;
const Main = imports.main;
@@ -118,7 +118,7 @@ Application.prototype = {
Global.application = this;
Global.settings = new Gio.Settings({ schema: 'org.gnome.documents' });
Global.offsetController = new OffsetController.OffsetController();
- Global.filterController = new FilterController.FilterController();
+ Global.searchFilterController = new Filters.SearchFilterController();
Global.categoryManager = new Categories.CategoryManager();
Global.errorHandler = new Error.ErrorHandler();
diff --git a/src/filterController.js b/src/filters.js
similarity index 86%
rename from src/filterController.js
rename to src/filters.js
index 696515e..22c0113 100644
--- a/src/filterController.js
+++ b/src/filters.js
@@ -21,11 +21,11 @@
const Signals = imports.signals;
-function FilterController() {
+function SearchFilterController() {
this._init();
};
-FilterController.prototype = {
+SearchFilterController.prototype = {
_init: function() {
this._filter = '';
},
@@ -35,11 +35,11 @@ FilterController.prototype = {
return;
this._filter = filter;
- this.emit('filter-changed', this._filter);
+ this.emit('changed', this._filter);
},
getFilter: function() {
return this._filter;
}
};
-Signals.addSignalMethods(FilterController.prototype);
+Signals.addSignalMethods(SearchFilterController.prototype);
diff --git a/src/mainToolbar.js b/src/mainToolbar.js
index 5ce0d1f..dec0c06 100644
--- a/src/mainToolbar.js
+++ b/src/mainToolbar.js
@@ -126,7 +126,7 @@ MainToolbar.prototype = {
this._searchEntryTimeout = 0;
let currentText = this._searchEntry.get_text();
- Global.filterController.setFilter(currentText);
+ Global.searchFilterController.setFilter(currentText);
}));
}));
@@ -145,7 +145,7 @@ MainToolbar.prototype = {
this.widget.show_all();
- this._searchEntry.set_text(Global.filterController.getFilter());
+ this._searchEntry.set_text(Global.searchFilterController.getFilter());
},
_populateForPreview: function(model, document) {
diff --git a/src/query.js b/src/query.js
index 7a4ba1d..fb9d5cb 100644
--- a/src/query.js
+++ b/src/query.js
@@ -98,8 +98,8 @@ QueryBuilder.prototype = {
'"%s") ||' +
'fn:contains ' +
'(fn:lower-case (tracker:coalesce(nco:fullname(?creator), nco:fullname(?publisher))), ' +
- '"%s")').format(Global.filterController.getFilter(),
- Global.filterController.getFilter());
+ '"%s")').format(Global.searchFilterController.getFilter(),
+ Global.searchFilterController.getFilter());
return filter;
},
diff --git a/src/trackerController.js b/src/trackerController.js
index 1fc5ee7..94cf8b1 100644
--- a/src/trackerController.js
+++ b/src/trackerController.js
@@ -55,9 +55,8 @@ TrackerController.prototype = {
this._offsetController.connect('offset-changed',
Lang.bind(this, this._performCurrentQuery));
- this._filterController = Global.filterController;
- this._filterController.connect('filter-changed',
- Lang.bind(this, this._onFilterChanged));
+ Global.searchFilterController.connect('changed',
+ Lang.bind(this, this._onSearchFilterChanged));
// perform initial query
this._refresh();
@@ -127,7 +126,7 @@ TrackerController.prototype = {
this._performCurrentQuery();
},
- _onFilterChanged: function() {
+ _onSearchFilterChanged: function() {
this._offsetController.resetOffset();
this._refresh();
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]