@@ -806,8 +806,7 @@ discard block |
||
806 | 806 | $this->_navigation->renderControl($writer); |
807 | 807 | $writer->write("\n</td></tr></table>\n"); |
808 | 808 | $this->renderEndTag($writer); |
809 | - } |
|
810 | - else |
|
809 | + } else |
|
811 | 810 | { |
812 | 811 | $this->applyControlProperties(); |
813 | 812 | $this->renderBeginTag($writer); |
@@ -905,8 +904,7 @@ discard block |
||
905 | 904 | { |
906 | 905 | $container->setVisible(true); |
907 | 906 | $showStandard=false; |
908 | - } |
|
909 | - else |
|
907 | + } else |
|
910 | 908 | $container->setVisible(false); |
911 | 909 | } |
912 | 910 | } |
@@ -1031,11 +1029,9 @@ discard block |
||
1031 | 1029 | return TWizardStepType::Finish; |
1032 | 1030 | else |
1033 | 1031 | return TWizardStepType::Step; |
1034 | - } |
|
1035 | - else |
|
1032 | + } else |
|
1036 | 1033 | return $type; |
1037 | - } |
|
1038 | - else |
|
1034 | + } else |
|
1039 | 1035 | return $type; |
1040 | 1036 | } |
1041 | 1037 | |
@@ -1102,8 +1098,7 @@ discard block |
||
1102 | 1098 | $this->_sideBarDataList->setSelectedItemIndex($this->getActiveStepIndex()); |
1103 | 1099 | $this->_sideBarDataList->dataBind(); |
1104 | 1100 | } |
1105 | - } |
|
1106 | - else |
|
1101 | + } else |
|
1107 | 1102 | { |
1108 | 1103 | $this->_sideBar=new TPanel; |
1109 | 1104 | $this->getControls()->add($this->_sideBar); |
@@ -1140,8 +1135,7 @@ discard block |
||
1140 | 1135 | { |
1141 | 1136 | if(!$this->_activeStepIndexSet && $this->allowNavigationToStep($newStepIndex)) |
1142 | 1137 | $this->setActiveStepIndex($newStepIndex); |
1143 | - } |
|
1144 | - else |
|
1138 | + } else |
|
1145 | 1139 | $this->setActiveStepIndex($stepIndex); |
1146 | 1140 | } |
1147 | 1141 | } |
@@ -1285,8 +1279,7 @@ discard block |
||
1285 | 1279 | $previousStepIndex=$history->pop(); |
1286 | 1280 | if($activeStepIndex===$previousStepIndex && $history->getCount()>0) |
1287 | 1281 | $previousStepIndex=$history->pop(); |
1288 | - } |
|
1289 | - else |
|
1282 | + } else |
|
1290 | 1283 | { |
1291 | 1284 | $previousStepIndex=$history->peek(); |
1292 | 1285 | if($activeStepIndex===$previousStepIndex && $history->getCount()>1) |
@@ -1297,8 +1290,7 @@ discard block |
||
1297 | 1290 | } |
1298 | 1291 | } |
1299 | 1292 | return $activeStepIndex===$previousStepIndex ? -1 : $previousStepIndex; |
1300 | - } |
|
1301 | - else |
|
1293 | + } else |
|
1302 | 1294 | return -1; |
1303 | 1295 | } |
1304 | 1296 | |
@@ -1362,8 +1354,7 @@ discard block |
||
1362 | 1354 | $navParam->setNextStepIndex($index+1); |
1363 | 1355 | $this->onNextButtonClick($navParam); |
1364 | 1356 | $handled=true; |
1365 | - } |
|
1366 | - else if(strcasecmp($command,self::CMD_PREVIOUS)===0) |
|
1357 | + } else if(strcasecmp($command,self::CMD_PREVIOUS)===0) |
|
1367 | 1358 | { |
1368 | 1359 | if($type!==TWizardStepType::Finish && $type!==TWizardStepType::Step) |
1369 | 1360 | throw new TInvalidDataValueException('wizard_command_invalid',self::CMD_PREVIOUS); |
@@ -1372,8 +1363,7 @@ discard block |
||
1372 | 1363 | $navParam->setNextStepIndex($prevIndex); |
1373 | 1364 | $this->onPreviousButtonClick($navParam); |
1374 | 1365 | $handled=true; |
1375 | - } |
|
1376 | - else if(strcasecmp($command,self::CMD_COMPLETE)===0) |
|
1366 | + } else if(strcasecmp($command,self::CMD_COMPLETE)===0) |
|
1377 | 1367 | { |
1378 | 1368 | if($type!==TWizardStepType::Finish) |
1379 | 1369 | throw new TInvalidDataValueException('wizard_command_invalid',self::CMD_COMPLETE); |
@@ -1381,8 +1371,7 @@ discard block |
||
1381 | 1371 | $navParam->setNextStepIndex($index+1); |
1382 | 1372 | $this->onCompleteButtonClick($navParam); |
1383 | 1373 | $handled=true; |
1384 | - } |
|
1385 | - else if(strcasecmp($command,self::CMD_MOVETO)===0) |
|
1374 | + } else if(strcasecmp($command,self::CMD_MOVETO)===0) |
|
1386 | 1375 | { |
1387 | 1376 | if($this->_cancelNavigation) // may be set in onSideBarButtonClick |
1388 | 1377 | $navParam->setCancelNavigation(true); |
@@ -1398,8 +1387,7 @@ discard block |
||
1398 | 1387 | } |
1399 | 1388 | if ($requestedIndex<0) |
1400 | 1389 | throw new TConfigurationException('wizard_step_invalid'); |
1401 | - } |
|
1402 | - else |
|
1390 | + } else |
|
1403 | 1391 | $requestedIndex=TPropertyValue::ensureInteger($requestedStep); |
1404 | 1392 | $navParam->setNextStepIndex($requestedIndex); |
1405 | 1393 | $handled=true; |
@@ -1416,8 +1404,7 @@ discard block |
||
1416 | 1404 | $this->getPreviousStepIndex(true); // pop out the previous move from history |
1417 | 1405 | $this->setActiveStepIndex($nextStepIndex); |
1418 | 1406 | } |
1419 | - } |
|
1420 | - else |
|
1407 | + } else |
|
1421 | 1408 | $this->setActiveStepIndex($index); |
1422 | 1409 | return true; |
1423 | 1410 | } |