Problems with merge 0938a4b.

ceskaexpedice · Aug 15, 2016 · e25ae31 · e25ae31
1 parent a3a91b8
commit e25ae31
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 21 deletions.
diff --git a/buildSrc/lib/simplecaptcha-1.2.1.jar b/buildSrc/lib/simplecaptcha-1.2.1.jar
diff --git a/search/web/inc/results/results.jsp b/search/web/inc/results/results.jsp
@@ -543,27 +543,30 @@
               $(jq("res_"+root_pid)+" div.uncollapsed").scrollTop(0);
           });
     }
-    function daYearClicked(params){
-        var rok = params.year;
-        $("#" + fromField).val("01.01."+rok);
-        $("#" + toField).val("31.12."+rok);
-        if(!isValidDate($("#" + fromField).val()) || !isValidDate($("#" + toField).val())){
-            alert(dictionary['filter.invalid.date'] );
-            return;
-        }
-
-        var page = new PageQuery(window.location.search);
-        page.setValue("offset", "0");
-        page.setValue("forProfile", "dateaxis");
-        //page.setValue(fromField, decodeDate($("#" + fromField).val()));
-        //page.setValue(toField, decodeDate($("#" + toField).val()));
-
-        page.setValue("da_od", decodeDate($("#" + fromField).val()));
-        page.setValue("da_do", decodeDate($("#" + toField).val()));
-        var newurl = "r.jsp?" + page.toString() + dateAxisAdditionalParams;
-
-        document.location.href = newurl;
-
+    
+ /** Commented by PS; because of bad merge
+  *  number of commit is  0938a4b0caaa252671ce15b407d0cd7687d18f5f
+  *  function daYearClicked(params){
+  *      var rok = params.year;
+  *      $("#" + fromField).val("01.01."+rok);
+  *      $("#" + toField).val("31.12."+rok);
+  *      if(!isValidDate($("#" + fromField).val()) || !isValidDate($("#" + toField).val())){
+  *          alert(dictionary['filter.invalid.date'] );
+  *          return;
+  *      }
+  *
+  *      var page = new PageQuery(window.location.search);
+  *      page.setValue("offset", "0");
+  *      page.setValue("forProfile", "dateaxis");
+  *      //page.setValue(fromField, decodeDate($("#" + fromField).val()));
+  *      //page.setValue(toField, decodeDate($("#" + toField).val()));
+  *
+  *      page.setValue("da_od", decodeDate($("#" + fromField).val()));
+  *      page.setValue("da_do", decodeDate($("#" + toField).val()));
+  *      var newurl = "r.jsp?" + page.toString() + dateAxisAdditionalParams;
+  *
+  *      document.location.href = newurl;
+  */
     
     function fixRootTitle(){
         $(".search_result").each(function(){