Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Pixel Humain
co2
Commits
cd664d7e
Commit
cd664d7e
authored
Jan 07, 2020
by
Raph El
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Hotfix agenda
parent
2a01a1a5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
assets/js/default/calendar.js
assets/js/default/calendar.js
+1
-1
assets/js/default/directory.js
assets/js/default/directory.js
+4
-4
No files found.
assets/js/default/calendar.js
View file @
cd664d7e
...
@@ -37,7 +37,7 @@ var agenda = {
...
@@ -37,7 +37,7 @@ var agenda = {
var
startDDDD
=
new
Date
(
startMoment
);
var
startDDDD
=
new
Date
(
startMoment
);
mylog
.
log
(
"
agenda.searchDay startDDDD
"
,
startDDDD
);
mylog
.
log
(
"
agenda.searchDay startDDDD
"
,
startDDDD
);
searchObject
.
startDate
=
Math
.
floor
(
startDDDD
/
1000
);
searchObject
.
startDate
=
Math
.
floor
(
startDDDD
/
1000
);
startSearch
(
10
,
30
,
searchCallback
);
startSearch
(
10
,
30
,
searchCallback
,
true
);
},
},
addDay
:
function
(){
addDay
:
function
(){
mylog
.
log
(
"
agenda.addDay
"
,
this
.
dayCount
);
mylog
.
log
(
"
agenda.addDay
"
,
this
.
dayCount
);
...
...
assets/js/default/directory.js
View file @
cd664d7e
...
@@ -21,7 +21,7 @@ var translate = {"organizations":"Organisations",
...
@@ -21,7 +21,7 @@ var translate = {"organizations":"Organisations",
"
people
"
:
"
Citoyens
"
,
"
people
"
:
"
Citoyens
"
,
"
followers
"
:
"
Ils nous suivent
"
};
"
followers
"
:
"
Ils nous suivent
"
};
function
startSearch
(
indexMin
,
indexMax
,
callBack
){
function
startSearch
(
indexMin
,
indexMax
,
callBack
,
notUrl
){
searchAllEngine
.
searchInProgress
=
true
;
searchAllEngine
.
searchInProgress
=
true
;
mylog
.
log
(
"
directory.js startSearch agenda.
"
,
indexMin
,
indexMax
);
mylog
.
log
(
"
directory.js startSearch agenda.
"
,
indexMin
,
indexMax
);
mylog
.
log
(
"
directory.js startSearch searchObject.types agenda.
"
,
searchObject
.
types
);
mylog
.
log
(
"
directory.js startSearch searchObject.types agenda.
"
,
searchObject
.
types
);
...
@@ -51,7 +51,7 @@ function startSearch(indexMin, indexMax, callBack){
...
@@ -51,7 +51,7 @@ function startSearch(indexMin, indexMax, callBack){
mylog
.
log
(
"
directory.js startSearch
"
,
searchObject
.
indexMin
,
indexMax
,
searchObject
.
indexStep
,
searchObject
.
types
);
mylog
.
log
(
"
directory.js startSearch
"
,
searchObject
.
indexMin
,
indexMax
,
searchObject
.
indexStep
,
searchObject
.
types
);
searchObject
.
indexMin
=
(
typeof
indexMin
==
"
undefined
"
)
?
0
:
indexMin
;
searchObject
.
indexMin
=
(
typeof
indexMin
==
"
undefined
"
)
?
0
:
indexMin
;
autoCompleteSearch
(
indexMin
,
indexMax
,
callBack
);
autoCompleteSearch
(
indexMin
,
indexMax
,
callBack
,
notUrl
);
}
}
}
}
...
@@ -101,9 +101,9 @@ function removeSearchType(type){
...
@@ -101,9 +101,9 @@ function removeSearchType(type){
}
}
}
}
function
autoCompleteSearch
(
indexMin
,
indexMax
,
callBack
){
function
autoCompleteSearch
(
indexMin
,
indexMax
,
callBack
,
notUrl
){
mylog
.
log
(
"
START -------- autoCompleteSearch! agenda.
"
,
typeof
callBack
,
callBack
,
searchObject
.
types
);
mylog
.
log
(
"
START -------- autoCompleteSearch! agenda.
"
,
typeof
callBack
,
callBack
,
searchObject
.
types
);
var
data
=
searchInterface
.
constructObjectAndUrl
();
var
data
=
searchInterface
.
constructObjectAndUrl
(
notUrl
);
mylog
.
log
(
"
autoCompleteSearch! agenda. searchObject.types
"
,
searchObject
.
types
);
mylog
.
log
(
"
autoCompleteSearch! agenda. searchObject.types
"
,
searchObject
.
types
);
//mylog.log("DATE ***", searchType[0], STARTDATE, ENDDATE);
//mylog.log("DATE ***", searchType[0], STARTDATE, ENDDATE);
/*if(searchObject.initType=="events" && searchObject.text==""){
/*if(searchObject.initType=="events" && searchObject.text==""){
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment