mirror of
https://github.com/e107inc/e107.git
synced 2025-08-04 21:57:51 +02:00
quick JS fix to prevent BBcode JS errors
This commit is contained in:
@@ -33,7 +33,7 @@ var localTime = Math.floor(nowLocal.getTime()/1000); /* time, in ms -- recorded
|
|||||||
*/
|
*/
|
||||||
function SyncWithServerTime(serverTime, path, domain)
|
function SyncWithServerTime(serverTime, path, domain)
|
||||||
{
|
{
|
||||||
if (serverTime)
|
if (serverTime)
|
||||||
{
|
{
|
||||||
/* update time difference cookie */
|
/* update time difference cookie */
|
||||||
var serverDelta=Math.floor(localTime-serverTime);
|
var serverDelta=Math.floor(localTime-serverTime);
|
||||||
@@ -534,7 +534,7 @@ var e107Base = {
|
|||||||
return data;
|
return data;
|
||||||
},
|
},
|
||||||
|
|
||||||
parseLan: function(str) {
|
parseLan: function(str) {
|
||||||
return String(str).interpolate(this.getLanVars());
|
return String(str).interpolate(this.getLanVars());
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -885,7 +885,7 @@ Object.extend(e107Helper, {
|
|||||||
e107Helper.selectAutoSubmit(e.element());
|
e107Helper.selectAutoSubmit(e.element());
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
selectAutoSubmit: function(el) {
|
selectAutoSubmit: function(el) {
|
||||||
var frm = el.up('form');
|
var frm = el.up('form');
|
||||||
if (frm) {
|
if (frm) {
|
||||||
@@ -896,7 +896,7 @@ Object.extend(e107Helper, {
|
|||||||
}
|
}
|
||||||
frm.submit();
|
frm.submit();
|
||||||
}
|
}
|
||||||
if(el.hasClassName('reset')) el.selectedIndex = 0;
|
if(el.hasClassName('reset')) el.selectedIndex = 0;
|
||||||
},
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -1149,7 +1149,7 @@ Element.addMethods( {
|
|||||||
downShow: e107Helper.downShow,
|
downShow: e107Helper.downShow,
|
||||||
downToggle: e107Helper.downToggle,
|
downToggle: e107Helper.downToggle,
|
||||||
downExternalLinks: e107Helper.downExternalLinks,
|
downExternalLinks: e107Helper.downExternalLinks,
|
||||||
|
|
||||||
// -- more useful extensions - taken from Prototype UI --
|
// -- more useful extensions - taken from Prototype UI --
|
||||||
getScrollDimensions: function(element) {
|
getScrollDimensions: function(element) {
|
||||||
element = $(element);
|
element = $(element);
|
||||||
@@ -1191,11 +1191,11 @@ Element.addMethods( {
|
|||||||
Object.extend(document.viewport, {
|
Object.extend(document.viewport, {
|
||||||
// Alias this method for consistency
|
// Alias this method for consistency
|
||||||
getScrollOffset: document.viewport.getScrollOffsets,
|
getScrollOffset: document.viewport.getScrollOffsets,
|
||||||
|
|
||||||
setScrollOffset: function(offset) {
|
setScrollOffset: function(offset) {
|
||||||
Element.setScrollOffset(Prototype.Browser.WebKit ? document.body : document.documentElement, offset);
|
Element.setScrollOffset(Prototype.Browser.WebKit ? document.body : document.documentElement, offset);
|
||||||
},
|
},
|
||||||
|
|
||||||
getScrollDimensions: function() {
|
getScrollDimensions: function() {
|
||||||
return Element.getScrollDimensions(Prototype.Browser.WebKit ? document.body : document.documentElement);
|
return Element.getScrollDimensions(Prototype.Browser.WebKit ? document.body : document.documentElement);
|
||||||
}
|
}
|
||||||
@@ -1244,7 +1244,7 @@ e107Helper.BB = {
|
|||||||
newStart = eField.selectionStart + tags.start.length + sel.length + tags.end.length;
|
newStart = eField.selectionStart + tags.start.length + sel.length + tags.end.length;
|
||||||
if(eField.selectionStart || (!eField.selectionStart && eField.selectionEnd != eField.textLength)) {
|
if(eField.selectionStart || (!eField.selectionStart && eField.selectionEnd != eField.textLength)) {
|
||||||
newEnd = (eField.value).substring(eField.selectionEnd, eField.textLength);
|
newEnd = (eField.value).substring(eField.selectionEnd, eField.textLength);
|
||||||
}
|
}
|
||||||
eField.value = (eField.value).substring(0, eField.selectionStart) + tags.start + sel + tags.end + newEnd;
|
eField.value = (eField.value).substring(0, eField.selectionStart) + tags.start + sel + tags.end + newEnd;
|
||||||
eField.focus(); eField.selectionStart = newStart; eField.selectionEnd = newStart; eField.scrollTop = scrollPos;
|
eField.focus(); eField.selectionStart = newStart; eField.selectionEnd = newStart; eField.scrollTop = scrollPos;
|
||||||
return;
|
return;
|
||||||
@@ -1710,9 +1710,10 @@ var addtext = function(text, emote) {
|
|||||||
// Prompt for user input value
|
// Prompt for user input value
|
||||||
var addinput = function(text) {
|
var addinput = function(text) {
|
||||||
|
|
||||||
var rep = text.match(/=([a-z0-9, ]*)]/);
|
// quick fix to prevent JS errors - proper match was done only for latin words
|
||||||
var val = prompt(rep[1]);
|
var rep = text.match(/\=([^\]]*)\]/);
|
||||||
|
var val = rep ? prompt(rep[1]) : prompt('http://');
|
||||||
|
|
||||||
if(!val)
|
if(!val)
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
@@ -2326,7 +2327,7 @@ Ajax.Updater = Class.create(Ajax.Updater, {
|
|||||||
|
|
||||||
onException: function(request, e) {
|
onException: function(request, e) {
|
||||||
//TODO handle exceptions
|
//TODO handle exceptions
|
||||||
alert('e107Ajax Exception: ' + e);
|
alert('e107Ajax Exception: ' + e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2607,7 +2608,7 @@ Object.extend(e107Ajax, {
|
|||||||
Object.extend(opt.parameters, parm || {});
|
Object.extend(opt.parameters, parm || {});
|
||||||
if ($(form).hasAttribute('method') && !opt.method) opt.method = $(form).method;
|
if ($(form).hasAttribute('method') && !opt.method) opt.method = $(form).method;
|
||||||
if(!opt.method) opt.method = 'post';
|
if(!opt.method) opt.method = 'post';
|
||||||
|
|
||||||
if(container)
|
if(container)
|
||||||
return new e107Ajax.Updater(container, url, opt);
|
return new e107Ajax.Updater(container, url, opt);
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user