From f0b3e5fe4f3d40a95e1f4f6e8cd62246a7c93c83 Mon Sep 17 00:00:00 2001 From: cfoe <cfoe@ispconfig3> Date: Wed, 27 Jun 2012 05:02:13 -0400 Subject: [PATCH] changed template switch folder to _theme-name_/templates/_module-name_/* --- interface/web/js/scrigo.js.php | 40 ++++++++++++++++++++++++++++++++++++++-- 1 files changed, 38 insertions(+), 2 deletions(-) diff --git a/interface/web/js/scrigo.js.php b/interface/web/js/scrigo.js.php index 7e01c7d..16301de 100644 --- a/interface/web/js/scrigo.js.php +++ b/interface/web/js/scrigo.js.php @@ -203,6 +203,9 @@ var pageContentObject2 = jQuery.ajax({ type: "GET", url: pagename, dataType: "html", + beforeSend: function() { + jQuery('#pageContent').html('<div id="ajaxloader"><img src="themes/default/images/ajax-loader.gif" /></div>'); + }, success: function(data, textStatus, jqXHR) { if(jqXHR.responseText.indexOf('HEADER_REDIRECT:') > -1) { var parts = jqXHR.responseText.split(':'); @@ -215,9 +218,9 @@ //var reponse = jQuery(jqXHR.responseText); //var reponseScript = reponse.filter("script"); //jQuery.each(reponseScript, function(idx, val) { eval(val.text); } ); + jQuery('#pageContent').html(jqXHR.responseText); } - }, error: function() { reportError('Ajax Request was not successful. 113'); @@ -555,7 +558,7 @@ var newPWField = oldPWField.clone(); newPWField.attr('type', 'text').attr('id', 'tmp'+passwordFieldID).insertBefore(oldPWField); oldPWField.remove(); - newPWField.attr('id', passwordFieldID).val(password(10, true)).trigger('keyup'); + newPWField.attr('id', passwordFieldID).val(password(10, false)).trigger('keyup'); } function checkPassMatch(pwField1,pwField2){ @@ -579,3 +582,36 @@ return Math.floor(Math.random() * (max - min + 1)) + min; } +jQuery('.addPlaceholder').live("click", function(){ + var placeholderText = jQuery(this).text(); + var template = jQuery(this).siblings(':input'); + template.insertAtCaret(placeholderText); +}); + +jQuery.fn.extend({ + insertAtCaret: function(myValue){ + return this.each(function(i) { + if (document.selection) { + //For browsers like Internet Explorer + this.focus(); + sel = document.selection.createRange(); + sel.text = myValue; + this.focus(); + } else if (this.selectionStart || this.selectionStart == '0') { + //For browsers like Firefox and Webkit based + var startPos = this.selectionStart; + var endPos = this.selectionEnd; + var scrollTop = this.scrollTop; + this.value = this.value.substring(0, startPos)+myValue+this.value.substring(endPos,this.value.length); + this.focus(); + this.selectionStart = startPos + myValue.length; + this.selectionEnd = startPos + myValue.length; + this.scrollTop = scrollTop; + } else { + this.value += myValue; + this.focus(); + } + }) + } +}); + -- Gitblit v1.9.1