Skip to content
Snippets Groups Projects
Commit 80e4b978 authored by Jared Hancock's avatar Jared Hancock
Browse files

Fix a few request hot points

parent 30d58286
No related branches found
No related tags found
No related merge requests found
...@@ -40,16 +40,23 @@ if(is_object($thisstaff) && $thisstaff->isStaff()) { ?> ...@@ -40,16 +40,23 @@ if(is_object($thisstaff) && $thisstaff->isStaff()) { ?>
<div class="clear"></div> <div class="clear"></div>
</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"> <script type="text/javascript">
if ($.support.pjax) { getConfig().resolve(<?php
$(document).on('click', 'a', function(event) { include INCLUDE_DIR . 'ajax.config.php';
var $this = $(this); $api = new ConfigAjaxAPI();
if (!$this.hasClass('no-pjax') print $api->scp(false);
&& !$this.closest('.no-pjax').length ?>);
&& $this.attr('href')[0] != '#')
$.pjax.click(event, {container: $this.data('pjaxContainer') || $('#pjax-container'), timeout: 2000});
})
}
</script> </script>
<?php <?php
if ($thisstaff if ($thisstaff
......
...@@ -24,17 +24,6 @@ if ($lang) { ...@@ -24,17 +24,6 @@ if ($lang) {
</style> </style>
<![endif]--> <![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-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="<?php echo ROOT_PATH ?>css/thread.css" media="all">
<link rel="stylesheet" href="./css/scp.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"> <link rel="stylesheet" href="<?php echo ROOT_PATH; ?>css/redactor.css" media="screen">
......
...@@ -301,7 +301,13 @@ $_SESSION[':Q:tickets'] = $orig_tickets; ...@@ -301,7 +301,13 @@ $_SESSION[':Q:tickets'] = $orig_tickets;
<!-- SEARCH FORM START --> <!-- SEARCH FORM START -->
<div id='basic_search'> <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"> <input type="hidden" name="a" value="search">
<table> <table>
<tr> <tr>
......
...@@ -814,21 +814,10 @@ $(document).on('click', 'a.collaborator, a.collaborators', function(e) { ...@@ -814,21 +814,10 @@ $(document).on('click', 'a.collaborator, a.collaborators', function(e) {
// NOTE: getConfig should be global // NOTE: getConfig should be global
getConfig = (function() { getConfig = (function() {
var dfd = $.Deferred(), var dfd = $.Deferred(),
requested = null; requested = false;
return function() { 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; return dfd;
} };
})(); })();
$(document).on('pjax:click', function(options) { $(document).on('pjax:click', function(options) {
...@@ -844,7 +833,7 @@ $(document).on('pjax:click', function(options) { ...@@ -844,7 +833,7 @@ $(document).on('pjax:click', function(options) {
if ($(this).data('timer')) if ($(this).data('timer'))
clearTimeout($(this).data('timer')); clearTimeout($(this).data('timer'));
}); });
$('.tip_box').remove(); $('.tip_box, .typeahead.dropdown-menu').remove();
}); });
$(document).on('pjax:start', function() { $(document).on('pjax:start', function() {
...@@ -882,6 +871,17 @@ $(document).on('pjax:complete', function() { ...@@ -882,6 +871,17 @@ $(document).on('pjax:complete', function() {
$('#overlay').removeAttr('style'); $('#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 // Quick note interface
$(document).on('click.note', '.quicknote .action.edit-note', function() { $(document).on('click.note', '.quicknote .action.edit-note', function() {
var note = $(this).closest('.quicknote'), var note = $(this).closest('.quicknote'),
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment