From 80e4b978b042122232f1a965359533c6633d8e5d Mon Sep 17 00:00:00 2001
From: Jared Hancock <jared@osticket.com>
Date: Fri, 24 Apr 2015 14:42:20 -0500
Subject: [PATCH] Fix a few request hot points
---
include/staff/footer.inc.php | 25 ++++++++++++++++---------
include/staff/header.inc.php | 11 -----------
include/staff/tickets.inc.php | 8 +++++++-
scp/js/scp.js | 28 ++++++++++++++--------------
4 files changed, 37 insertions(+), 35 deletions(-)
diff --git a/include/staff/footer.inc.php b/include/staff/footer.inc.php
index 141a859dd..d5c0839ae 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 c67d74bb0..cd2a581f8 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 528deb9c0..549784aef 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 502b7f061..ee0a23306 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'),
--
GitLab