dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Reduce revdelete-text-others verbosity"
[lhc/web/wiklou.git]
/
includes
/
libs
/
jsminplus.php
diff --git
a/includes/libs/jsminplus.php
b/includes/libs/jsminplus.php
index
7c4e32b
..
ed0382c
100644
(file)
--- a/
includes/libs/jsminplus.php
+++ b/
includes/libs/jsminplus.php
@@
-1,4
+1,5
@@
<?php
<?php
+// @codingStandardsIgnoreFile File external to MediaWiki. Ignore coding conventions checks.
/**
* JSMinPlus version 1.4
*
/**
* JSMinPlus version 1.4
*
@@
-256,7
+257,7
@@
class JSMinPlus
}
elseif ($type == KEYWORD_VAR && $type == $lastType)
{
}
elseif ($type == KEYWORD_VAR && $type == $lastType)
{
- // mutiple var-statements can go into one
+ // mu
l
tiple var-statements can go into one
$t = ',' . substr($t, 4);
}
else
$t = ',' . substr($t, 4);
}
else
@@
-298,7
+299,7
@@
class JSMinPlus
if ($elsePart)
{
if ($elsePart)
{
- // be careful
l
and always make a block out of the thenPart; could be more optimized but is a lot of trouble
+ // be careful and always make a block out of the thenPart; could be more optimized but is a lot of trouble
if ($thenPart != ';' && $thenPart[0] != '{')
$thenPart = '{' . $thenPart . '}';
if ($thenPart != ';' && $thenPart[0] != '{')
$thenPart = '{' . $thenPart . '}';
@@
-521,7
+522,7
@@
class JSMinPlus
break;
case TOKEN_STRING:
break;
case TOKEN_STRING:
- //combine concat
ted strings with same quote
style
+ //combine concat
enated strings with same quote
style
if ($n->type == OP_PLUS && substr($left, -1) == $right[0])
{
$s = substr($left, 0, -1) . substr($right, 1);
if ($n->type == OP_PLUS && substr($left, -1) == $right[0])
{
$s = substr($left, 0, -1) . substr($right, 1);