diff --git a/css/light-grey.css b/css/light-grey.css index 8a8528ef4..76482ef35 100644 --- a/css/light-grey.css +++ b/css/light-grey.css @@ -577,7 +577,7 @@ div.actions_menu > ul > li { position: absolute; display: none; border-top: 1px solid white; - z-index: 999; + z-index: 1500; } .itop_popup li ul li, #logOffBtn li ul li { float: none; @@ -2151,7 +2151,7 @@ a.summary, a.summary:hover { position: absolute; display: none; border-top: 1px solid white; - z-index: 999; + z-index: 1500; } #DashboardMenu li ul li a:hover { background: #ea7d1e; diff --git a/css/light-grey.scss b/css/light-grey.scss index c995efd94..318409cd5 100644 --- a/css/light-grey.scss +++ b/css/light-grey.scss @@ -646,7 +646,7 @@ div.actions_menu > ul > li { position: absolute; display: none; border-top: 1px solid white; - z-index: 999; + z-index: 1500; } .itop_popup li ul li, #logOffBtn li ul li { @@ -2471,7 +2471,7 @@ a.summary, a.summary:hover { position: absolute; display: none; border-top: 1px solid white; - z-index: 999; + z-index: 1500; } #DashboardMenu li ul li a:hover{ background: $popup-menu-highlight-color; diff --git a/js/search/search_form_handler.js b/js/search/search_form_handler.js index 8391b1b90..76663db88 100644 --- a/js/search/search_form_handler.js +++ b/js/search/search_form_handler.js @@ -580,66 +580,6 @@ $(function() oButtonsElem.hide(); }); }, - - /** - * "add new criteria"
  • markup - * - with checkbox, label, data-* ... - * - without event binding - * - * @private - * - * @param sFieldRef - * @param aFieldCollectionsEligible - * - * @return jQuery detached
  • - */ - _getHtmlLiFromFieldRef: function(me, sFieldRef, aFieldCollectionsEligible) { - var oFieldElem = undefined; - - aFieldCollectionsEligible.forEach(function (sFieldCollection) { - if (typeof me.options.search.fields[sFieldCollection][sFieldRef] == 'undefined') - { - return true;//if this field is not present in the Collection, let's try the next - } - - var oField = me.options.search.fields[sFieldCollection][sFieldRef]; - var sFieldTitleAttr = (oField.description !== undefined) ? 'title="' + oField.description + '"' : ''; - oFieldElem = $('
  • ') - .addClass('sfm_field') - .attr('data-field-ref', sFieldRef) - .append('') - }); - - if (undefined == oFieldElem) - { - me._trace('no sFieldRef in given collection', {"sFieldRef":sFieldRef, "aFieldCollectionsEligible":aFieldCollectionsEligible}); - return $(''); - } - - return oFieldElem; - }, - - _refreshRecentlyUsed: function() - { - me = this; - - var aHistory = me.element.search_form_handler_history("getHistory"); - var oRecentsItemsElem = me.element.find('.sf_list_recents .sfl_items'); - - if (aHistory.length == 0) - { - return; - } - oRecentsItemsElem.empty(); - - - aHistory.forEach(function(sFieldRef) { - var oFieldElem = me._getHtmlLiFromFieldRef(me, sFieldRef, ['zlist', 'others']); - oRecentsItemsElem.append(oFieldElem); - }); - - }, - // - Prepare results area _prepareResultsArea: function() { @@ -681,6 +621,44 @@ $(function() this.elements.results_area = oResultAreaElem; }, + /** + * "add new criteria"
  • markup + * - with checkbox, label, data-* ... + * - without event binding + * + * @private + * + * @param sFieldRef + * @param aFieldCollectionsEligible + * + * @return jQuery detached
  • + */ + _getHtmlLiFromFieldRef: function(me, sFieldRef, aFieldCollectionsEligible) { + var oFieldElem = undefined; + + aFieldCollectionsEligible.forEach(function (sFieldCollection) { + if (typeof me.options.search.fields[sFieldCollection][sFieldRef] == 'undefined') + { + return true;//if this field is not present in the Collection, let's try the next + } + + var oField = me.options.search.fields[sFieldCollection][sFieldRef]; + var sFieldTitleAttr = (oField.description !== undefined) ? 'title="' + oField.description + '"' : ''; + oFieldElem = $('
  • ') + .addClass('sfm_field') + .attr('data-field-ref', sFieldRef) + .append('') + }); + + if (undefined == oFieldElem) + { + me._trace('no sFieldRef in given collection', {"sFieldRef":sFieldRef, "aFieldCollectionsEligible":aFieldCollectionsEligible}); + return $(''); + } + + return oFieldElem; + }, + // Criteria helpers // - Add a criteria to the form @@ -859,17 +837,17 @@ $(function() $.extend(oListParams, this.options.list_params); oData.list_params = JSON.stringify(oListParams); - // Show loader - this._showLoader(); - this._cleanMessageArea(); - - // TODO: Make a throttle mecanism or cancel previous call when a newer is made. - - // Do submit + // Abort pending request if(this.submit.xhr !== null) { this.submit.xhr.abort(); } + + // Show loader + this._showLoader(); + this._cleanMessageArea(); + + // Do submit this.submit.xhr = $.post( this.options.endpoint, oData @@ -905,6 +883,26 @@ $(function() // Global helpers + _refreshRecentlyUsed: function() + { + me = this; + + var aHistory = me.element.search_form_handler_history("getHistory"); + var oRecentsItemsElem = me.element.find('.sf_list_recents .sfl_items'); + + if (aHistory.length == 0) + { + return; + } + oRecentsItemsElem.empty(); + + + aHistory.forEach(function(sFieldRef) { + var oFieldElem = me._getHtmlLiFromFieldRef(me, sFieldRef, ['zlist', 'others']); + oRecentsItemsElem.append(oFieldElem); + }); + + }, // - Show loader _showLoader: function() {