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

Fix stutter when rendering pulling up a ticket

parent c7a9c9c5
Branches
Tags
No related merge requests found
...@@ -49,6 +49,7 @@ if ($lang) { ...@@ -49,6 +49,7 @@ if ($lang) {
<script type="text/javascript" src="<?php echo ROOT_PATH; ?>js/redactor-plugins.js"></script> <script type="text/javascript" src="<?php echo ROOT_PATH; ?>js/redactor-plugins.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-osticket.js"></script>
<script type="text/javascript" src="<?php echo ROOT_PATH; ?>js/select2.min.js"></script> <script type="text/javascript" src="<?php echo ROOT_PATH; ?>js/select2.min.js"></script>
<script type="text/javascript" src="<?php echo ROOT_PATH; ?>js/fabric.min.js"></script>
<?php <?php
if($ost && ($headers=$ost->getExtraHeaders())) { if($ost && ($headers=$ost->getExtraHeaders())) {
echo "\n\t".implode("\n\t", $headers)."\n"; echo "\n\t".implode("\n\t", $headers)."\n";
......
...@@ -53,6 +53,7 @@ if(is_object($thisstaff) && $thisstaff->isStaff()) { ?> ...@@ -53,6 +53,7 @@ if(is_object($thisstaff) && $thisstaff->isStaff()) { ?>
<script type="text/javascript" src="./js/jquery.translatable.js"></script> <script type="text/javascript" src="./js/jquery.translatable.js"></script>
<script type="text/javascript" src="./js/jquery.dropdown.js"></script> <script type="text/javascript" src="./js/jquery.dropdown.js"></script>
<script type="text/javascript" src="./js/bootstrap-tooltip.js"></script> <script type="text/javascript" src="./js/bootstrap-tooltip.js"></script>
<script type="text/javascript" src="<?php echo ROOT_PATH; ?>js/fabric.min.js"></script>
<link type="text/css" rel="stylesheet" href="./css/tooltip.css"> <link type="text/css" rel="stylesheet" href="./css/tooltip.css">
<script type="text/javascript"> <script type="text/javascript">
getConfig().resolve(<?php getConfig().resolve(<?php
......
...@@ -908,14 +908,6 @@ RedactorPlugins.imageannotate = function() { ...@@ -908,14 +908,6 @@ RedactorPlugins.imageannotate = function() {
init: function() { init: function() {
var redactor = this, var redactor = this,
self = this.imageannotate; self = this.imageannotate;
if (typeof window.fabric === 'undefined' && !loadedFabric) {
$.ajax({
dataType: 'script',
cache: true,
url: '../js/fabric.min.js'
});
loadedFabric = true;
}
$(document).on('click', '.redactor-box img', function() { $(document).on('click', '.redactor-box img', function() {
var $image = $(this), var $image = $(this),
image_box = $('#redactor-image-box'); image_box = $('#redactor-image-box');
......
...@@ -22,10 +22,10 @@ var thread = { ...@@ -22,10 +22,10 @@ var thread = {
if (!entry) return; if (!entry) return;
var frame = 0; var frame = 0;
$('html, body').delay(500).animate({ $('html, body').animate({
scrollTop: entry.offset().top - 50, scrollTop: entry.offset().top - 50,
}, { }, {
duration: 750, duration: 400,
step: function(now, fx) { step: function(now, fx) {
// Recalc end target every few frames // Recalc end target every few frames
if (++frame % 6 == 0) if (++frame % 6 == 0)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment