From d484e71103a2d15985151d3ab941d22df6669080 Mon Sep 17 00:00:00 2001
From: Jared Hancock <jared@osticket.com>
Date: Mon, 4 Nov 2013 23:03:50 +0000
Subject: [PATCH] Make findRichtextBoxes() more reusable
Fixes #65
---
include/staff/ticket-view.inc.php | 3 ++-
js/osticket.js | 7 ++++---
js/redactor-osticket.js | 9 ++++++---
scp/js/scp.js | 7 ++++---
4 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/include/staff/ticket-view.inc.php b/include/staff/ticket-view.inc.php
index 78714bbd3..ff8cec8ff 100644
--- a/include/staff/ticket-view.inc.php
+++ b/include/staff/ticket-view.inc.php
@@ -148,7 +148,8 @@ if($ticket->isOverdue())
echo $ticket->getOwnerId(); ?>"
onclick="javascript:
$('#overlay').show();
- $('#user-info .body').load(this.href);
+ $('#user-info .body').load(this.href,
+ function() { $(this).redactify(); });
$('#user-info').show();
return false;
"><i class="icon-user"></i> <?php
diff --git a/js/osticket.js b/js/osticket.js
index 1e8db97d4..3f38a6ec3 100644
--- a/js/osticket.js
+++ b/js/osticket.js
@@ -79,10 +79,11 @@ $(document).ready(function(){
});
getConfig = (function() {
- var dfd = $.Deferred();
+ var dfd = $.Deferred(),
+ requested = false;
return function() {
- if (dfd.state() != 'resolved')
- $.ajax({
+ if (dfd.state() != 'resolved' && !requested)
+ requested = $.ajax({
url: "ajax.php/config/client",
dataType: 'json',
success: function (json_config) {
diff --git a/js/redactor-osticket.js b/js/redactor-osticket.js
index 0cacb986e..dffb115cb 100644
--- a/js/redactor-osticket.js
+++ b/js/redactor-osticket.js
@@ -182,8 +182,8 @@ $(function() {
}
el.redactor(options);
},
- findRichtextBoxes = function() {
- $('.richtext').each(function(i,el) {
+ findRichtextBoxes = function(context) {
+ $('.richtext', context||document).each(function(i,el) {
if ($(el).hasClass('ifhtml'))
// Check if html_thread is enabled first
getConfig().then(function(c) {
@@ -196,5 +196,8 @@ $(function() {
});
};
findRichtextBoxes();
- $('#user-info').ajaxComplete(findRichtextBoxes);
+ $.fn.redactify = function() {
+ this.each(function(i,e) { findRichtextBoxes(e); });
+ return this;
+ }
});
diff --git a/scp/js/scp.js b/scp/js/scp.js
index c764a4c52..523752060 100644
--- a/scp/js/scp.js
+++ b/scp/js/scp.js
@@ -469,10 +469,11 @@ $(document).ready(function(){
// NOTE: getConfig should be global
getConfig = (function() {
- var dfd = $.Deferred();
+ var dfd = $.Deferred(),
+ requested = null;
return function() {
- if (dfd.state() != 'resolved')
- $.ajax({
+ if (dfd.state() != 'resolved' && !requested)
+ requested = $.ajax({
url: "ajax.php/config/scp",
dataType: 'json',
success: function (json_config) {
--
GitLab