Skip to content

Commit 559b657

Browse files
author
Marius Cramer
committed
Merge branch 'master' into 'master'
Master Hello Marius, just re-did it again and committed only files i changed. Should be fine now. :-) Jochen See merge request !126
2 parents 4341867 + 7a42487 commit 559b657

15 files changed

+344
-722
lines changed

‎interface/web/client/templates/client_edit_limits.htm‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -326,12 +326,16 @@ <h2><tmpl_var name="list_head_txt"></h2>
326326
return ($('#template_master').val() == '0' ? true : false);
327327
}
328328

329-
jQuery('#template_additional_list').find('li > a').click(function(e) {
329+
$('.subsectiontoggle').on("click", function(){
330+
$(this).children().toggleClass('showing').end().next().slideToggle();
331+
});
332+
333+
$('#template_additional_list').find('li > a').click(function(e) {
330334
e.preventDefault();
331335
delAdditionalTemplate($(this).parent().attr('rel'));
332336
});
333337

334-
jQuery('div.panel_client')
338+
$('div.panel_client')
335339
.find('div.pnl_formsarea')
336340
.find('fieldset')
337341
.find('input,select,button')

‎interface/web/js/jquery-1.6.3.min.js‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎interface/web/js/jquery-2.1.1.min.js‎

Lines changed: 26 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎interface/web/js/jquery-ui-1.11.1.custom.min.js‎

Lines changed: 13 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎interface/web/js/jquery-ui-1.8.16.custom.min.js‎

Lines changed: 0 additions & 192 deletions
This file was deleted.

‎interface/web/js/jquery.combobox.js‎

Lines changed: 129 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,129 @@
1+
(function( $ ) {
2+
$.widget( "custom.combobox", {
3+
_create: function() {
4+
this.wrapper = $( "<span>" )
5+
.addClass( "custom-combobox" )
6+
.insertAfter( this.element );
7+
8+
this.element.hide();
9+
this._createAutocomplete();
10+
this._createShowAllButton();
11+
},
12+
13+
_createAutocomplete: function() {
14+
var selected = this.element.children( ":selected" ),
15+
value = selected.val() ? selected.text() : "";
16+
17+
this.input = $( "<input>" )
18+
.appendTo( this.wrapper )
19+
.val( value )
20+
.attr( "title", "" )
21+
.addClass( "custom-combobox-input ui-widget ui-widget-content ui-state-default ui-corner-left" )
22+
.autocomplete({
23+
delay: 0,
24+
minLength: 0,
25+
source: $.proxy( this, "_source" )
26+
})
27+
.tooltip({
28+
tooltipClass: "ui-state-highlight"
29+
});
30+
31+
this._on( this.input, {
32+
autocompleteselect: function( event, ui ) {
33+
ui.item.option.selected = true;
34+
this._trigger( "select", event, {
35+
item: ui.item.option
36+
});
37+
},
38+
39+
autocompletechange: "_removeIfInvalid"
40+
});
41+
},
42+
43+
_createShowAllButton: function() {
44+
var input = this.input,
45+
wasOpen = false;
46+
47+
$( "<a>" )
48+
.attr( "tabIndex", -1 )
49+
.attr( "title", "Show All Items" )
50+
.tooltip()
51+
.appendTo( this.wrapper )
52+
.button({
53+
icons: {
54+
primary: "ui-icon-triangle-1-s"
55+
},
56+
text: false
57+
})
58+
.removeClass( "ui-corner-all" )
59+
.addClass( "custom-combobox-toggle ui-corner-right" )
60+
.mousedown(function() {
61+
wasOpen = input.autocomplete( "widget" ).is( ":visible" );
62+
})
63+
.click(function() {
64+
input.focus();
65+
66+
// Close if already visible
67+
if ( wasOpen ) {
68+
return;
69+
}
70+
71+
// Pass empty string as value to search for, displaying all results
72+
input.autocomplete( "search", "" );
73+
});
74+
},
75+
76+
_source: function( request, response ) {
77+
var matcher = new RegExp( $.ui.autocomplete.escapeRegex(request.term), "i" );
78+
response( this.element.children( "option" ).map(function() {
79+
var text = $( this ).text();
80+
if ( this.value && ( !request.term || matcher.test(text) ) )
81+
return {
82+
label: text,
83+
value: text,
84+
option: this
85+
};
86+
}) );
87+
},
88+
89+
_removeIfInvalid: function( event, ui ) {
90+
91+
// Selected an item, nothing to do
92+
if ( ui.item ) {
93+
return;
94+
}
95+
96+
// Search for a match (case-insensitive)
97+
var value = this.input.val(),
98+
valueLowerCase = value.toLowerCase(),
99+
valid = false;
100+
this.element.children( "option" ).each(function() {
101+
if ( $( this ).text().toLowerCase() === valueLowerCase ) {
102+
this.selected = valid = true;
103+
return false;
104+
}
105+
});
106+
107+
// Found a match, nothing to do
108+
if ( valid ) {
109+
return;
110+
}
111+
112+
// Remove invalid value
113+
this.input
114+
.val( "" )
115+
.attr( "title", value + " didn't match any item" )
116+
.tooltip( "open" );
117+
this.element.val( "" );
118+
this._delay(function() {
119+
this.input.tooltip( "close" ).attr( "title", "" );
120+
}, 2500 );
121+
this.input.autocomplete( "instance" ).term = "";
122+
},
123+
124+
_destroy: function() {
125+
this.wrapper.remove();
126+
this.element.show();
127+
}
128+
});
129+
})( jQuery );

‎interface/web/js/jquery.tipsy.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@
166166
if (!options.live) this.each(function() { get(this); });
167167

168168
if (options.trigger != 'manual') {
169-
var binder = options.live ? 'live' : 'bind',
169+
var binder = options.live ? 'on' : 'bind',
170170
eventIn = options.trigger == 'hover' ? 'mouseenter' : 'focus',
171171
eventOut = options.trigger == 'hover' ? 'mouseleave' : 'blur';
172172
this[binder](eventIn, enter)[binder](eventOut, leave);

‎interface/web/js/mail_domain_dkim.js‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,13 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3131
This Javascript is invoked by
3232
* mail/templates/mail_domain_edit.htm to show and/or create the key-pair
3333
*/
34+
35+
36+
$('.subsectiontoggle').on('click', function(){
37+
$(this).children().toggleClass('showing').end().next().slideToggle();
38+
});
39+
40+
3441
var request = false;
3542

3643
function setRequest(action,value,privatekey) {
@@ -46,13 +53,9 @@ This Javascript is invoked by
4653
alert("Error creating XMLHTTP-instance");
4754
return false;
4855
} else {
49-
var domain=encodeURIComponent(document.getElementById("domain").value)
50-
var selector=encodeURIComponent(document.getElementById("dkim_selector").value)
51-
var publickey=encodeURIComponent(document.getElementById("dkim_public").value)
52-
var privatekey=encodeURIComponent(document.getElementById("dkim_private").value)
5356
request.open('POST', 'mail/mail_domain_dkim_create.php', true);
5457
request.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
55-
request.send('domain='+domain+'&action='+action+'&dkim_selector='+selector+'&dkim_public='+publickey+'&dkim_private='+privatekey);
58+
request.send('domain='+value+'&action='+action+'&pkey='+privatekey);
5659
request.onreadystatechange = interpretRequest;
5760
}
5861
}
@@ -62,15 +65,15 @@ This Javascript is invoked by
6265
case 4:
6366
if (request.status != 200) {alert("Request done but NOK\nError:"+request.status);}
6467
else {
65-
document.getElementsByName('dkim_selector')[0].value = request.responseXML.getElementsByTagName('selector')[0].firstChild.nodeValue;
6668
document.getElementsByName('dkim_private')[0].value = request.responseXML.getElementsByTagName('privatekey')[0].firstChild.nodeValue;
67-
document.getElementsByName('dkim_public')[0].value = request.responseXML.getElementsByTagName('publickey')[0].firstChild.nodeValue;
68-
document.getElementsByName('dns_record')[0].value = request.responseXML.getElementsByTagName('dns_record')[0].firstChild.nodeValue;
69+
document.getElementsByName('dkim_public')[0].value = request.responseXML.getElementsByTagName('publickey')[0].firstChild.nodeValue;
70+
document.getElementsByName('dns_record')[0].value = request.responseXML.getElementsByTagName('dns_record')[0].firstChild.nodeValue;
6971
}
7072
break;
7173
default:
7274
break;
7375
}
7476
}
77+
7578
var serverType = jQuery('#dkim_private').val();
7679
setRequest('show','{tmpl_var name="domain"}',serverType);

‎interface/web/js/scrigo.js.php‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,15 @@ function onAfterContentLoad(url, data) {
9494
<?php
9595
if($server_config_array['misc']['use_combobox'] == 'y'){
9696
?>
97-
$('#pageContent').find("select:not(.chosen-select)").combobox();
97+
98+
99+
$('#pageContent').find("select:not(.chosen-select)").combobox({
100+
select: function (event, ui) {
101+
if (jQuery(".panel #Filter").length > 0) {
102+
jQuery(".panel #Filter").trigger('click');
103+
}
104+
}
105+
});
98106
$('.chosen-select').chosen({no_results_text: "<?php echo $wb['globalsearch_noresults_text_txt']; ?>", width: '300px'});
99107
<?php
100108
}
@@ -845,13 +853,13 @@ function getRandomInt(min, max){
845853
return Math.floor(Math.random() * (max - min + 1)) + min;
846854
}
847855

848-
jQuery('.addPlaceholder').live("click", function(){
856+
jQuery('.addPlaceholder').on("click", function(){
849857
var placeholderText = jQuery(this).text();
850858
var template = jQuery(this).siblings(':input');
851859
template.insertAtCaret(placeholderText);
852860
});
853861

854-
jQuery('.addPlaceholderContent').live("click", function(){
862+
jQuery('.addPlaceholderContent').on("click", function(){
855863
var placeholderContentText = jQuery(this).find('.addPlaceholderContent').text();
856864
var template2 = jQuery(this).siblings(':input');
857865
template2.insertAtCaret(placeholderContentText);

‎interface/web/themes/default/css/jquery-ui-1.11.1.min.css‎

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)