FML Update

This commit is contained in:
Steffen Schröder
2013-12-09 13:05:05 +01:00
parent 690ef2b0bb
commit 666785de90
61 changed files with 408 additions and 200 deletions

View File

@ -30,9 +30,8 @@ class Menus implements Constants, Labels, ScriptFeature {
* @return \FML\Script\Menus
*/
public function add(array $menuRelationships) {
$menuIndex = count($this->menus);
$menus = array();
$submenus = array();
$subMenus = array();
foreach ($menuRelationships as $relationship) {
$menuItemControl = $relationship[0];
$subMenuControl = $relationship[1];
@ -41,7 +40,7 @@ class Menus implements Constants, Labels, ScriptFeature {
trigger_error('No Scriptable instance given as menu item.', E_USER_ERROR);
}
if (!($subMenuControl instanceof Control)) {
trigger_error('No Control instance given as submenu.', E_USER_ERROR);
trigger_error('No Control instance given as sub menu.', E_USER_ERROR);
}
$menuItemControl->assignId();
@ -49,9 +48,9 @@ class Menus implements Constants, Labels, ScriptFeature {
$subMenuControl->assignId();
array_push($menus, array($menuItemControl->getId(), $subMenuControl->getId()));
array_push($submenus, $subMenuControl->getId());
array_push($subMenus, $subMenuControl->getId());
}
array_push($this->menus, array($menus, $submenus));
array_push($this->menus, array($menus, $subMenus));
return $this;
}
@ -99,5 +98,3 @@ class Menus implements Constants, Labels, ScriptFeature {
return $labels;
}
}
?>

View File

@ -140,5 +140,3 @@ class Pages implements Constants, Globals, Includes, Labels, ScriptFeature {
return $labels;
}
}
?>

View File

@ -2,7 +2,6 @@
namespace FML\Script;
use FML\Controls\Control;
use FML\Script\Sections\Constants;
use FML\Script\Sections\Functions;
use FML\Script\Sections\Globals;
@ -10,7 +9,7 @@ use FML\Script\Sections\Includes;
use FML\Script\Sections\Labels;
/**
* Class reprenting the manialink script
* Class representing the Manialink Script
*
* @author steeffeen
*/
@ -45,7 +44,7 @@ class Script {
* Create the script xml tag
*
* @param \DOMDocument $domDocument
* @return DOMElement
* @return \DOMElement
*/
public function render(\DOMDocument $domDocument) {
$scriptXml = $domDocument->createElement('script');
@ -75,7 +74,7 @@ class Script {
/**
* Add the header comment to the script
*
* @param script $scriptText
* @param string $scriptText
* @return string
*/
private function addHeaderPart($scriptText) {
@ -215,5 +214,3 @@ class Script {
return $scriptText . $mainPart;
}
}
?>

View File

@ -9,5 +9,3 @@ namespace FML\Script;
*/
interface ScriptFeature {
}
?>

View File

@ -14,5 +14,3 @@ interface Constants {
*/
public function getConstants();
}
?>

View File

@ -16,5 +16,3 @@ interface Functions {
*/
public function getFunctions();
}
?>

View File

@ -16,5 +16,3 @@ interface Globals {
*/
public function getGlobals();
}
?>

View File

@ -16,5 +16,3 @@ interface Includes {
*/
public function getIncludes();
}
?>

View File

@ -26,5 +26,3 @@ interface Labels {
*/
public function getLabels();
}
?>

View File

@ -74,5 +74,3 @@ class Tooltips implements Constants, Labels, ScriptFeature {
return $labels;
}
}
?>