@@ -190,7 +190,7 @@ |
||
| 190 | 190 | |
| 191 | 191 | /** |
| 192 | 192 | * @return integer|float a timestamp given a local time |
| 193 | - */ |
|
| 193 | + */ |
|
| 194 | 194 | function getTimeStamp($hr,$min,$sec,$mon=false,$day=false,$year=false,$is_gmt=false) |
| 195 | 195 | { |
| 196 | 196 | $dt = new DateTime(); |
@@ -496,8 +496,8 @@ |
||
| 496 | 496 | $className=basename($path); |
| 497 | 497 | $namespacedClassName = static::PAGE_NAMESPACE_PREFIX .str_replace('.', '\\', $pagePath); |
| 498 | 498 | |
| 499 | - if(!class_exists($className,false) && !class_exists($namespacedClassName, false)) |
|
| 500 | - include_once($path.Prado::CLASS_FILE_EXT); |
|
| 499 | + if(!class_exists($className,false) && !class_exists($namespacedClassName, false)) |
|
| 500 | + include_once($path.Prado::CLASS_FILE_EXT); |
|
| 501 | 501 | |
| 502 | 502 | if(!class_exists($className,false)) |
| 503 | 503 | $className = $namespacedClassName; |
@@ -59,228 +59,228 @@ |
||
| 59 | 59 | // -- Public Static Methods -------------------------------------------------- |
| 60 | 60 | |
| 61 | 61 | public static function minify($js) { |
| 62 | - $jsmin = new JSMin($js); |
|
| 63 | - return $jsmin->min(); |
|
| 62 | + $jsmin = new JSMin($js); |
|
| 63 | + return $jsmin->min(); |
|
| 64 | 64 | } |
| 65 | 65 | |
| 66 | 66 | // -- Public Instance Methods ------------------------------------------------ |
| 67 | 67 | |
| 68 | 68 | public function __construct($input) { |
| 69 | - $this->input = str_replace("\r\n", "\n", $input); |
|
| 70 | - $this->inputLength = strlen($this->input); |
|
| 69 | + $this->input = str_replace("\r\n", "\n", $input); |
|
| 70 | + $this->inputLength = strlen($this->input); |
|
| 71 | 71 | } |
| 72 | 72 | |
| 73 | 73 | // -- Protected Instance Methods --------------------------------------------- |
| 74 | 74 | |
| 75 | 75 | protected function action($d) { |
| 76 | - switch($d) { |
|
| 77 | - case 1: |
|
| 78 | - $this->output .= $this->a; |
|
| 79 | - |
|
| 80 | - case 2: |
|
| 81 | - $this->a = $this->b; |
|
| 82 | - |
|
| 83 | - if ($this->a === "'" || $this->a === '"') { |
|
| 84 | - for (;;) { |
|
| 85 | - $this->output .= $this->a; |
|
| 86 | - $this->a = $this->get(); |
|
| 87 | - |
|
| 88 | - if ($this->a === $this->b) { |
|
| 89 | - break; |
|
| 90 | - } |
|
| 91 | - |
|
| 92 | - if (ord($this->a) <= self::ORD_LF) { |
|
| 93 | - throw new JSMinException('Unterminated string literal.'); |
|
| 94 | - } |
|
| 95 | - |
|
| 96 | - if ($this->a === '\\') { |
|
| 97 | - $this->output .= $this->a; |
|
| 98 | - $this->a = $this->get(); |
|
| 99 | - } |
|
| 100 | - } |
|
| 101 | - } |
|
| 102 | - |
|
| 103 | - case 3: |
|
| 104 | - $this->b = $this->next(); |
|
| 105 | - |
|
| 106 | - if ($this->b === '/' && ( |
|
| 107 | - $this->a === '(' || $this->a === ',' || $this->a === '=' || |
|
| 108 | - $this->a === ':' || $this->a === '[' || $this->a === '!' || |
|
| 109 | - $this->a === '&' || $this->a === '|' || $this->a === '?')) { |
|
| 110 | - |
|
| 111 | - $this->output .= $this->a . $this->b; |
|
| 112 | - |
|
| 113 | - for (;;) { |
|
| 114 | - $this->a = $this->get(); |
|
| 115 | - |
|
| 116 | - if ($this->a === '/') { |
|
| 117 | - break; |
|
| 118 | - } elseif ($this->a === '\\') { |
|
| 119 | - $this->output .= $this->a; |
|
| 120 | - $this->a = $this->get(); |
|
| 121 | - } elseif (ord($this->a) <= self::ORD_LF) { |
|
| 122 | - throw new JSMinException('Unterminated regular expression '. |
|
| 123 | - 'literal.'); |
|
| 124 | - } |
|
| 125 | - |
|
| 126 | - $this->output .= $this->a; |
|
| 127 | - } |
|
| 128 | - |
|
| 129 | - $this->b = $this->next(); |
|
| 130 | - } |
|
| 131 | - } |
|
| 76 | + switch($d) { |
|
| 77 | + case 1: |
|
| 78 | + $this->output .= $this->a; |
|
| 79 | + |
|
| 80 | + case 2: |
|
| 81 | + $this->a = $this->b; |
|
| 82 | + |
|
| 83 | + if ($this->a === "'" || $this->a === '"') { |
|
| 84 | + for (;;) { |
|
| 85 | + $this->output .= $this->a; |
|
| 86 | + $this->a = $this->get(); |
|
| 87 | + |
|
| 88 | + if ($this->a === $this->b) { |
|
| 89 | + break; |
|
| 90 | + } |
|
| 91 | + |
|
| 92 | + if (ord($this->a) <= self::ORD_LF) { |
|
| 93 | + throw new JSMinException('Unterminated string literal.'); |
|
| 94 | + } |
|
| 95 | + |
|
| 96 | + if ($this->a === '\\') { |
|
| 97 | + $this->output .= $this->a; |
|
| 98 | + $this->a = $this->get(); |
|
| 99 | + } |
|
| 100 | + } |
|
| 101 | + } |
|
| 102 | + |
|
| 103 | + case 3: |
|
| 104 | + $this->b = $this->next(); |
|
| 105 | + |
|
| 106 | + if ($this->b === '/' && ( |
|
| 107 | + $this->a === '(' || $this->a === ',' || $this->a === '=' || |
|
| 108 | + $this->a === ':' || $this->a === '[' || $this->a === '!' || |
|
| 109 | + $this->a === '&' || $this->a === '|' || $this->a === '?')) { |
|
| 110 | + |
|
| 111 | + $this->output .= $this->a . $this->b; |
|
| 112 | + |
|
| 113 | + for (;;) { |
|
| 114 | + $this->a = $this->get(); |
|
| 115 | + |
|
| 116 | + if ($this->a === '/') { |
|
| 117 | + break; |
|
| 118 | + } elseif ($this->a === '\\') { |
|
| 119 | + $this->output .= $this->a; |
|
| 120 | + $this->a = $this->get(); |
|
| 121 | + } elseif (ord($this->a) <= self::ORD_LF) { |
|
| 122 | + throw new JSMinException('Unterminated regular expression '. |
|
| 123 | + 'literal.'); |
|
| 124 | + } |
|
| 125 | + |
|
| 126 | + $this->output .= $this->a; |
|
| 127 | + } |
|
| 128 | + |
|
| 129 | + $this->b = $this->next(); |
|
| 130 | + } |
|
| 131 | + } |
|
| 132 | 132 | } |
| 133 | 133 | |
| 134 | 134 | protected function get() { |
| 135 | - $c = $this->lookAhead; |
|
| 136 | - $this->lookAhead = null; |
|
| 137 | - |
|
| 138 | - if ($c === null) { |
|
| 139 | - if ($this->inputIndex < $this->inputLength) { |
|
| 140 | - $c = $this->input[$this->inputIndex]; |
|
| 141 | - $this->inputIndex += 1; |
|
| 142 | - } else { |
|
| 143 | - $c = null; |
|
| 144 | - } |
|
| 145 | - } |
|
| 146 | - |
|
| 147 | - if ($c === "\r") { |
|
| 148 | - return "\n"; |
|
| 149 | - } |
|
| 150 | - |
|
| 151 | - if ($c === null || $c === "\n" || ord($c) >= self::ORD_SPACE) { |
|
| 152 | - return $c; |
|
| 153 | - } |
|
| 154 | - |
|
| 155 | - return ' '; |
|
| 135 | + $c = $this->lookAhead; |
|
| 136 | + $this->lookAhead = null; |
|
| 137 | + |
|
| 138 | + if ($c === null) { |
|
| 139 | + if ($this->inputIndex < $this->inputLength) { |
|
| 140 | + $c = $this->input[$this->inputIndex]; |
|
| 141 | + $this->inputIndex += 1; |
|
| 142 | + } else { |
|
| 143 | + $c = null; |
|
| 144 | + } |
|
| 145 | + } |
|
| 146 | + |
|
| 147 | + if ($c === "\r") { |
|
| 148 | + return "\n"; |
|
| 149 | + } |
|
| 150 | + |
|
| 151 | + if ($c === null || $c === "\n" || ord($c) >= self::ORD_SPACE) { |
|
| 152 | + return $c; |
|
| 153 | + } |
|
| 154 | + |
|
| 155 | + return ' '; |
|
| 156 | 156 | } |
| 157 | 157 | |
| 158 | 158 | protected function isAlphaNum($c) { |
| 159 | - return ord($c) > 126 || $c === '\\' || preg_match('/^[\w\$]$/', $c) === 1; |
|
| 159 | + return ord($c) > 126 || $c === '\\' || preg_match('/^[\w\$]$/', $c) === 1; |
|
| 160 | 160 | } |
| 161 | 161 | |
| 162 | 162 | protected function min() { |
| 163 | - $this->a = "\n"; |
|
| 164 | - $this->action(3); |
|
| 165 | - |
|
| 166 | - while ($this->a !== null) { |
|
| 167 | - switch ($this->a) { |
|
| 168 | - case ' ': |
|
| 169 | - if ($this->isAlphaNum($this->b)) { |
|
| 170 | - $this->action(1); |
|
| 171 | - } else { |
|
| 172 | - $this->action(2); |
|
| 173 | - } |
|
| 174 | - break; |
|
| 175 | - |
|
| 176 | - case "\n": |
|
| 177 | - switch ($this->b) { |
|
| 178 | - case '{': |
|
| 179 | - case '[': |
|
| 180 | - case '(': |
|
| 181 | - case '+': |
|
| 182 | - case '-': |
|
| 183 | - $this->action(1); |
|
| 184 | - break; |
|
| 185 | - |
|
| 186 | - case ' ': |
|
| 187 | - $this->action(3); |
|
| 188 | - break; |
|
| 189 | - |
|
| 190 | - default: |
|
| 191 | - if ($this->isAlphaNum($this->b)) { |
|
| 192 | - $this->action(1); |
|
| 193 | - } |
|
| 194 | - else { |
|
| 195 | - $this->action(2); |
|
| 196 | - } |
|
| 197 | - } |
|
| 198 | - break; |
|
| 199 | - |
|
| 200 | - default: |
|
| 201 | - switch ($this->b) { |
|
| 202 | - case ' ': |
|
| 203 | - if ($this->isAlphaNum($this->a)) { |
|
| 204 | - $this->action(1); |
|
| 205 | - break; |
|
| 206 | - } |
|
| 207 | - |
|
| 208 | - $this->action(3); |
|
| 209 | - break; |
|
| 210 | - |
|
| 211 | - case "\n": |
|
| 212 | - switch ($this->a) { |
|
| 213 | - case '}': |
|
| 214 | - case ']': |
|
| 215 | - case ')': |
|
| 216 | - case '+': |
|
| 217 | - case '-': |
|
| 218 | - case '"': |
|
| 219 | - case "'": |
|
| 220 | - $this->action(1); |
|
| 221 | - break; |
|
| 222 | - |
|
| 223 | - default: |
|
| 224 | - if ($this->isAlphaNum($this->a)) { |
|
| 225 | - $this->action(1); |
|
| 226 | - } |
|
| 227 | - else { |
|
| 228 | - $this->action(3); |
|
| 229 | - } |
|
| 230 | - } |
|
| 231 | - break; |
|
| 232 | - |
|
| 233 | - default: |
|
| 234 | - $this->action(1); |
|
| 235 | - break; |
|
| 236 | - } |
|
| 237 | - } |
|
| 238 | - } |
|
| 239 | - |
|
| 240 | - return $this->output; |
|
| 163 | + $this->a = "\n"; |
|
| 164 | + $this->action(3); |
|
| 165 | + |
|
| 166 | + while ($this->a !== null) { |
|
| 167 | + switch ($this->a) { |
|
| 168 | + case ' ': |
|
| 169 | + if ($this->isAlphaNum($this->b)) { |
|
| 170 | + $this->action(1); |
|
| 171 | + } else { |
|
| 172 | + $this->action(2); |
|
| 173 | + } |
|
| 174 | + break; |
|
| 175 | + |
|
| 176 | + case "\n": |
|
| 177 | + switch ($this->b) { |
|
| 178 | + case '{': |
|
| 179 | + case '[': |
|
| 180 | + case '(': |
|
| 181 | + case '+': |
|
| 182 | + case '-': |
|
| 183 | + $this->action(1); |
|
| 184 | + break; |
|
| 185 | + |
|
| 186 | + case ' ': |
|
| 187 | + $this->action(3); |
|
| 188 | + break; |
|
| 189 | + |
|
| 190 | + default: |
|
| 191 | + if ($this->isAlphaNum($this->b)) { |
|
| 192 | + $this->action(1); |
|
| 193 | + } |
|
| 194 | + else { |
|
| 195 | + $this->action(2); |
|
| 196 | + } |
|
| 197 | + } |
|
| 198 | + break; |
|
| 199 | + |
|
| 200 | + default: |
|
| 201 | + switch ($this->b) { |
|
| 202 | + case ' ': |
|
| 203 | + if ($this->isAlphaNum($this->a)) { |
|
| 204 | + $this->action(1); |
|
| 205 | + break; |
|
| 206 | + } |
|
| 207 | + |
|
| 208 | + $this->action(3); |
|
| 209 | + break; |
|
| 210 | + |
|
| 211 | + case "\n": |
|
| 212 | + switch ($this->a) { |
|
| 213 | + case '}': |
|
| 214 | + case ']': |
|
| 215 | + case ')': |
|
| 216 | + case '+': |
|
| 217 | + case '-': |
|
| 218 | + case '"': |
|
| 219 | + case "'": |
|
| 220 | + $this->action(1); |
|
| 221 | + break; |
|
| 222 | + |
|
| 223 | + default: |
|
| 224 | + if ($this->isAlphaNum($this->a)) { |
|
| 225 | + $this->action(1); |
|
| 226 | + } |
|
| 227 | + else { |
|
| 228 | + $this->action(3); |
|
| 229 | + } |
|
| 230 | + } |
|
| 231 | + break; |
|
| 232 | + |
|
| 233 | + default: |
|
| 234 | + $this->action(1); |
|
| 235 | + break; |
|
| 236 | + } |
|
| 237 | + } |
|
| 238 | + } |
|
| 239 | + |
|
| 240 | + return $this->output; |
|
| 241 | 241 | } |
| 242 | 242 | |
| 243 | 243 | protected function next() { |
| 244 | - $c = $this->get(); |
|
| 245 | - |
|
| 246 | - if ($c === '/') { |
|
| 247 | - switch($this->peek()) { |
|
| 248 | - case '/': |
|
| 249 | - for (;;) { |
|
| 250 | - $c = $this->get(); |
|
| 251 | - |
|
| 252 | - if (ord($c) <= self::ORD_LF) { |
|
| 253 | - return $c; |
|
| 254 | - } |
|
| 255 | - } |
|
| 256 | - |
|
| 257 | - case '*': |
|
| 258 | - $this->get(); |
|
| 259 | - |
|
| 260 | - for (;;) { |
|
| 261 | - switch($this->get()) { |
|
| 262 | - case '*': |
|
| 263 | - if ($this->peek() === '/') { |
|
| 264 | - $this->get(); |
|
| 265 | - return ' '; |
|
| 266 | - } |
|
| 267 | - break; |
|
| 268 | - |
|
| 269 | - case null: |
|
| 270 | - throw new JSMinException('Unterminated comment.'); |
|
| 271 | - } |
|
| 272 | - } |
|
| 273 | - |
|
| 274 | - default: |
|
| 275 | - return $c; |
|
| 276 | - } |
|
| 277 | - } |
|
| 278 | - |
|
| 279 | - return $c; |
|
| 244 | + $c = $this->get(); |
|
| 245 | + |
|
| 246 | + if ($c === '/') { |
|
| 247 | + switch($this->peek()) { |
|
| 248 | + case '/': |
|
| 249 | + for (;;) { |
|
| 250 | + $c = $this->get(); |
|
| 251 | + |
|
| 252 | + if (ord($c) <= self::ORD_LF) { |
|
| 253 | + return $c; |
|
| 254 | + } |
|
| 255 | + } |
|
| 256 | + |
|
| 257 | + case '*': |
|
| 258 | + $this->get(); |
|
| 259 | + |
|
| 260 | + for (;;) { |
|
| 261 | + switch($this->get()) { |
|
| 262 | + case '*': |
|
| 263 | + if ($this->peek() === '/') { |
|
| 264 | + $this->get(); |
|
| 265 | + return ' '; |
|
| 266 | + } |
|
| 267 | + break; |
|
| 268 | + |
|
| 269 | + case null: |
|
| 270 | + throw new JSMinException('Unterminated comment.'); |
|
| 271 | + } |
|
| 272 | + } |
|
| 273 | + |
|
| 274 | + default: |
|
| 275 | + return $c; |
|
| 276 | + } |
|
| 277 | + } |
|
| 278 | + |
|
| 279 | + return $c; |
|
| 280 | 280 | } |
| 281 | 281 | |
| 282 | 282 | protected function peek() { |
| 283 | - $this->lookAhead = $this->get(); |
|
| 284 | - return $this->lookAhead; |
|
| 283 | + $this->lookAhead = $this->get(); |
|
| 284 | + return $this->lookAhead; |
|
| 285 | 285 | } |
| 286 | 286 | } |
| 287 | 287 | \ No newline at end of file |
@@ -55,8 +55,8 @@ |
||
| 55 | 55 | { |
| 56 | 56 | |
| 57 | 57 | /** |
| 58 | - * @var TTable parent row control containing the cell |
|
| 59 | - */ |
|
| 58 | + * @var TTable parent row control containing the cell |
|
| 59 | + */ |
|
| 60 | 60 | private $_row; |
| 61 | 61 | |
| 62 | 62 | /** |
@@ -32,8 +32,8 @@ |
||
| 32 | 32 | { |
| 33 | 33 | |
| 34 | 34 | /** |
| 35 | - * @var integer the zero-based index of the cell. |
|
| 36 | - */ |
|
| 35 | + * @var integer the zero-based index of the cell. |
|
| 36 | + */ |
|
| 37 | 37 | private $_selectedCellIndex = -1; |
| 38 | 38 | |
| 39 | 39 | /** |
@@ -244,8 +244,8 @@ |
||
| 244 | 244 | class TActiveTableRowEventParameter extends TCallbackEventParameter |
| 245 | 245 | { |
| 246 | 246 | /** |
| 247 | - * @var integer the zero-based index of the row. |
|
| 248 | - */ |
|
| 247 | + * @var integer the zero-based index of the row. |
|
| 248 | + */ |
|
| 249 | 249 | private $_selectedRowIndex = -1; |
| 250 | 250 | |
| 251 | 251 | /** |
@@ -27,9 +27,9 @@ discard block |
||
| 27 | 27 | */ |
| 28 | 28 | protected function addStatesToTrack() |
| 29 | 29 | { |
| 30 | - parent::addStatesToTrack(); |
|
| 31 | - $states = $this->getStatesToTrack(); |
|
| 32 | - $states['JuiOptions'] = array('TMapCollectionDiff', array($this, 'updateJuiOptions')); |
|
| 30 | + parent::addStatesToTrack(); |
|
| 31 | + $states = $this->getStatesToTrack(); |
|
| 32 | + $states['JuiOptions'] = array('TMapCollectionDiff', array($this, 'updateJuiOptions')); |
|
| 33 | 33 | } |
| 34 | 34 | |
| 35 | 35 | /** |
@@ -38,9 +38,9 @@ discard block |
||
| 38 | 38 | */ |
| 39 | 39 | protected function updateJuiOptions($options) |
| 40 | 40 | { |
| 41 | - foreach ($options as $key => $value) $options[$key] = $key . ': ' . (is_string($value) ? "'{$value}'" : TPropertyValue::ensureString($value)); |
|
| 42 | - $code = "jQuery('#{$this->_control->getWidgetID()}').{$this->_control->getWidget()}('option', { " . implode(', ', $options) . " });"; |
|
| 43 | - $this->_control->getPage()->getClientScript()->registerEndScript(sprintf('%08X', crc32($code)), $code); |
|
| 41 | + foreach ($options as $key => $value) $options[$key] = $key . ': ' . (is_string($value) ? "'{$value}'" : TPropertyValue::ensureString($value)); |
|
| 42 | + $code = "jQuery('#{$this->_control->getWidgetID()}').{$this->_control->getWidget()}('option', { " . implode(', ', $options) . " });"; |
|
| 43 | + $this->_control->getPage()->getClientScript()->registerEndScript(sprintf('%08X', crc32($code)), $code); |
|
| 44 | 44 | } |
| 45 | 45 | |
| 46 | 46 | } |
| 47 | 47 | \ No newline at end of file |
@@ -44,10 +44,10 @@ |
||
| 44 | 44 | class TJuiEventParameter extends TCallbackEventParameter |
| 45 | 45 | { |
| 46 | 46 | /** |
| 47 | - * getControl |
|
| 48 | - * |
|
| 49 | - * Compatibility method to get a control from its clientside id |
|
| 50 | - * @return TControl control, or null if not found |
|
| 47 | + * getControl |
|
| 48 | + * |
|
| 49 | + * Compatibility method to get a control from its clientside id |
|
| 50 | + * @return TControl control, or null if not found |
|
| 51 | 51 | */ |
| 52 | 52 | public function getControl($id) |
| 53 | 53 | { |
@@ -44,8 +44,8 @@ |
||
| 44 | 44 | */ |
| 45 | 45 | public function setSelectedValues($values); |
| 46 | 46 | |
| 47 | - /** |
|
| 48 | - * Clears all existing selections on the client side. |
|
| 49 | - */ |
|
| 50 | - public function clearSelection(); |
|
| 47 | + /** |
|
| 48 | + * Clears all existing selections on the client side. |
|
| 49 | + */ |
|
| 50 | + public function clearSelection(); |
|
| 51 | 51 | } |
| 52 | 52 | \ No newline at end of file |