Commit dc5c7d09 authored by Raph El's avatar Raph El

Merge branch 'master' into qa

parents 4dcdbbb3 dfce793f
......@@ -156,6 +156,7 @@ var searchInterface={
searchObject.nbPage=0;
pageCount=true;
searchObject.count=true;
loadingData = false;
if(typeof searchObject.ranges != "undefined") searchAllEngine.initSearch();
startSearch(0, indexStepInit, searchCallback);
}else{
......@@ -175,6 +176,7 @@ var searchInterface={
searchObject.nbPage=0;
pageCount=true;
searchObject.count=true;
loadingData = false;
if(typeof searchObject.ranges != "undefined") searchAllEngine.initSearch();
startSearch(0, indexStepInit, searchCallback);
}else{
......@@ -235,6 +237,7 @@ var searchInterface={
searchObject.text = $(this).val();
searchObject.count=true;
pageCount=true;
loadingData = false;
if(searchObject.app=="territorial") searchAllEngine.initSearch();
startSearch(0, indexStepInit, searchCallback);
$(".btn-directory-type").removeClass("active");
......@@ -242,7 +245,8 @@ var searchInterface={
});
//.menu-btn-start-search,
$("#menu-map-btn-start-search, #main-search-bar-addon, #main-search-xs-bar-addon").off().on("click", function(){
scrollH= ($("#filter-thematic-menu").is(":visible")) ? 250 : 0;
mylog.log("main-search-bar-addon");
scrollH= ($("#filter-thematic-menu").is(":visible")) ? 250 : 0;
spinSearchAddon(true);
coInterface.simpleScroll(scrollH);
if($(this).hasClass("menu-btn-start-search"))
......@@ -256,6 +260,7 @@ var searchInterface={
$("#second-search-bar, .main-search-bar, #input-search-map").val(searchObject.text);
searchObject.nbPage=0;
searchObject.count=true;
loadingData = false;
pageCount=true;
if(typeof searchObject.ranges != "undefined") searchAllEngine.initSearch();
startSearch(0, indexStepInit, searchCallback);
......
......@@ -18,10 +18,7 @@ dynForm = {
uploadObj.set( contextData.type, contextData.id, "image", uploadObj.contentKey, foldKey);
},
save : function() {
dyFObj.commonAfterSave(null, function(){
//dyFObj.closeForm();
//urlCtrl.loadByHash( (uploadObj.gotoUrl) ? uploadObj.gotoUrl : location.hash );
});
dyFObj.commonAfterSave(null);
//if( $('.fine-uploader-manual-trigger').fineUploader('getUploads').length > 0 )
// $('.fine-uploader-manual-trigger').fineUploader('uploadStoredFiles');
},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment