| Index: branches/script-loader/includes/AutoLoader.php |
| — | — | @@ -100,7 +100,7 @@ |
| 101 | 101 | 'IndexPager' => 'includes/Pager.php', |
| 102 | 102 | 'Interwiki' => 'includes/Interwiki.php', |
| 103 | 103 | 'IP' => 'includes/IP.php', |
| 104 | | - 'JSMin' => 'includes/minify/JSMin.php', |
| | 104 | + 'JSMin' => 'js2/mv_embed/php/JSMin.php', |
| 105 | 105 | 'jsScriptLoader' => 'js2/mv_embed/jsScriptLoader.php', |
| 106 | 106 | 'Job' => 'includes/JobQueue.php', |
| 107 | 107 | 'License' => 'includes/Licenses.php', |
| Property changes on: branches/script-loader/js2/mv_embed/libAddMedia/mvFirefogg.js |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 108 | 108 | + |
| Property changes on: branches/script-loader/js2/mv_embed/libAddMedia/mvUploader.js |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 109 | 109 | + |
| Index: branches/script-loader/js2/mv_embed/php/cortado_iframe.php |
| — | — | @@ -3,6 +3,8 @@ |
| 4 | 4 | cortado_embed.php |
| 5 | 5 | all file checks and conditions should be checked prior to loading this page. |
| 6 | 6 | this page serves as a wrapper for the cortado java applet |
| | 7 | + |
| | 8 | +@@this may be depreciated in favor of a central hosted java applet |
| 7 | 9 | */ |
| 8 | 10 | |
| 9 | 11 | cortado_iframe(); |
| Index: branches/script-loader/js2/mv_embed/php/jsAutoloadLocalClasses.php |
| — | — | @@ -1,4 +1,6 @@ |
| 2 | 2 | <?php |
| | 3 | +if ( !defined( 'MEDIAWIKI' ) ) die(1); |
| | 4 | + |
| 3 | 5 | global $wgJSAutoloadLocalClasses, $wgScriptPath; |
| 4 | 6 | |
| 5 | 7 | |
| Index: branches/script-loader/js2/mv_embed/php/minify/jsmin.php |
| — | — | @@ -1,293 +0,0 @@ |
| 2 | | -<?php |
| 3 | | - |
| 4 | | -if ( !defined( 'MEDIAWIKI' ) ) die( 1 ); |
| 5 | | -/** |
| 6 | | - * jsmin.php - PHP implementation of Douglas Crockford's JSMin. |
| 7 | | - * |
| 8 | | - * This is pretty much a direct port of jsmin.c to PHP with just a few |
| 9 | | - * PHP-specific performance tweaks. Also, whereas jsmin.c reads from stdin and |
| 10 | | - * outputs to stdout, this library accepts a string as input and returns another |
| 11 | | - * string as output. |
| 12 | | - * |
| 13 | | - * PHP 5 or higher is required. |
| 14 | | - * |
| 15 | | - * Permission is hereby granted to use this version of the library under the |
| 16 | | - * same terms as jsmin.c, which has the following license: |
| 17 | | - * |
| 18 | | - * -- |
| 19 | | - * Copyright (c) 2002 Douglas Crockford (www.crockford.com) |
| 20 | | - * |
| 21 | | - * Permission is hereby granted, free of charge, to any person obtaining a copy of |
| 22 | | - * this software and associated documentation files (the "Software"), to deal in |
| 23 | | - * the Software without restriction, including without limitation the rights to |
| 24 | | - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies |
| 25 | | - * of the Software, and to permit persons to whom the Software is furnished to do |
| 26 | | - * so, subject to the following conditions: |
| 27 | | - * |
| 28 | | - * The above copyright notice and this permission notice shall be included in all |
| 29 | | - * copies or substantial portions of the Software. |
| 30 | | - * |
| 31 | | - * The Software shall be used for Good, not Evil. |
| 32 | | - * |
| 33 | | - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
| 34 | | - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
| 35 | | - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE |
| 36 | | - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
| 37 | | - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, |
| 38 | | - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE |
| 39 | | - * SOFTWARE. |
| 40 | | - * -- |
| 41 | | - * |
| 42 | | - * @package JSMin |
| 43 | | - * @author Ryan Grove <ryan@wonko.com> |
| 44 | | - * @copyright 2002 Douglas Crockford <douglas@crockford.com> (jsmin.c) |
| 45 | | - * @copyright 2008 Ryan Grove <ryan@wonko.com> (PHP port) |
| 46 | | - * @license http://opensource.org/licenses/mit-license.php MIT License |
| 47 | | - * @version 1.1.1 (2008-03-02) |
| 48 | | - * @link http://code.google.com/p/jsmin-php/ |
| 49 | | - */ |
| 50 | | - |
| 51 | | -class JSMin { |
| 52 | | - const ORD_LF = 10; |
| 53 | | - const ORD_SPACE = 32; |
| 54 | | - |
| 55 | | - protected $a = ''; |
| 56 | | - protected $b = ''; |
| 57 | | - protected $input = ''; |
| 58 | | - protected $inputIndex = 0; |
| 59 | | - protected $inputLength = 0; |
| 60 | | - protected $lookAhead = null; |
| 61 | | - protected $output = ''; |
| 62 | | - |
| 63 | | - // -- Public Static Methods -------------------------------------------------- |
| 64 | | - |
| 65 | | - public static function minify($js) { |
| 66 | | - $jsmin = new JSMin($js); |
| 67 | | - return $jsmin->min(); |
| 68 | | - } |
| 69 | | - |
| 70 | | - // -- Public Instance Methods ------------------------------------------------ |
| 71 | | - |
| 72 | | - public function __construct($input) { |
| 73 | | - $this->input = str_replace("\r\n", "\n", $input); |
| 74 | | - $this->inputLength = strlen($this->input); |
| 75 | | - } |
| 76 | | - |
| 77 | | - // -- Protected Instance Methods --------------------------------------------- |
| 78 | | - |
| 79 | | - protected function action($d) { |
| 80 | | - switch($d) { |
| 81 | | - case 1: |
| 82 | | - $this->output .= $this->a; |
| 83 | | - |
| 84 | | - case 2: |
| 85 | | - $this->a = $this->b; |
| 86 | | - |
| 87 | | - if ($this->a === "'" || $this->a === '"') { |
| 88 | | - for (;;) { |
| 89 | | - $this->output .= $this->a; |
| 90 | | - $this->a = $this->get(); |
| 91 | | - |
| 92 | | - if ($this->a === $this->b) { |
| 93 | | - break; |
| 94 | | - } |
| 95 | | - |
| 96 | | - if (ord($this->a) <= self::ORD_LF) { |
| 97 | | - throw new JSMinException('Unterminated string literal.'); |
| 98 | | - } |
| 99 | | - |
| 100 | | - if ($this->a === '\\') { |
| 101 | | - $this->output .= $this->a; |
| 102 | | - $this->a = $this->get(); |
| 103 | | - } |
| 104 | | - } |
| 105 | | - } |
| 106 | | - |
| 107 | | - case 3: |
| 108 | | - $this->b = $this->next(); |
| 109 | | - |
| 110 | | - if ($this->b === '/' && ( |
| 111 | | - $this->a === '(' || $this->a === ',' || $this->a === '=' || |
| 112 | | - $this->a === ':' || $this->a === '[' || $this->a === '!' || |
| 113 | | - $this->a === '&' || $this->a === '|' || $this->a === '?')) { |
| 114 | | - |
| 115 | | - $this->output .= $this->a . $this->b; |
| 116 | | - |
| 117 | | - for (;;) { |
| 118 | | - $this->a = $this->get(); |
| 119 | | - |
| 120 | | - if ($this->a === '/') { |
| 121 | | - break; |
| 122 | | - } elseif ($this->a === '\\') { |
| 123 | | - $this->output .= $this->a; |
| 124 | | - $this->a = $this->get(); |
| 125 | | - } elseif (ord($this->a) <= self::ORD_LF) { |
| 126 | | - throw new JSMinException('Unterminated regular expression '. |
| 127 | | - 'literal.'); |
| 128 | | - } |
| 129 | | - |
| 130 | | - $this->output .= $this->a; |
| 131 | | - } |
| 132 | | - |
| 133 | | - $this->b = $this->next(); |
| 134 | | - } |
| 135 | | - } |
| 136 | | - } |
| 137 | | - |
| 138 | | - protected function get() { |
| 139 | | - $c = $this->lookAhead; |
| 140 | | - $this->lookAhead = null; |
| 141 | | - |
| 142 | | - if ($c === null) { |
| 143 | | - if ($this->inputIndex < $this->inputLength) { |
| 144 | | - $c = $this->input[$this->inputIndex]; |
| 145 | | - $this->inputIndex += 1; |
| 146 | | - } else { |
| 147 | | - $c = null; |
| 148 | | - } |
| 149 | | - } |
| 150 | | - |
| 151 | | - if ($c === "\r") { |
| 152 | | - return "\n"; |
| 153 | | - } |
| 154 | | - |
| 155 | | - if ($c === null || $c === "\n" || ord($c) >= self::ORD_SPACE) { |
| 156 | | - return $c; |
| 157 | | - } |
| 158 | | - |
| 159 | | - return ' '; |
| 160 | | - } |
| 161 | | - |
| 162 | | - protected function isAlphaNum($c) { |
| 163 | | - return ord($c) > 126 || $c === '\\' || preg_match('/^[\w\$]$/', $c) === 1; |
| 164 | | - } |
| 165 | | - |
| 166 | | - protected function min() { |
| 167 | | - $this->a = "\n"; |
| 168 | | - $this->action(3); |
| 169 | | - |
| 170 | | - while ($this->a !== null) { |
| 171 | | - switch ($this->a) { |
| 172 | | - case ' ': |
| 173 | | - if ($this->isAlphaNum($this->b)) { |
| 174 | | - $this->action(1); |
| 175 | | - } else { |
| 176 | | - $this->action(2); |
| 177 | | - } |
| 178 | | - break; |
| 179 | | - |
| 180 | | - case "\n": |
| 181 | | - switch ($this->b) { |
| 182 | | - case '{': |
| 183 | | - case '[': |
| 184 | | - case '(': |
| 185 | | - case '+': |
| 186 | | - case '-': |
| 187 | | - $this->action(1); |
| 188 | | - break; |
| 189 | | - |
| 190 | | - case ' ': |
| 191 | | - $this->action(3); |
| 192 | | - break; |
| 193 | | - |
| 194 | | - default: |
| 195 | | - if ($this->isAlphaNum($this->b)) { |
| 196 | | - $this->action(1); |
| 197 | | - } |
| 198 | | - else { |
| 199 | | - $this->action(2); |
| 200 | | - } |
| 201 | | - } |
| 202 | | - break; |
| 203 | | - |
| 204 | | - default: |
| 205 | | - switch ($this->b) { |
| 206 | | - case ' ': |
| 207 | | - if ($this->isAlphaNum($this->a)) { |
| 208 | | - $this->action(1); |
| 209 | | - break; |
| 210 | | - } |
| 211 | | - |
| 212 | | - $this->action(3); |
| 213 | | - break; |
| 214 | | - |
| 215 | | - case "\n": |
| 216 | | - switch ($this->a) { |
| 217 | | - case '}': |
| 218 | | - case ']': |
| 219 | | - case ')': |
| 220 | | - case '+': |
| 221 | | - case '-': |
| 222 | | - case '"': |
| 223 | | - case "'": |
| 224 | | - $this->action(1); |
| 225 | | - break; |
| 226 | | - |
| 227 | | - default: |
| 228 | | - if ($this->isAlphaNum($this->a)) { |
| 229 | | - $this->action(1); |
| 230 | | - } |
| 231 | | - else { |
| 232 | | - $this->action(3); |
| 233 | | - } |
| 234 | | - } |
| 235 | | - break; |
| 236 | | - |
| 237 | | - default: |
| 238 | | - $this->action(1); |
| 239 | | - break; |
| 240 | | - } |
| 241 | | - } |
| 242 | | - } |
| 243 | | - |
| 244 | | - return $this->output; |
| 245 | | - } |
| 246 | | - |
| 247 | | - protected function next() { |
| 248 | | - $c = $this->get(); |
| 249 | | - |
| 250 | | - if ($c === '/') { |
| 251 | | - switch($this->peek()) { |
| 252 | | - case '/': |
| 253 | | - for (;;) { |
| 254 | | - $c = $this->get(); |
| 255 | | - |
| 256 | | - if (ord($c) <= self::ORD_LF) { |
| 257 | | - return $c; |
| 258 | | - } |
| 259 | | - } |
| 260 | | - |
| 261 | | - case '*': |
| 262 | | - $this->get(); |
| 263 | | - |
| 264 | | - for (;;) { |
| 265 | | - switch($this->get()) { |
| 266 | | - case '*': |
| 267 | | - if ($this->peek() === '/') { |
| 268 | | - $this->get(); |
| 269 | | - return ' '; |
| 270 | | - } |
| 271 | | - break; |
| 272 | | - |
| 273 | | - case null: |
| 274 | | - throw new JSMinException('Unterminated comment.'); |
| 275 | | - } |
| 276 | | - } |
| 277 | | - |
| 278 | | - default: |
| 279 | | - return $c; |
| 280 | | - } |
| 281 | | - } |
| 282 | | - |
| 283 | | - return $c; |
| 284 | | - } |
| 285 | | - |
| 286 | | - protected function peek() { |
| 287 | | - $this->lookAhead = $this->get(); |
| 288 | | - return $this->lookAhead; |
| 289 | | - } |
| 290 | | -} |
| 291 | | - |
| 292 | | -// -- Exceptions --------------------------------------------------------------- |
| 293 | | -class JSMinException extends Exception {} |
| 294 | | -?> |
| \ No newline at end of file |
| Index: branches/script-loader/js2/mv_embed/php/minify/JSMin.php |
| — | — | @@ -0,0 +1,293 @@ |
| | 2 | +<?php |
| | 3 | + |
| | 4 | +if ( !defined( 'MEDIAWIKI' ) ) die( 1 ); |
| | 5 | +/** |
| | 6 | + * jsmin.php - PHP implementation of Douglas Crockford's JSMin. |
| | 7 | + * |
| | 8 | + * This is pretty much a direct port of jsmin.c to PHP with just a few |
| | 9 | + * PHP-specific performance tweaks. Also, whereas jsmin.c reads from stdin and |
| | 10 | + * outputs to stdout, this library accepts a string as input and returns another |
| | 11 | + * string as output. |
| | 12 | + * |
| | 13 | + * PHP 5 or higher is required. |
| | 14 | + * |
| | 15 | + * Permission is hereby granted to use this version of the library under the |
| | 16 | + * same terms as jsmin.c, which has the following license: |
| | 17 | + * |
| | 18 | + * -- |
| | 19 | + * Copyright (c) 2002 Douglas Crockford (www.crockford.com) |
| | 20 | + * |
| | 21 | + * Permission is hereby granted, free of charge, to any person obtaining a copy of |
| | 22 | + * this software and associated documentation files (the "Software"), to deal in |
| | 23 | + * the Software without restriction, including without limitation the rights to |
| | 24 | + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies |
| | 25 | + * of the Software, and to permit persons to whom the Software is furnished to do |
| | 26 | + * so, subject to the following conditions: |
| | 27 | + * |
| | 28 | + * The above copyright notice and this permission notice shall be included in all |
| | 29 | + * copies or substantial portions of the Software. |
| | 30 | + * |
| | 31 | + * The Software shall be used for Good, not Evil. |
| | 32 | + * |
| | 33 | + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
| | 34 | + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
| | 35 | + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE |
| | 36 | + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
| | 37 | + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, |
| | 38 | + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE |
| | 39 | + * SOFTWARE. |
| | 40 | + * -- |
| | 41 | + * |
| | 42 | + * @package JSMin |
| | 43 | + * @author Ryan Grove <ryan@wonko.com> |
| | 44 | + * @copyright 2002 Douglas Crockford <douglas@crockford.com> (jsmin.c) |
| | 45 | + * @copyright 2008 Ryan Grove <ryan@wonko.com> (PHP port) |
| | 46 | + * @license http://opensource.org/licenses/mit-license.php MIT License |
| | 47 | + * @version 1.1.1 (2008-03-02) |
| | 48 | + * @link http://code.google.com/p/jsmin-php/ |
| | 49 | + */ |
| | 50 | + |
| | 51 | +class JSMin { |
| | 52 | + const ORD_LF = 10; |
| | 53 | + const ORD_SPACE = 32; |
| | 54 | + |
| | 55 | + protected $a = ''; |
| | 56 | + protected $b = ''; |
| | 57 | + protected $input = ''; |
| | 58 | + protected $inputIndex = 0; |
| | 59 | + protected $inputLength = 0; |
| | 60 | + protected $lookAhead = null; |
| | 61 | + protected $output = ''; |
| | 62 | + |
| | 63 | + // -- Public Static Methods -------------------------------------------------- |
| | 64 | + |
| | 65 | + public static function minify($js) { |
| | 66 | + $jsmin = new JSMin($js); |
| | 67 | + return $jsmin->min(); |
| | 68 | + } |
| | 69 | + |
| | 70 | + // -- Public Instance Methods ------------------------------------------------ |
| | 71 | + |
| | 72 | + public function __construct($input) { |
| | 73 | + $this->input = str_replace("\r\n", "\n", $input); |
| | 74 | + $this->inputLength = strlen($this->input); |
| | 75 | + } |
| | 76 | + |
| | 77 | + // -- Protected Instance Methods --------------------------------------------- |
| | 78 | + |
| | 79 | + protected function action($d) { |
| | 80 | + switch($d) { |
| | 81 | + case 1: |
| | 82 | + $this->output .= $this->a; |
| | 83 | + |
| | 84 | + case 2: |
| | 85 | + $this->a = $this->b; |
| | 86 | + |
| | 87 | + if ($this->a === "'" || $this->a === '"') { |
| | 88 | + for (;;) { |
| | 89 | + $this->output .= $this->a; |
| | 90 | + $this->a = $this->get(); |
| | 91 | + |
| | 92 | + if ($this->a === $this->b) { |
| | 93 | + break; |
| | 94 | + } |
| | 95 | + |
| | 96 | + if (ord($this->a) <= self::ORD_LF) { |
| | 97 | + throw new JSMinException('Unterminated string literal.'); |
| | 98 | + } |
| | 99 | + |
| | 100 | + if ($this->a === '\\') { |
| | 101 | + $this->output .= $this->a; |
| | 102 | + $this->a = $this->get(); |
| | 103 | + } |
| | 104 | + } |
| | 105 | + } |
| | 106 | + |
| | 107 | + case 3: |
| | 108 | + $this->b = $this->next(); |
| | 109 | + |
| | 110 | + if ($this->b === '/' && ( |
| | 111 | + $this->a === '(' || $this->a === ',' || $this->a === '=' || |
| | 112 | + $this->a === ':' || $this->a === '[' || $this->a === '!' || |
| | 113 | + $this->a === '&' || $this->a === '|' || $this->a === '?')) { |
| | 114 | + |
| | 115 | + $this->output .= $this->a . $this->b; |
| | 116 | + |
| | 117 | + for (;;) { |
| | 118 | + $this->a = $this->get(); |
| | 119 | + |
| | 120 | + if ($this->a === '/') { |
| | 121 | + break; |
| | 122 | + } elseif ($this->a === '\\') { |
| | 123 | + $this->output .= $this->a; |
| | 124 | + $this->a = $this->get(); |
| | 125 | + } elseif (ord($this->a) <= self::ORD_LF) { |
| | 126 | + throw new JSMinException('Unterminated regular expression '. |
| | 127 | + 'literal.'); |
| | 128 | + } |
| | 129 | + |
| | 130 | + $this->output .= $this->a; |
| | 131 | + } |
| | 132 | + |
| | 133 | + $this->b = $this->next(); |
| | 134 | + } |
| | 135 | + } |
| | 136 | + } |
| | 137 | + |
| | 138 | + protected function get() { |
| | 139 | + $c = $this->lookAhead; |
| | 140 | + $this->lookAhead = null; |
| | 141 | + |
| | 142 | + if ($c === null) { |
| | 143 | + if ($this->inputIndex < $this->inputLength) { |
| | 144 | + $c = $this->input[$this->inputIndex]; |
| | 145 | + $this->inputIndex += 1; |
| | 146 | + } else { |
| | 147 | + $c = null; |
| | 148 | + } |
| | 149 | + } |
| | 150 | + |
| | 151 | + if ($c === "\r") { |
| | 152 | + return "\n"; |
| | 153 | + } |
| | 154 | + |
| | 155 | + if ($c === null || $c === "\n" || ord($c) >= self::ORD_SPACE) { |
| | 156 | + return $c; |
| | 157 | + } |
| | 158 | + |
| | 159 | + return ' '; |
| | 160 | + } |
| | 161 | + |
| | 162 | + protected function isAlphaNum($c) { |
| | 163 | + return ord($c) > 126 || $c === '\\' || preg_match('/^[\w\$]$/', $c) === 1; |
| | 164 | + } |
| | 165 | + |
| | 166 | + protected function min() { |
| | 167 | + $this->a = "\n"; |
| | 168 | + $this->action(3); |
| | 169 | + |
| | 170 | + while ($this->a !== null) { |
| | 171 | + switch ($this->a) { |
| | 172 | + case ' ': |
| | 173 | + if ($this->isAlphaNum($this->b)) { |
| | 174 | + $this->action(1); |
| | 175 | + } else { |
| | 176 | + $this->action(2); |
| | 177 | + } |
| | 178 | + break; |
| | 179 | + |
| | 180 | + case "\n": |
| | 181 | + switch ($this->b) { |
| | 182 | + case '{': |
| | 183 | + case '[': |
| | 184 | + case '(': |
| | 185 | + case '+': |
| | 186 | + case '-': |
| | 187 | + $this->action(1); |
| | 188 | + break; |
| | 189 | + |
| | 190 | + case ' ': |
| | 191 | + $this->action(3); |
| | 192 | + break; |
| | 193 | + |
| | 194 | + default: |
| | 195 | + if ($this->isAlphaNum($this->b)) { |
| | 196 | + $this->action(1); |
| | 197 | + } |
| | 198 | + else { |
| | 199 | + $this->action(2); |
| | 200 | + } |
| | 201 | + } |
| | 202 | + break; |
| | 203 | + |
| | 204 | + default: |
| | 205 | + switch ($this->b) { |
| | 206 | + case ' ': |
| | 207 | + if ($this->isAlphaNum($this->a)) { |
| | 208 | + $this->action(1); |
| | 209 | + break; |
| | 210 | + } |
| | 211 | + |
| | 212 | + $this->action(3); |
| | 213 | + break; |
| | 214 | + |
| | 215 | + case "\n": |
| | 216 | + switch ($this->a) { |
| | 217 | + case '}': |
| | 218 | + case ']': |
| | 219 | + case ')': |
| | 220 | + case '+': |
| | 221 | + case '-': |
| | 222 | + case '"': |
| | 223 | + case "'": |
| | 224 | + $this->action(1); |
| | 225 | + break; |
| | 226 | + |
| | 227 | + default: |
| | 228 | + if ($this->isAlphaNum($this->a)) { |
| | 229 | + $this->action(1); |
| | 230 | + } |
| | 231 | + else { |
| | 232 | + $this->action(3); |
| | 233 | + } |
| | 234 | + } |
| | 235 | + break; |
| | 236 | + |
| | 237 | + default: |
| | 238 | + $this->action(1); |
| | 239 | + break; |
| | 240 | + } |
| | 241 | + } |
| | 242 | + } |
| | 243 | + |
| | 244 | + return $this->output; |
| | 245 | + } |
| | 246 | + |
| | 247 | + protected function next() { |
| | 248 | + $c = $this->get(); |
| | 249 | + |
| | 250 | + if ($c === '/') { |
| | 251 | + switch($this->peek()) { |
| | 252 | + case '/': |
| | 253 | + for (;;) { |
| | 254 | + $c = $this->get(); |
| | 255 | + |
| | 256 | + if (ord($c) <= self::ORD_LF) { |
| | 257 | + return $c; |
| | 258 | + } |
| | 259 | + } |
| | 260 | + |
| | 261 | + case '*': |
| | 262 | + $this->get(); |
| | 263 | + |
| | 264 | + for (;;) { |
| | 265 | + switch($this->get()) { |
| | 266 | + case '*': |
| | 267 | + if ($this->peek() === '/') { |
| | 268 | + $this->get(); |
| | 269 | + return ' '; |
| | 270 | + } |
| | 271 | + break; |
| | 272 | + |
| | 273 | + case null: |
| | 274 | + throw new JSMinException('Unterminated comment.'); |
| | 275 | + } |
| | 276 | + } |
| | 277 | + |
| | 278 | + default: |
| | 279 | + return $c; |
| | 280 | + } |
| | 281 | + } |
| | 282 | + |
| | 283 | + return $c; |
| | 284 | + } |
| | 285 | + |
| | 286 | + protected function peek() { |
| | 287 | + $this->lookAhead = $this->get(); |
| | 288 | + return $this->lookAhead; |
| | 289 | + } |
| | 290 | +} |
| | 291 | + |
| | 292 | +// -- Exceptions --------------------------------------------------------------- |
| | 293 | +class JSMinException extends Exception {} |
| | 294 | +?> |
| \ No newline at end of file |
| Index: branches/script-loader/js2/mv_embed/php/noMediaWikiConfig.php |
| — | — | @@ -1,7 +1,13 @@ |
| 2 | 2 | <?php |
| | 3 | +mv_nomediawiki_config(); |
| 3 | 4 | |
| 4 | | -$wgJSAutoloadLocalClasses = array(); |
| 5 | | -$wgScriptPath = realpath(dirname(__FILE__).'../'); |
| 6 | | - |
| | 5 | +function mv_nomediawiki_config() { |
| | 6 | + global $wgJSAutoloadLocalClasses, $wgScriptPath; |
| | 7 | + $wgJSAutoloadLocalClasses = array(); |
| | 8 | + $wgScriptPath = realpath(dirname(__FILE__).'../'); |
| | 9 | + |
| | 10 | + //give us true for mediaWiki |
| | 11 | + define( 'MEDIAWIKI', true ); |
| | 12 | +} |
| 7 | 13 | ?> |
| 8 | 14 | |