projects
/
mkdru-moved-to-drupal.org.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rough implementation of 'ting_search_show'
[mkdru-moved-to-drupal.org.git]
/
mkdru.client.js
diff --git
a/mkdru.client.js
b/mkdru.client.js
index
5b0ce75
..
95c9bf5
100644
(file)
--- a/
mkdru.client.js
+++ b/
mkdru.client.js
@@
-21,8
+21,9
@@
var mkdru = {
// pz2.js event handlers:
mkdru.pz2Init = function () {
// pz2.js event handlers:
mkdru.pz2Init = function () {
- mkdru.pz2.stat();
- mkdru.pz2.bytarget();
+ if (mkdru.query) mkdru.triggerSearch();
+ //mkdru.pz2.stat();
+ //mkdru.pz2.bytarget();
};
mkdru.pz2Show = function (data) {
};
mkdru.pz2Show = function (data) {
@@
-97,6
+98,7
@@
mkdru.pz2ByTarget = function (data) {
// UI functions:
mkdru.submitQuery = function () {
// UI functions:
mkdru.submitQuery = function () {
+ mkdru.query = $('.mkdru-search input:text').attr('value');
mkdru.resetPage();
mkdru.pollDropDowns();
mkdru.search();
mkdru.resetPage();
mkdru.pollDropDowns();
mkdru.search();
@@
-104,9
+106,14
@@
mkdru.submitQuery = function () {
return false;
};
return false;
};
+mkdru.triggerSearch = function () {
+ mkdru.search();
+ mkdru.submitted = true;
+};
+
mkdru.search = function () {
mkdru.search = function () {
- mkdru.pz2.search($('.mkdru-search input:text').attr('value'),
- mkdru.recPerPage, mkdru.curSort, mkdru.curFilter);
+ mkdru.pz2.search(mkdru.query, mkdru.recPerPage, mkdru.curSort,
+ mkdru.curFilter);
};
mkdru.pollDropDowns = function () {
};
mkdru.pollDropDowns = function () {
@@
-179,5
+186,12
@@
$(document).ready(function () {
"onbytarget": mkdru.pz2ByTarget,
"usesessions" : mkdru.usesessions,
"showResponseType": mkdru.showResponseType,
"onbytarget": mkdru.pz2ByTarget,
"usesessions" : mkdru.usesessions,
"showResponseType": mkdru.showResponseType,
- "onrecord": mkdru.pz2Record } );
-});
\ No newline at end of file
+ "onrecord": mkdru.pz2Record,
+ "autoInit": false } );
+ mkdru.query = Drupal.settings.mkdru.query;
+ if (mkdru.usesessions) {
+ mkdru.pz2.init();
+ } else if (mkdru.query) {
+ mkdru.triggerSearch();
+ }
+});