Merge remote-tracking branch 'ispc3master/master'

Dominik

2015-01-11 4d29e42f99f7a9b703be4764034d6794464dad26

 interface/web/js/scrigo.js.php

@@ -1,5 +1,4 @@
<?php
session_start();
include '../../lib/config.inc.php';
header('Content-Type: text/javascript; charset=utf-8'); // the config file sets the content type header so we have to override it here!
require_once '../../lib/app.inc.php';
@@ -88,13 +87,50 @@
    }
}

function onAfterSideNavLoaded() {
   <?php
if($server_config_array['misc']['use_combobox'] == 'y'){
?>
    $('#sidebar').find("select:not(.chosen-select)").select2({
      placeholder: '',
      width: 'element',
      selectOnBlur: true,
      allowClear: true,
   });
<?php
}
?>

}

function onAfterContentLoad(url, data) {
    if(!data) data = '';
    else data = '&' + data;
<?php
if($server_config_array['misc']['use_combobox'] == 'y'){
?>
    $('#pageContent').find("select").combobox();


    $('#pageContent').find("select:not(.chosen-select)").select2({
      placeholder: '',
      width: 'element',
      selectOnBlur: true,
      allowClear: true,
      formatResult: function(o) {
         if(o.id && $(o.element).parent().hasClass('flags')) return '<span class="flags flag-' + o.id.toLowerCase() + '">' + o.text + '</span>';
         else return o.text;
      },
      formatSelection: function(o) {
         if(o.id && $(o.element).parent().hasClass('flags')) return '<span class="flags flag-' + o.id.toLowerCase() + '">' + o.text + '</span>';
         else return o.text;
      }
   }).on('change', function(e) {
            if (jQuery("#pageForm .table #Filter").length > 0) {
                jQuery("#pageForm .table #Filter").trigger('click');
            }
    });
    /* TODO: find a better way! */
    //$('.chosen-select').chosen({no_results_text: "<?php echo $wb['globalsearch_noresults_text_txt']; ?>", width: '300px'});
<?php
}
?>
@@ -410,7 +446,9 @@
                                 },
                                 success: function(data, textStatus, jqXHR) {
                                                hideLoadIndicator();
                                    jQuery('#sideNav').html(jqXHR.responseText);
                                    jQuery('#sidebar').html(jqXHR.responseText);
                                    onAfterSideNavLoaded();
                                    loadPushyMenu();
                                 },
                                 error: function() {
                                                hideLoadIndicator();
@@ -427,7 +465,8 @@
                                 },
                                 success: function(data, textStatus, jqXHR) {
                                                hideLoadIndicator();
                                    jQuery('#topNav').html(jqXHR.responseText);
                                    jQuery('#topnav-container').html(jqXHR.responseText);
                                    loadPushyMenu();
                                 },
                                 error: function(o) {
                                                hideLoadIndicator();
@@ -438,6 +477,8 @@
}

function changeTab(tab,target,force) {
   if(requestsRunning > 0) return false;
	
   //document.forms[0].next_tab.value = tab;
   document.pageForm.next_tab.value = tab;

@@ -809,7 +850,7 @@
   oldPWField.remove();
   var pword = password(<?php echo $min_password_length; ?>, false, 1);
   jQuery('#'+repeatPasswordFieldID).val(pword);
   newPWField.attr('id', passwordFieldID).val(pword).trigger('keyup');
   newPWField.attr('id', passwordFieldID).val(pword).trigger('keyup').select();
}

var funcDisableClick = function(e) { e.preventDefault(); return false; };
@@ -844,13 +885,13 @@
    return Math.floor(Math.random() * (max - min + 1)) + min;
}

jQuery('.addPlaceholder').live("click", function(){
jQuery(document).on("click", ".addPlaceholder", function(){
   var placeholderText = jQuery(this).text();
   var template = jQuery(this).siblings(':input');
   template.insertAtCaret(placeholderText);
});

jQuery('.addPlaceholderContent').live("click", function(){
jQuery(document).on("click", ".addPlaceholderContent", function(){
   var placeholderContentText = jQuery(this).find('.addPlaceholderContent').text();
   var template2 = jQuery(this).siblings(':input');
   template2.insertAtCaret(placeholderContentText);