makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/11314] Fix issues mentioned in jshint report

Browse source 
Additionally, the editor.js files are now the same file in both
subsilver2, prosilver, and the acp.

PHPBB3-11314
This commit is contained in:
Marc Alexander 2013-02-27 23:12:34 +01:00
parent 96b1cabcf2
commit 36168b311e
8 changed files with 207 additions and 181 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
phpBB/adm/style/permissions.js
View file

@ -21,7 +21,7 @@ function display_checkboxes(status)
for (var i = 0; i < cb.length; i++ )
{
if (cb[i].className == 'permissions-checkbox')
if (cb[i].className === 'permissions-checkbox')
{
cb[i].style.display = display;
}
@ -78,13 +78,13 @@ function reset_opacity(status, except_id) {
for (var i = 0; i < fs.length; i++ )
{
if (fs[i].className != 'quick')
if (fs[i].className !== 'quick')
{
set_opacity(fs[i], opacity);
}
}
if (typeof(except_id) != 'undefined')
if (typeof(except_id) !== 'undefined')
{
set_opacity(document.getElementById('perm' + except_id), 10);
}
@ -103,7 +103,7 @@ function get_radio_status(index, rb)
{
for (var i = index; i < rb.length; i = i + 3 )
{
if (rb[i].checked != true)
if (rb[i].checked !== true)
{
if (i > index)
{
@ -130,7 +130,7 @@ function set_colours(id, init, quick)
var table = document.getElementById('table' + id);
var tab = document.getElementById('tab' + id);
if (typeof(quick) != 'undefined')
if (typeof(quick) !== 'undefined')
{
tab.className = 'permissions-preset-' + quick + ' activetab';
return;
@ -141,25 +141,25 @@ function set_colours(id, init, quick)
var status = get_radio_status(0, rb);
if (status == 1)
if (status === 1)
{
colour = 'yes';
}
else if (status == 0)
else if (status === 0)
{
// We move on to No
status = get_radio_status(1, rb);
if (status == 1)
if (status === 1)
{
colour = 'no';
}
else if (status == 0)
else if (status === 0)
{
// We move on to Never
status = get_radio_status(2, rb);
if (status == 1)
if (status === 1)
{
colour = 'never';
}
@ -188,7 +188,7 @@ function init_colours(block_id)
for (var i = 0; i < panels.length; i++)
{
if(panels[i].className == 'permissions-panel')
if(panels[i].className === 'permissions-panel')
{
set_colours(panels[i].id.replace(/options/, ''), true);
}
@ -212,7 +212,7 @@ function swap_options(pmask, fmask, cat, adv, view)
var new_tab = document.getElementById('tab' + id);
var adv_block = document.getElementById('advanced' + pmask + fmask);
if (adv_block.style.display == 'block' && adv == true)
if (adv_block.style.display === 'block' && adv === true)
{
dE('advanced' + pmask + fmask, -1);
reset_opacity(1);
@ -221,13 +221,13 @@ function swap_options(pmask, fmask, cat, adv, view)
}
// no need to set anything if we are clicking on the same tab again
if (new_tab == old_tab && !adv)
if (new_tab === old_tab && !adv)
{
return;
}
// init colours
if (adv && (pmask + fmask) != (active_pmask + active_fmask))
if (adv && (pmask + fmask) !== (active_pmask + active_fmask))
{
init_colours(pmask + fmask);
display_checkboxes(true);
@ -244,7 +244,7 @@ function swap_options(pmask, fmask, cat, adv, view)
old_tab.className = old_tab.className.replace(/\ activetab/g, '');
new_tab.className = new_tab.className + ' activetab';
if (id == active_option && adv != true)
if (id === active_option && adv !== true)
{
return;
}
@ -256,7 +256,7 @@ function swap_options(pmask, fmask, cat, adv, view)
{
dE('checkbox' + pmask + fmask, -1);
if ((pmask + fmask) != (active_pmask + active_fmask))
if ((pmask + fmask) !== (active_pmask + active_fmask))
{
document.getElementById('checkbox' + active_pmask + active_fmask).style.display = 'inline';
}
@ -295,7 +295,7 @@ function mark_options(id, s)
for (var r = 0; r < rb.length; r++)
{
if (rb[r].id.substr(rb[r].id.length-1) == s)
if (rb[r].id.substr(rb[r].id.length-1) === s)
{
rb[r].checked = true;
}
@ -315,7 +315,7 @@ function mark_one_option(id, field_name, s)
for (var r = 0; r < rb.length; r++)
{
if (rb[r].id.substr(rb[r].id.length-field_name.length-3, field_name.length) == field_name && rb[r].id.substr(rb[r].id.length-1) == s)
if (rb[r].id.substr(rb[r].id.length-field_name.length-3, field_name.length) === field_name && rb[r].id.substr(rb[r].id.length-1) === s)
{
rb[r].checked = true;
}
@ -354,6 +354,6 @@ function set_role_settings(role_id, target_id)
for (var r in settings)
{
mark_one_option(target_id, r, (settings[r] == 1) ? 'y' : 'n');
mark_one_option(target_id, r, (settings[r] === 1) ? 'y' : 'n');
}
}

16
phpBB/adm/style/tooltip.js
View file

@ -33,7 +33,7 @@ function enable_tooltips_link(id, headline, sub_id)
document.getElementsByTagName('body')[0].appendChild(hold);
if (id == null)
if (id === null)
{
links = document.getElementsByTagName('a');
}
@ -46,7 +46,7 @@ function enable_tooltips_link(id, headline, sub_id)
{
if (sub_id)
{
if (links[i].id.substr(0, sub_id.length) == sub_id)
if (links[i].id.substr(0, sub_id.length) === sub_id)
{
prepare(links[i]);
}
@ -81,7 +81,7 @@ function enable_tooltips_select(id, headline, sub_id)
document.getElementsByTagName('body')[0].appendChild(hold);
if (id == null)
if (id === null)
{
links = document.getElementsByTagName('option');
}
@ -94,7 +94,7 @@ function enable_tooltips_select(id, headline, sub_id)
{
if (sub_id)
{
if (links[i].parentNode.id.substr(0, sub_id.length) == sub_id)
if (links[i].parentNode.id.substr(0, sub_id.length) === sub_id)
{
prepare(links[i]);
}
@ -117,7 +117,7 @@ function prepare(element)
text = element.getAttribute('title');
if (text == null || text.length == 0)
if (text === null || text.length === 0)
{
return;
}
@ -139,7 +139,7 @@ function prepare(element)
element.onmouseover = show_tooltip;
element.onmouseout = hide_tooltip;
if (tooltip_mode == 'link')
if (tooltip_mode === 'link')
{
element.onmousemove = locate;
}
@ -200,7 +200,7 @@ function locate(e)
if (e.offsetParent)
{
for (var posx = 0, posy = 0; e.offsetParent; e = e.offsetParent)
for (posx = 0, posy = 0; e.offsetParent; e = e.offsetParent)
{
posx += e.offsetLeft;
posy += e.offsetTop;
@ -212,7 +212,7 @@ function locate(e)
posy = e.offsetTop;
}
if (tooltip_mode == 'link')
if (tooltip_mode === 'link')
{
document.getElementById('_tooltip_container').style.top=(posy+20) + 'px';
document.getElementById('_tooltip_container').style.left=(posx-20) + 'px';

14
phpBB/assets/javascript/core.js
View file

@ -353,7 +353,7 @@ phpbb.ajaxify = function(options) {
return;
}
if (overlay && (typeof $this.attr('data-overlay') === 'undefined' || $this.attr('data-overlay') == 'true'))
if (overlay && (typeof $this.attr('data-overlay') === 'undefined' || $this.attr('data-overlay') === 'true'))
{
phpbb.loadingAlert();
}
@ -387,7 +387,7 @@ phpbb.ajaxify = function(options) {
* @param bool keepSelection Shall we keep the value selected, or shall the user be forced to repick one.
*/
phpbb.timezoneSwitchDate = function(keepSelection) {
if ($('#timezone_copy').length == 0) {
if ($('#timezone_copy').length === 0) {
// We make a backup of the original dropdown, so we can remove optgroups
// instead of setting display to none, because IE and chrome will not
// hide options inside of optgroups and selects via css
@ -397,17 +397,17 @@ phpbb.timezoneSwitchDate = function(keepSelection) {
$('#timezone').replaceWith($('#timezone_copy').clone().attr('id', 'timezone').css('display', 'block').attr('name', 'tz'));
}
if ($('#tz_date').val() != '') {
if ($('#tz_date').val() !== '') {
$('#timezone > optgroup').remove(":not([label='" + $('#tz_date').val() + "'])");
}
if ($('#tz_date').val() == $('#tz_select_date_suggest').attr('data-suggested-tz')) {
if ($('#tz_date').val() === $('#tz_select_date_suggest').attr('data-suggested-tz')) {
$('#tz_select_date_suggest').css('display', 'none');
} else {
$('#tz_select_date_suggest').css('display', 'inline');
}
if ($("#timezone > optgroup[label='" + $('#tz_date').val() + "'] > option").size() == 1) {
if ($("#timezone > optgroup[label='" + $('#tz_date').val() + "'] > option").size() === 1) {
// If there is only one timezone for the selected date, we just select that automatically.
$("#timezone > optgroup[label='" + $('#tz_date').val() + "'] > option:first").attr('selected', true);
keepSelection = true;
@ -468,8 +468,8 @@ phpbb.timezonePreselectSelect = function(forceSelector) {
for (i = 0; i < selectorOptions.length; ++i) {
var option = selectorOptions[i];
if (option.value.substring(0, prefixLength) == prefix) {
if ($('#tz_date').val() != option.value && !forceSelector) {
if (option.value.substring(0, prefixLength) === prefix) {
if ($('#tz_date').val() !== option.value && !forceSelector) {
// We do not select the option for the user, but notify him,
// that we would suggest a different setting.
phpbb.timezoneSwitchDate(true);

6
phpBB/styles/prosilver/template/ajax.js
View file

@ -39,7 +39,7 @@ phpbb.addAjaxCallback('mark_forums_read', function(res) {
// Mark topics read if we are watching a category and showing active topics
if ($('#active_topics').length) {
phpbb.ajaxCallbacks['mark_topics_read'].call(this, res, false);
phpbb.ajaxCallbacks.mark_topics_read.call(this, res, false);
}
// Update mark forums read links
@ -75,7 +75,7 @@ phpbb.addAjaxCallback('mark_topics_read', function(res, update_topic_links) {
$.each(iconsArray, function(unreadClass, readClass) {
$.each(iconsState, function(key, value) {
// Only topics can be hot
if ((value == '_hot' || value == '_hot_mine') && unreadClass != 'topic_unread') {
if ((value === '_hot' || value === '_hot_mine') && unreadClass !== 'topic_unread') {
return true;
}
classMap[unreadClass + value] = readClass + value;
@ -218,7 +218,7 @@ $('#quick-mod-select').change(function () {
*/
$('#member_search').click(function () {
$('#memberlist_search').slideToggle('fast');
phpbb.ajax_callbacks['alt_text'].call(this);
phpbb.ajax_callbacks.alt_text.call(this);
// Focus on the username textbox if it's available and displayed
if ($('#memberlist_search').is(':visible')) {
$('#username').focus();

48
phpBB/styles/prosilver/template/editor.js
View file

@ -6,15 +6,15 @@
// Startup variables
var imageTag = false;
var theSelection = false;
var bbcodeEnabled = true;
// Check for Browser & Platform for PC & IE specific bits
// More details from: http://www.mozilla.org/docs/web-developer/sniffer/browser_type.html
var clientPC = navigator.userAgent.toLowerCase(); // Get client info
var clientVer = parseInt(navigator.appVersion, 10); // Get browser version
var is_ie = ((clientPC.indexOf('msie') != -1) && (clientPC.indexOf('opera') == -1));
var is_win = ((clientPC.indexOf('win') != -1) || (clientPC.indexOf('16bit') != -1));
var is_ie = ((clientPC.indexOf('msie') !== -1) && (clientPC.indexOf('opera') === -1));
var is_win = ((clientPC.indexOf('win') !== -1) || (clientPC.indexOf('16bit') !== -1));
var baseHeight;
/**
@ -44,7 +44,7 @@ function initInsertions()
var textarea = doc.forms[form_name].elements[text_name];
if (is_ie && typeof(baseHeight) != 'number')
if (is_ie && typeof(baseHeight) !== 'number')
{
textarea.focus();
baseHeight = doc.selection.createRange().duplicate().boundingHeight;
@ -61,7 +61,7 @@ function initInsertions()
*/
function bbstyle(bbnumber)
{
if (bbnumber != -1)
if (bbnumber !== -1)
{
bbfontstyle(bbtags[bbnumber], bbtags[bbnumber+1]);
}
@ -147,6 +147,7 @@ function insert_text(text, spaces, popup)
{
textarea = opener.document.forms[form_name].elements[text_name];
}
if (spaces)
{
text = ' ' + text + ' ';
@ -165,19 +166,20 @@ function insert_text(text, spaces, popup)
}
else if (textarea.createTextRange && textarea.caretPos)
{
if (baseHeight != textarea.caretPos.boundingHeight)
if (baseHeight !== textarea.caretPos.boundingHeight)
{
textarea.focus();
storeCaret(textarea);
}
var caret_pos = textarea.caretPos;
caret_pos.text = caret_pos.text.charAt(caret_pos.text.length - 1) == ' ' ? caret_pos.text + text + ' ' : caret_pos.text + text;
caret_pos.text = caret_pos.text.charAt(caret_pos.text.length - 1) === ' ' ? caret_pos.text + text + ' ' : caret_pos.text + text;
}
else
{
textarea.value = textarea.value + text;
}
if (!popup)
{
textarea.focus();
@ -201,6 +203,7 @@ function addquote(post_id, username, l_wrote)
var message_name = 'message_' + post_id;
var theSelection = '';
var divarea = false;
var i;
if (l_wrote === undefined)
{
@ -232,7 +235,7 @@ function addquote(post_id, username, l_wrote)
theSelection = document.selection.createRange().text;
}
if (theSelection == '' || typeof theSelection == 'undefined' || theSelection == null)
if (theSelection === '' || typeof theSelection === 'undefined' || theSelection === null)
{
if (divarea.innerHTML)
{
@ -282,6 +285,8 @@ function split_lines(text)
var lines = text.split('\n');
var splitLines = new Array();
var j = 0;
var i;
for(i = 0; i < lines.length; i++)
{
if (lines[i].length <= 80)
@ -292,11 +297,12 @@ function split_lines(text)
else
{
var line = lines[i];
var splitAt;
do
{
var splitAt = line.indexOf(' ', 80);
splitAt = line.indexOf(' ', 80);
if (splitAt == -1)
if (splitAt === -1)
{
splitLines[j] = line;
j++;
@ -308,22 +314,23 @@ function split_lines(text)
j++;
}
}
while(splitAt != -1);
while(splitAt !== -1);
}
}
return splitLines;
}
/**
* From http://www.massless.org/mozedit/
*/
function mozWrap(txtarea, open, close)
{
var selLength = (typeof(txtarea.textLength) == 'undefined') ? txtarea.value.length : txtarea.textLength;
var selLength = (typeof(txtarea.textLength) === 'undefined') ? txtarea.value.length : txtarea.textLength;
var selStart = txtarea.selectionStart;
var selEnd = txtarea.selectionEnd;
var scrollTop = txtarea.scrollTop;
if (selEnd == 1 || selEnd == 2)
if (selEnd === 1 || selEnd === 2)
{
selEnd = selLength;
}
@ -372,14 +379,14 @@ function colorPalette(dir, width, height)
for (r = 0; r < 5; r++)
{
if (dir == 'h')
if (dir === 'h')
{
document.writeln('<tr>');
}
for (g = 0; g < 5; g++)
{
if (dir == 'v')
if (dir === 'v')
{
document.writeln('<tr>');
}
@ -392,13 +399,13 @@ function colorPalette(dir, width, height)
document.writeln('</td>');
}
if (dir == 'v')
if (dir === 'v')
{
document.writeln('</tr>');
}
}
if (dir == 'h')
if (dir === 'h')
{
document.writeln('</tr>');
}
@ -406,7 +413,6 @@ function colorPalette(dir, width, height)
document.writeln('</table>');
}
/**
* Caret Position object
*/
@ -416,7 +422,6 @@ function caretPosition()
var end = null;
}
/**
* Get the caret position in an textarea
*/
@ -425,15 +430,14 @@ function getCaretPosition(txtarea)
var caretPos = new caretPosition();
// simple Gecko/Opera way
if(txtarea.selectionStart || txtarea.selectionStart == 0)
if (txtarea.selectionStart || txtarea.selectionStart === 0)
{
caretPos.start = txtarea.selectionStart;
caretPos.end = txtarea.selectionEnd;
}
// dirty and slow IE way
else if(document.selection)
else if (document.selection)
{
// get current selection
var range = document.selection.createRange();

114
phpBB/styles/prosilver/template/forum_fn.js
View file

@ -23,9 +23,9 @@ function jumpto()
{
var page = prompt(jump_page, on_page);
if (page !== null && !isNaN(page) && page == Math.floor(page) && page > 0)
if (page !== null && !isNaN(page) && page === Math.floor(page) && page > 0)
{
if (base_url.indexOf('?') == -1)
if (base_url.indexOf('?') === -1)
{
document.location.href = base_url + '?start=' + ((page - 1) * per_page);
}
@ -53,7 +53,7 @@ function marklist(id, name, state)
for (var r = 0; r < rb.length; r++)
{
if (rb[r].name.substr(0, name.length) == name)
if (rb[r].name.substr(0, name.length) === name)
{
rb[r].checked = state;
}
@ -66,7 +66,10 @@ function marklist(id, name, state)
*/
function viewableArea(e, itself)
{
if (!e) return;
if (!e) {
return;
}
if (!itself)
{
e = e.parentNode;
@ -106,9 +109,9 @@ function dE(n, s, type)
var e = document.getElementById(n);
if (!s)
{
s = (e.style.display == '' || e.style.display == type) ? -1 : 1;
s = (e.style.display === '' || e.style.display === type) ? -1 : 1;
}
e.style.display = (s == 1) ? type : 'none';
e.style.display = (s === 1) ? type : 'none';
}
/**
@ -118,7 +121,7 @@ function subPanels(p)
{
var i, e, t;
if (typeof(p) == 'string')
if (typeof(p) === 'string')
{
show_panel = p;
}
@ -130,7 +133,7 @@ function subPanels(p)
if (e)
{
if (panels[i] == show_panel)
if (panels[i] === show_panel)
{
e.style.display = 'block';
if (t)
@ -173,7 +176,7 @@ function printPage()
*/
function displayBlocks(c, e, t)
{
var s = (e.checked == true) ? 1 : -1;
var s = (e.checked === true) ? 1 : -1;
if (t)
{
@ -184,9 +187,9 @@ function displayBlocks(c, e, t)
for (var d = 0; d < divs.length; d++)
{
if (divs[d].className.indexOf(c) == 0)
if (divs[d].className.indexOf(c) === 0)
{
divs[d].style.display = (s == 1) ? 'none' : 'block';
divs[d].style.display = (s === 1) ? 'none' : 'block';
}
}
}
@ -195,11 +198,12 @@ function selectCode(a)
{
// Get ID of code block
var e = a.parentNode.parentNode.getElementsByTagName('CODE')[0];
var s, r;
// Not IE and IE9+
if (window.getSelection)
{
var s = window.getSelection();
s = window.getSelection();
// Safari
if (s.setBaseAndExtent)
{
@ -209,12 +213,12 @@ function selectCode(a)
else
{
// workaround for bug # 42885
if (window.opera && e.innerHTML.substring(e.innerHTML.length - 4) == '<BR>')
if (window.opera && e.innerHTML.substring(e.innerHTML.length - 4) === '<BR>')
{
e.innerHTML = e.innerHTML + '&nbsp;';
}
var r = document.createRange();
r = document.createRange();
r.selectNodeContents(e);
s.removeAllRanges();
s.addRange(r);
@ -223,8 +227,8 @@ function selectCode(a)
// Some older browsers
else if (document.getSelection)
{
var s = document.getSelection();
var r = document.createRange();
s = document.getSelection();
r = document.createRange();
r.selectNodeContents(e);
s.removeAllRanges();
s.addRange(r);
@ -232,7 +236,7 @@ function selectCode(a)
// IE
else if (document.selection)
{
var r = document.body.createTextRange();
r = document.body.createTextRange();
r.moveToElementText(e);
r.select();
}
@ -245,22 +249,23 @@ function selectCode(a)
function play_qt_file(obj)
{
var rectangle = obj.GetRectangle();
var width, height;
if (rectangle)
{
rectangle = rectangle.split(',');
var x1 = parseInt(rectangle[0]);
var x2 = parseInt(rectangle[2]);
var y1 = parseInt(rectangle[1]);
var y2 = parseInt(rectangle[3]);
var x1 = parseInt(rectangle[0], 10);
var x2 = parseInt(rectangle[2], 10);
var y1 = parseInt(rectangle[1], 10);
var y2 = parseInt(rectangle[3], 10);
var width = (x1 < 0) ? (x1 * -1) + x2 : x2 - x1;
var height = (y1 < 0) ? (y1 * -1) + y2 : y2 - y1;
width = (x1 < 0) ? (x1 * -1) + x2 : x2 - x1;
height = (y1 < 0) ? (y1 * -1) + y2 : y2 - y1;
}
else
{
var width = 200;
var height = 0;
width = 200;
height = 0;
}
obj.width = width;
@ -276,7 +281,7 @@ function play_qt_file(obj)
*/
function is_node_name(elem, name)
{
return elem.nodeName && elem.nodeName.toUpperCase() == name.toUpperCase();
return elem.nodeName && elem.nodeName.toUpperCase() === name.toUpperCase();
}
/**
@ -285,10 +290,12 @@ function is_node_name(elem, name)
*/
function is_in_array(elem, array)
{
for (var i = 0, length = array.length; i < length; i++)
for (var i = 0, length = array.length; i < length; i++) {
// === is correct (IE)
if (array[i] === elem)
if (array[i] === elem) {
return i;
}
}
return -1;
}
@ -304,17 +311,22 @@ function find_in_tree(node, tag, type, class_name)
for (element = node.childNodes[0]; i < length; element = node.childNodes[++i])
{
if (!element || element.nodeType != 1) continue;
if (!element || element.nodeType !== 1) {
continue;
}
if ((!tag || is_node_name(element, tag)) && (!type || element.type == type) && (!class_name || is_in_array(class_name, (element.className || element).toString().split(/\s+/)) > -1))
if ((!tag || is_node_name(element, tag)) && (!type || element.type === type) && (!class_name || is_in_array(class_name, (element.className || element).toString().split(/\s+/)) > -1))
{
return element;
}
if (element.childNodes.length)
if (element.childNodes.length) {
result = find_in_tree(element, tag, type, class_name);
}
if (result) return result;
if (result) {
return result;
}
}
}
@ -327,14 +339,15 @@ var last_key_entered = '';
function phpbb_check_key(event)
{
// Keycode is array down or up?
if (event.keyCode && (event.keyCode == 40 || event.keyCode == 38))
if (event.keyCode && (event.keyCode === 40 || event.keyCode === 38)) {
in_autocomplete = true;
}
// Make sure we are not within an "autocompletion" field
if (in_autocomplete)
{
// If return pressed and key changed we reset the autocompletion
if (!last_key_entered || last_key_entered == event.which)
if (!last_key_entered || last_key_entered === event.which)
{
in_autocompletion = false;
return true;
@ -342,7 +355,7 @@ function phpbb_check_key(event)
}
// Keycode is not return, then return. ;)
if (event.which != 13)
if (event.which !== 13)
{
last_key_entered = event.which;
return true;
@ -357,17 +370,20 @@ function phpbb_check_key(event)
function submit_default_button(event, selector, class_name)
{
// Add which for key events
if (!event.which && ((event.charCode || event.charCode === 0) ? event.charCode : event.keyCode))
if (!event.which && ((event.charCode || event.charCode === 0) ? event.charCode : event.keyCode)) {
event.which = event.charCode || event.keyCode;
}
if (phpbb_check_key(event))
if (phpbb_check_key(event)) {
return true;
}
var current = selector['parentNode'];
var current = selector.parentNode;
// Search parent form element
while (current && (!current.nodeName || current.nodeType != 1 || !is_node_name(current, 'form')) && current != document)
current = current['parentNode'];
while (current && (!current.nodeName || current.nodeType !== 1 || !is_node_name(current, 'form')) && current !== document) {
current = current.parentNode;
}
// Find the input submit button with the class name
//current = find_in_tree(current, 'input', 'submit', class_name);
@ -376,12 +392,14 @@ function submit_default_button(event, selector, class_name)
for (var i = 0, element = input_tags[0]; i < input_tags.length; element = input_tags[++i])
{
if (element.type == 'submit' && is_in_array(class_name, (element.className || element).toString().split(/\s+/)) > -1)
if (element.type === 'submit' && is_in_array(class_name, (element.className || element).toString().split(/\s+/)) > -1) {
current = element;
}
}
if (!current)
if (!current) {
return true;
}
// Submit form
current.focus();
@ -403,13 +421,15 @@ function apply_onkeypress_event()
{
var default_button = jQuery(this).parents('form').find('input[type=submit].default-submit-action');
if (!default_button || default_button.length <= 0)
if (!default_button || default_button.length <= 0) {
return true;
}
if (phpbb_check_key(e))
if (phpbb_check_key(e)) {
return true;
}
if ((e.which && e.which == 13) || (e.keyCode && e.keyCode == 13))
if ((e.which && e.which === 13) || (e.keyCode && e.keyCode === 13))
{
default_button.click();
return false;
@ -425,7 +445,7 @@ function apply_onkeypress_event()
for (var i = 0, element = input_tags[0]; i < input_tags.length ; element = input_tags[++i])
{
if (element.type == 'text' || element.type == 'password')
if (element.type === 'text' || element.type === 'password')
{
// onkeydown is possible too
element.onkeypress = function (evt) { submit_default_button((evt || window.event), this, 'default-submit-action'); };
@ -436,4 +456,4 @@ function apply_onkeypress_event()
/**
* Detect JQuery existance. We currently do not deliver it, but some styles do, so why not benefit from it. ;)
*/
var jquery_present = typeof jQuery == 'function';
var jquery_present = typeof jQuery === 'function';

2
phpBB/styles/prosilver/template/timezone.js
View file

@ -15,7 +15,7 @@ $(document).ready(
);
$(document).ready(
phpbb.timezonePreselectSelect($('#tz_select_date_suggest').attr('data-is-registration') == 'true')
phpbb.timezonePreselectSelect($('#tz_select_date_suggest').attr('data-is-registration') === 'true')
);
})(jQuery); // Avoid conflicts with other libraries

52
phpBB/styles/subsilver2/template/editor.js
View file

@ -11,11 +11,10 @@ var bbcodeEnabled = true;
// Check for Browser & Platform for PC & IE specific bits
// More details from: http://www.mozilla.org/docs/web-developer/sniffer/browser_type.html
var clientPC = navigator.userAgent.toLowerCase(); // Get client info
var clientVer = parseInt(navigator.appVersion); // Get browser version
var is_ie = ((clientPC.indexOf('msie') != -1) && (clientPC.indexOf('opera') == -1));
var is_win = ((clientPC.indexOf('win') != -1) || (clientPC.indexOf('16bit') != -1));
var clientVer = parseInt(navigator.appVersion, 10); // Get browser version
var is_ie = ((clientPC.indexOf('msie') !== -1) && (clientPC.indexOf('opera') === -1));
var is_win = ((clientPC.indexOf('win') !== -1) || (clientPC.indexOf('16bit') !== -1));
var baseHeight;
/**
@ -44,7 +43,8 @@ function initInsertions()
}
var textarea = doc.forms[form_name].elements[text_name];
if (is_ie && typeof(baseHeight) != 'number')
if (is_ie && typeof(baseHeight) !== 'number')
{
textarea.focus();
baseHeight = doc.selection.createRange().duplicate().boundingHeight;
@ -61,7 +61,7 @@ function initInsertions()
*/
function bbstyle(bbnumber)
{
if (bbnumber != -1)
if (bbnumber !== -1)
{
bbfontstyle(bbtags[bbnumber], bbtags[bbnumber+1]);
}
@ -147,6 +147,7 @@ function insert_text(text, spaces, popup)
{
textarea = opener.document.forms[form_name].elements[text_name];
}
if (spaces)
{
text = ' ' + text + ' ';
@ -163,22 +164,22 @@ function insert_text(text, spaces, popup)
textarea.selectionStart = sel_start + text.length;
textarea.selectionEnd = sel_end + text.length;
}
else if (textarea.createTextRange && textarea.caretPos)
{
if (baseHeight != textarea.caretPos.boundingHeight)
if (baseHeight !== textarea.caretPos.boundingHeight)
{
textarea.focus();
storeCaret(textarea);
}
var caret_pos = textarea.caretPos;
caret_pos.text = caret_pos.text.charAt(caret_pos.text.length - 1) == ' ' ? caret_pos.text + text + ' ' : caret_pos.text + text;
var caret_pos = textarea.caretPos;
caret_pos.text = caret_pos.text.charAt(caret_pos.text.length - 1) === ' ' ? caret_pos.text + text + ' ' : caret_pos.text + text;
}
else
{
textarea.value = textarea.value + text;
}
if (!popup)
{
textarea.focus();
@ -202,6 +203,7 @@ function addquote(post_id, username, l_wrote)
var message_name = 'message_' + post_id;
var theSelection = '';
var divarea = false;
var i;
if (l_wrote === undefined)
{
@ -233,7 +235,7 @@ function addquote(post_id, username, l_wrote)
theSelection = document.selection.createRange().text;
}
if (theSelection == '' || typeof theSelection == 'undefined' || theSelection == null)
if (theSelection === '' || typeof theSelection === 'undefined' || theSelection === null)
{
if (divarea.innerHTML)
{
@ -278,12 +280,13 @@ function addquote(post_id, username, l_wrote)
return;
}
function split_lines(text)
{
var lines = text.split('\n');
var splitLines = new Array();
var j = 0;
var i;
for(i = 0; i < lines.length; i++)
{
if (lines[i].length <= 80)
@ -294,11 +297,12 @@ function split_lines(text)
else
{
var line = lines[i];
var splitAt;
do
{
var splitAt = line.indexOf(' ', 80);
splitAt = line.indexOf(' ', 80);
if (splitAt == -1)
if (splitAt === -1)
{
splitLines[j] = line;
j++;
@ -310,7 +314,7 @@ function split_lines(text)
j++;
}
}
while(splitAt != -1);
while(splitAt !== -1);
}
}
return splitLines;
@ -321,12 +325,12 @@ function split_lines(text)
*/
function mozWrap(txtarea, open, close)
{
var selLength = (typeof(txtarea.textLength) == 'undefined') ? txtarea.value.length : txtarea.textLength;
var selLength = (typeof(txtarea.textLength) === 'undefined') ? txtarea.value.length : txtarea.textLength;
var selStart = txtarea.selectionStart;
var selEnd = txtarea.selectionEnd;
var scrollTop = txtarea.scrollTop;
if (selEnd == 1 || selEnd == 2)
if (selEnd === 1 || selEnd === 2)
{
selEnd = selLength;
}
@ -375,14 +379,14 @@ function colorPalette(dir, width, height)
for (r = 0; r < 5; r++)
{
if (dir == 'h')
if (dir === 'h')
{
document.writeln('<tr>');
}
for (g = 0; g < 5; g++)
{
if (dir == 'v')
if (dir === 'v')
{
document.writeln('<tr>');
}
@ -395,13 +399,13 @@ function colorPalette(dir, width, height)
document.writeln('</td>');
}
if (dir == 'v')
if (dir === 'v')
{
document.writeln('</tr>');
}
}
if (dir == 'h')
if (dir === 'h')
{
document.writeln('</tr>');
}
@ -409,7 +413,6 @@ function colorPalette(dir, width, height)
document.writeln('</table>');
}
/**
* Caret Position object
*/
@ -419,7 +422,6 @@ function caretPosition()
var end = null;
}
/**
* Get the caret position in an textarea
*/
@ -428,13 +430,13 @@ function getCaretPosition(txtarea)
var caretPos = new caretPosition();
// simple Gecko/Opera way
if(txtarea.selectionStart || txtarea.selectionStart == 0)
if (txtarea.selectionStart || txtarea.selectionStart === 0)
{
caretPos.start = txtarea.selectionStart;
caretPos.end = txtarea.selectionEnd;
}
// dirty and slow IE way
else if(document.selection)
else if (document.selection)
{
// get current selection
var range = document.selection.createRange();