diff --git a/include/staff/footer.inc.php b/include/staff/footer.inc.php index 141a859dd530c066a5e3403d2f0e75955a96bc6f..d5c0839ae5d73f2e68fdc68144dfb371934f0592 100644 --- a/include/staff/footer.inc.php +++ b/include/staff/footer.inc.php @@ -40,16 +40,23 @@ if(is_object($thisstaff) && $thisstaff->isStaff()) { ?> <div class="clear"></div> </div> +<script type="text/javascript" src="<?php echo ROOT_PATH; ?>js/jquery-ui-1.10.3.custom.min.js"></script> +<script type="text/javascript" src="<?php echo ROOT_PATH; ?>js/jquery.pjax.js"></script> +<script type="text/javascript" src="./js/scp.js"></script> +<script type="text/javascript" src="<?php echo ROOT_PATH; ?>js/filedrop.field.js"></script> +<script type="text/javascript" src="<?php echo ROOT_PATH; ?>js/select2.full.min.js"></script> +<script type="text/javascript" src="./js/tips.js"></script> +<script type="text/javascript" src="<?php echo ROOT_PATH; ?>js/redactor.min.js"></script> +<script type="text/javascript" src="<?php echo ROOT_PATH; ?>js/redactor-osticket.js"></script> +<script type="text/javascript" src="<?php echo ROOT_PATH; ?>js/redactor-plugins.js"></script> +<script type="text/javascript" src="./js/bootstrap-typeahead.js"></script> +<script type="text/javascript" src="./js/jquery.translatable.js"></script> <script type="text/javascript"> -if ($.support.pjax) { - $(document).on('click', 'a', function(event) { - var $this = $(this); - if (!$this.hasClass('no-pjax') - && !$this.closest('.no-pjax').length - && $this.attr('href')[0] != '#') - $.pjax.click(event, {container: $this.data('pjaxContainer') || $('#pjax-container'), timeout: 2000}); - }) -} + getConfig().resolve(<?php + include INCLUDE_DIR . 'ajax.config.php'; + $api = new ConfigAjaxAPI(); + print $api->scp(false); + ?>); </script> <?php if ($thisstaff diff --git a/include/staff/header.inc.php b/include/staff/header.inc.php index c67d74bb0a518d5d10d7a7be1c194eeada21048e..cd2a581f88ac7c5a84b782cddb422fb0bf3df7c0 100644 --- a/include/staff/header.inc.php +++ b/include/staff/header.inc.php @@ -24,17 +24,6 @@ if ($lang) { </style> <![endif]--> <script type="text/javascript" src="<?php echo ROOT_PATH; ?>js/jquery-1.11.2.min.js"></script> - <script type="text/javascript" src="<?php echo ROOT_PATH; ?>js/jquery-ui-1.10.3.custom.min.js"></script> - <script type="text/javascript" src="./js/scp.js"></script> - <script type="text/javascript" src="<?php echo ROOT_PATH; ?>js/jquery.pjax.js"></script> - <script type="text/javascript" src="<?php echo ROOT_PATH; ?>js/filedrop.field.js"></script> - <script type="text/javascript" src="<?php echo ROOT_PATH; ?>js/select2.full.min.js"></script> - <script type="text/javascript" src="./js/tips.js"></script> - <script type="text/javascript" src="<?php echo ROOT_PATH; ?>js/redactor.min.js"></script> - <script type="text/javascript" src="<?php echo ROOT_PATH; ?>js/redactor-osticket.js"></script> - <script type="text/javascript" src="<?php echo ROOT_PATH; ?>js/redactor-plugins.js"></script> - <script type="text/javascript" src="./js/bootstrap-typeahead.js"></script> - <script type="text/javascript" src="./js/jquery.translatable.js"></script> <link rel="stylesheet" href="<?php echo ROOT_PATH ?>css/thread.css" media="all"> <link rel="stylesheet" href="./css/scp.css" media="all"> <link rel="stylesheet" href="<?php echo ROOT_PATH; ?>css/redactor.css" media="screen"> diff --git a/include/staff/tickets.inc.php b/include/staff/tickets.inc.php index 528deb9c0a43d5df1c627576af8c01ae0af467ad..549784aef4bd88d2dd8872a08add015e38778d46 100644 --- a/include/staff/tickets.inc.php +++ b/include/staff/tickets.inc.php @@ -301,7 +301,13 @@ $_SESSION[':Q:tickets'] = $orig_tickets; <!-- SEARCH FORM START --> <div id='basic_search'> - <form action="tickets.php" method="get"> + <form action="tickets.php" method="get" onsubmit="javascript: + $.pjax({ + url:$(this).attr('action') + '?' + $(this).serialize(), + container:'#pjax-container', + timeout: 2000 + }); +return false;"> <input type="hidden" name="a" value="search"> <table> <tr> diff --git a/scp/js/scp.js b/scp/js/scp.js index 502b7f06171a02f90eb2207df7c73867653d5b01..ee0a233068bec66729b2473e1de70d515727e8a8 100644 --- a/scp/js/scp.js +++ b/scp/js/scp.js @@ -814,21 +814,10 @@ $(document).on('click', 'a.collaborator, a.collaborators', function(e) { // NOTE: getConfig should be global getConfig = (function() { var dfd = $.Deferred(), - requested = null; + requested = false; return function() { - if (dfd.state() != 'resolved' && !requested) - requested = $.ajax({ - url: "ajax.php/config/scp", - dataType: 'json', - success: function (json_config) { - dfd.resolve(json_config); - }, - error: function() { - requested = null; - } - }); return dfd; - } + }; })(); $(document).on('pjax:click', function(options) { @@ -844,7 +833,7 @@ $(document).on('pjax:click', function(options) { if ($(this).data('timer')) clearTimeout($(this).data('timer')); }); - $('.tip_box').remove(); + $('.tip_box, .typeahead.dropdown-menu').remove(); }); $(document).on('pjax:start', function() { @@ -882,6 +871,17 @@ $(document).on('pjax:complete', function() { $('#overlay').removeAttr('style'); }); +// Enable PJAX for the staff interface +if ($.support.pjax) { + $(document).on('click', 'a', function(event) { + var $this = $(this); + if (!$this.hasClass('no-pjax') + && !$this.closest('.no-pjax').length + && $this.attr('href')[0] != '#') + $.pjax.click(event, {container: $this.data('pjaxContainer') || $('#pjax-container'), timeout: 2000}); + }) +} + // Quick note interface $(document).on('click.note', '.quicknote .action.edit-note', function() { var note = $(this).closest('.quicknote'),