x-systems / epesi-core

config/epesi.php

Indentation +4 added lines, -4 removed lines

@@ -20,10 +20,10 @@
 				 | This value is the name of Epesi powered by as displayed.
 				 |
 				 */
-		        'credit' => [
-		                'title' => 'EPESI',
-		                'link'  => 'https://epe.si'
-		        ],
+				'credit' => [
+						'title' => 'EPESI',
+						'link'  => 'https://epe.si'
+				],
 		        
 				/*
 				 |--------------------------------------------------------------------------

src/helpers.php

Indentation +15 added lines, -15 removed lines

@@ -2,35 +2,35 @@
 
 if (! function_exists('epesi')) {
 	function ui() : Epesi\Core\UI
-    {
-    	return resolve(Epesi\Core\UI::class);
-    }
+	{
+		return resolve(Epesi\Core\UI::class);
+	}
 }
 
 if (! function_exists('eval_css')) {
 	function eval_css($css)
-    {
-    	ui()->addStyle($css);
-    }
+	{
+		ui()->addStyle($css);
+	}
 }
 
 if (! function_exists('eval_js')) {
 	function eval_js($js, $args = [])
-    {
-    	ui()->addJS($js, $args);
-    }
+	{
+		ui()->addJS($js, $args);
+	}
 }
 
 if (! function_exists('load_css')) {
 	function load_css($url)
-    {
-    	return ui()->requireCSS($url);
-    }
+	{
+		return ui()->requireCSS($url);
+	}
 }
 
 if (! function_exists('load_js')) {
 	function load_js($url)
-    {
-    	return ui()->requireJS($url);
-    }
+	{
+		return ui()->requireJS($url);
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -1,34 +1,34 @@
 <?php
 
-if (! function_exists('epesi')) {
+if (!function_exists('epesi')) {
 	function ui() : Epesi\Core\UI
     {
     	return resolve(Epesi\Core\UI::class);
     }
 }
 
-if (! function_exists('eval_css')) {
+if (!function_exists('eval_css')) {
 	function eval_css($css)
     {
     	ui()->addStyle($css);
     }
 }
 
-if (! function_exists('eval_js')) {
+if (!function_exists('eval_js')) {
 	function eval_js($js, $args = [])
     {
     	ui()->addJS($js, $args);
     }
 }
 
-if (! function_exists('load_css')) {
+if (!function_exists('load_css')) {
 	function load_css($url)
     {
     	return ui()->requireCSS($url);
     }
 }
 
-if (! function_exists('load_js')) {
+if (!function_exists('load_js')) {
 	function load_js($url)
     {
     	return ui()->requireJS($url);

src/System/Modules/Concerns/HasAssetsAccess.php

Spacing +2 added lines, -2 removed lines

@@ -12,11 +12,11 @@
 	}
 	
 	final public static function requireJS($file = 'default.js', $isAsync = false, $isDefer = false) {
-		return ui()->requireJS(self::assetUrl('js/'. $file), $isAsync, $isDefer);
+		return ui()->requireJS(self::assetUrl('js/' . $file), $isAsync, $isDefer);
 	}
 	
 	final public static function requireCSS($file = 'default.css') {
-		return ui()->requireCSS(self::assetUrl('css/'. $file));
+		return ui()->requireCSS(self::assetUrl('css/' . $file));
 	}
 	
 	/**

src/Facades/UI.php

Indentation +9 added lines, -9 removed lines

@@ -7,13 +7,13 @@
 
 class UI extends Facade
 {
-    /**
-     * Get the registered name of the component.
-     *
-     * @return string
-     */
-    protected static function getFacadeAccessor()
-    {
-        return App::class;
-    }
+	/**
+	 * Get the registered name of the component.
+	 *
+	 * @return string
+	 */
+	protected static function getFacadeAccessor()
+	{
+		return App::class;
+	}
 }

src/UI.php

Braces +3 added lines, -6 removed lines

@@ -85,11 +85,9 @@ 
 	    ob_start();
 	    if ($exception instanceof TokenMismatchException) {
 	        $this->jsRedirectHomepage(__('Session expired! Redirecting to login screen ...'));
-	    }
-	    elseif ($exception instanceof NotFoundHttpException) {
+	    } elseif ($exception instanceof NotFoundHttpException) {
 	        $this->jsRedirectHomepage(__('Requested page not found! Redirecting to your home page ...'));
-	    }	    
-	    else {
+	    } else {
 	        $this->caughtException($exception);
 	    }
 	    
@@ -113,8 +111,7 @@ 
 	                'message'   => $message,
 	                'atkjs'   => $redirectJs
 	        ]);
-	    }
-	    else {
+	    } else {
 	        $this->outputResponseHTML($this->getTag('script', $redirectJs));
 	    }
 	}

Spacing +19 added lines, -19 removed lines

@@ -146,36 +146,36 @@ 
 		$localCss = url('storage/system/css');
 		
 		// jQuery
-		$urlJs = $this->cdn['jquery']?? $localJs;
-		$this->requireJS($urlJs.'/jquery.min.js');
+		$urlJs = $this->cdn['jquery'] ?? $localJs;
+		$this->requireJS($urlJs . '/jquery.min.js');
 		
 		// Semantic UI
-		$urlJs = $this->cdn['semantic-ui']?? $localJs;
-		$urlCss = $this->cdn['semantic-ui']?? $localCss;
-		$this->requireJS($urlJs.'/semantic.min.js');
-		$this->requireCSS($urlCss.'/semantic.min.css');
+		$urlJs = $this->cdn['semantic-ui'] ?? $localJs;
+		$urlCss = $this->cdn['semantic-ui'] ?? $localCss;
+		$this->requireJS($urlJs . '/semantic.min.js');
+		$this->requireCSS($urlCss . '/semantic.min.css');
 		
 		// Serialize Object
-		$urlJs = $this->cdn['serialize-object']?? $localJs;
-		$this->requireJS($urlJs.'/jquery.serialize-object.min.js');
+		$urlJs = $this->cdn['serialize-object'] ?? $localJs;
+		$this->requireJS($urlJs . '/jquery.serialize-object.min.js');
 		
 		// Agile UI
-		$urlJs = $this->cdn['atk']?? $localJs;
-		$urlCss = $this->cdn['atk']?? $localCss;
-		$this->requireJS($urlJs.'/atkjs-ui.min.js');
-		$this->requireCSS($urlCss.'/agileui.css');
+		$urlJs = $this->cdn['atk'] ?? $localJs;
+		$urlCss = $this->cdn['atk'] ?? $localCss;
+		$this->requireJS($urlJs . '/atkjs-ui.min.js');
+		$this->requireCSS($urlCss . '/agileui.css');
 		
 		// Draggable
-		$urlJs = $this->cdn['draggable']?? $localJs;
-		$this->requireJS($urlJs.'/draggable.bundle.js');
+		$urlJs = $this->cdn['draggable'] ?? $localJs;
+		$this->requireJS($urlJs . '/draggable.bundle.js');
 		
 		// jQuery niceScroll	
-		$urlJs = $this->cdn['jquery-nicescroll']?? $localJs;
-		$this->requireJS($urlJs.'/jquery.nicescroll.js');
+		$urlJs = $this->cdn['jquery-nicescroll'] ?? $localJs;
+		$this->requireJS($urlJs . '/jquery.nicescroll.js');
 		
 		// clipboard.js
-		$urlJs = $this->cdn['clipboardjs']?? $localJs;
-		$this->requireJS($urlJs.'/clipboard.js');
+		$urlJs = $this->cdn['clipboardjs'] ?? $localJs;
+		$this->requireJS($urlJs . '/clipboard.js');
 	}
 	
 	/**
@@ -258,7 +258,7 @@ 
 		
 		$key = md5(serialize(func_get_args()));
 		
-		if (! isset($cache[$key])) {
+		if (!isset($cache[$key])) {
 			$cache[$key] = true;
 			
 			parent::requireJS($url, $isAsync, $isDefer);

Indentation +30 added lines, -30 removed lines

@@ -25,10 +25,10 @@ 
 	{
 		parent::__construct([
 				'title' => config('epesi.ui.title', 'EPESI'),
-		        'cdn' => array_merge($this->cdn, (array) config('epesi.ui.cdn')),
+				'cdn' => array_merge($this->cdn, (array) config('epesi.ui.cdn')),
 				//TODO: set the skin from admin / user selection
-		        'skin' => config('epesi.ui.skin', $this->skin),
-		        'template_dir' => array_merge(ModuleManager::collect('templates', $this->skin), (array) $this->template_dir),
+				'skin' => config('epesi.ui.skin', $this->skin),
+				'template_dir' => array_merge(ModuleManager::collect('templates', $this->skin), (array) $this->template_dir),
 // 		        'catch_error_types' => config('app.debug') ? 
 // 		                  // debug mode
 // 		                  E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_USER_DEPRECATED : 
@@ -39,7 +39,7 @@ 
 	
 	final public static function module()
 	{
-	    return System\SystemCore::class;
+		return System\SystemCore::class;
 	}
 	
 	public function response()
@@ -58,7 +58,7 @@ 
 	
 	public function render()
 	{			
-	    System\SystemCore::requireCSS('epesi.css');
+		System\SystemCore::requireCSS('epesi.css');
 	    
 		$this->addCsrfToken();
 		
@@ -81,18 +81,18 @@ 
 	 */
 	public function renderException($exception)
 	{
-	    ob_start();
-	    if ($exception instanceof TokenMismatchException) {
-	        $this->jsRedirectHomepage(__('Session expired! Redirecting to login screen ...'));
-	    }
-	    elseif ($exception instanceof NotFoundHttpException) {
-	        $this->jsRedirectHomepage(__('Requested page not found! Redirecting to your home page ...'));
-	    }	    
-	    else {
-	        $this->caughtException($exception);
-	    }
+		ob_start();
+		if ($exception instanceof TokenMismatchException) {
+			$this->jsRedirectHomepage(__('Session expired! Redirecting to login screen ...'));
+		}
+		elseif ($exception instanceof NotFoundHttpException) {
+			$this->jsRedirectHomepage(__('Requested page not found! Redirecting to your home page ...'));
+		}	    
+		else {
+			$this->caughtException($exception);
+		}
 	    
-	    return ob_get_clean();
+		return ob_get_clean();
 	}
 	
 	/**
@@ -102,20 +102,20 @@ 
 	 */
 	public function jsRedirectHomepage($message)
 	{
-	    $homepageUrl = url(HomePage\Model\HomePage::pathOfUser());
+		$homepageUrl = url(HomePage\Model\HomePage::pathOfUser());
 	    
-	    $redirectJs = $this->jsRedirectConfirm($homepageUrl, $message)->jsRender();
+		$redirectJs = $this->jsRedirectConfirm($homepageUrl, $message)->jsRender();
 	    
-	    if ($this->isJsonRequest()) {
-	        $this->outputResponseJSON([
-	                'success'   => true,
-	                'message'   => $message,
-	                'atkjs'   => $redirectJs
-	        ]);
-	    }
-	    else {
-	        $this->outputResponseHTML($this->getTag('script', $redirectJs));
-	    }
+		if ($this->isJsonRequest()) {
+			$this->outputResponseJSON([
+					'success'   => true,
+					'message'   => $message,
+					'atkjs'   => $redirectJs
+			]);
+		}
+		else {
+			$this->outputResponseHTML($this->getTag('script', $redirectJs));
+		}
 	}
 	
 	/**
@@ -127,9 +127,9 @@ 
 	 */
 	public function jsRedirectConfirm($page, $message)
 	{
-	    $redirectJs = $this->jsRedirect($page)->jsRender();
+		$redirectJs = $this->jsRedirect($page)->jsRender();
 	    
-	    return new \atk4\ui\JsExpression("if (confirm([])) { $redirectJs }", [$message]);
+		return new \atk4\ui\JsExpression("if (confirm([])) { $redirectJs }", [$message]);
 	}
 	
 	/**

src/Layout/View/NavMenu.php

Braces +5 added lines, -5 removed lines

@@ -41,7 +41,9 @@ 
 			
 			return $weight1 <=> $weight2;
 		})->map(function($entry, $caption) use ($menu) {
-			if (! ($entry['access'] ?? true)) return;
+			if (! ($entry['access'] ?? true)) {
+				return;
+			}
 
 			if (!is_array($entry)) {
 				$entry = ['action' => $entry];
@@ -60,13 +62,11 @@ 
 // 				$submenu->js = ['transition' => 'swing left', 'on' => 'click'];
 
 				self::addItems($submenu, collect($subitems));
-			}
-			elseif ($subitems = $entry['group'] ?? []) {
+			} elseif ($subitems = $entry['group'] ?? []) {
 			    $subgroup = $menu->addGroup($entry['item']);
 
 				self::addItems($subgroup, collect($subitems));
-			}
-			else {
+			} else {
 			    $menu->addItem($entry['item'], $entry['action'] ?? '');
 			}
 		});

Indentation +4 added lines, -4 removed lines

@@ -9,11 +9,11 @@ 
 
 class NavMenu extends BaseMenu
 {
-    public $ui = 'inverted nav menu';
+	public $ui = 'inverted nav menu';
     
 //     public $defaultTemplate = 'layout/maestro-sidenav.html';
     
-    protected function init(): void
+	protected function init(): void
 	{		
 		parent::init();
 		
@@ -64,12 +64,12 @@ 
 				self::addItems($submenu, collect($subitems));
 			}
 			elseif ($subitems = $entry['group'] ?? []) {
-			    $subgroup = $menu->addGroup($entry['item']);
+				$subgroup = $menu->addGroup($entry['item']);
 
 				self::addItems($subgroup, collect($subitems));
 			}
 			else {
-			    $menu->addItem($entry['item'], $entry['action'] ?? '');
+				$menu->addItem($entry['item'], $entry['action'] ?? '');
 			}
 		});
 	}

Spacing +5 added lines, -5 removed lines

@@ -20,7 +20,7 @@ 
 		$this->addHeader($this->getApp()->title);
 		
 		$items = collect();
-		foreach(NavMenuJoint::collect() as $joint) {
+		foreach (NavMenuJoint::collect() as $joint) {
 			$items = $items->merge($joint->items());
 		}
 
@@ -37,13 +37,13 @@ 
 
 	public static function addItems($menu, Collection $items)
 	{
-		$items->sort(function ($entry1, $entry2) {
-			$weight1 = $entry1['weight']?? 10;
-			$weight2 = $entry2['weight']?? 10;
+		$items->sort(function($entry1, $entry2) {
+			$weight1 = $entry1['weight'] ?? 10;
+			$weight2 = $entry2['weight'] ?? 10;
 			
 			return $weight1 <=> $weight2;
 		})->map(function($entry, $caption) use ($menu) {
-			if (! ($entry['access'] ?? true)) return;
+			if (!($entry['access'] ?? true)) return;
 
 			if (!is_array($entry)) {
 				$entry = ['action' => $entry];

src/Layout/View/RightMenu.php

Braces +9 added lines, -3 removed lines

@@ -73,7 +73,9 @@ 
 	{
 		$entry = collect(array_merge(['item' => $entry, 'group' => '00500:general', 'weight' => 10], $entry));
 		
-		if (! $entry->get('item')) return;
+		if (! $entry->get('item')) {
+			return;
+		}
 		
 		$this->entries->add($entry);
 	}
@@ -94,14 +96,18 @@ 
 	{
 		$empty = true;
 		foreach ($this->entries->groupBy('group')->sortKeys() as $group) {
-			if (!$empty) $this->userMenu->addDivider();
+			if (!$empty) {
+				$this->userMenu->addDivider();
+			}
 		
 			foreach ($group->sortBy('weight') as $entry) {
 				$empty = false;
 				
 				$item = $this->userMenu->addItem($entry['item'], $entry->get('action'));
 				
-				if (! $callback = $entry->get('callback')) continue;
+				if (! $callback = $entry->get('callback')) {
+					continue;
+				}
 					
 				$callback($item);
 			}

Spacing +7 added lines, -7 removed lines

@@ -43,12 +43,12 @@ 
 				'icon' => 'th'
 		], new LaunchPad($this));
 		
-		foreach(UserMenuJoint::collect() as $joint) {
-			foreach ($joint->tools()?: [] as $tool) {
+		foreach (UserMenuJoint::collect() as $joint) {
+			foreach ($joint->tools() ?: [] as $tool) {
 				$this->addTool($tool);
 			}
 
-			foreach ($joint->entries()?: [] as $entry) {
+			foreach ($joint->entries() ?: [] as $entry) {
 				$this->addEntry($entry);
 			}			
 		}
@@ -66,7 +66,7 @@ 
 				'item' => ['Logout', 'icon' => 'sign out', 'attr' => ['onclick' => "event.preventDefault();$('#logout-form').submit();"]],
 				'action' => url('logout'), 
 				'group' => '10000:user',
-				'callback' => function ($item) {
+				'callback' => function($item) {
 					$logoutForm = View::addTo($item, [
 							'id' => 'logout-form', 
 							'attr' => [
@@ -95,14 +95,14 @@ 
 	
 	public function getUserMenuLabel()
 	{
-		return $this->userMenuLabel?: Auth::user()->name;
+		return $this->userMenuLabel ?: Auth::user()->name;
 	}
 	
 	public function addEntry($entry)
 	{
 		$entry = collect(array_merge(['item' => $entry, 'group' => '00500:general', 'weight' => 10], $entry));
 		
-		if (! $entry->get('item')) return;
+		if (!$entry->get('item')) return;
 		
 		$this->entries->add($entry);
 	}
@@ -130,7 +130,7 @@ 
 				
 				$item = $this->userMenu->addItem($entry['item'], $entry->get('action'));
 				
-				if (! $callback = $entry->get('callback')) continue;
+				if (!$callback = $entry->get('callback')) continue;
 					
 				$callback($item);
 			}

src/System/View/Form.php

Braces +6 added lines, -2 removed lines

@@ -89,7 +89,9 @@ 
 	}
 	
 	public function addFieldRules($field, $rules = []) {
-		if (! $rules) return;
+		if (! $rules) {
+			return;
+		}
 		
 		$this->fieldRules[$field] = $rules['rules']?? [
 				'identifier' => $field,
@@ -112,7 +114,9 @@ 
 		$this->onSubmit(function ($form) use ($callback) {
 			$errors = [];
 			foreach ($this->validationRules?: [] as $ruleCallback) {
-				if (! is_callable($ruleCallback)) continue;
+				if (! is_callable($ruleCallback)) {
+					continue;
+				}
 				
 				$ruleErrors = $ruleCallback($form);
 				

Spacing +22 added lines, -22 removed lines

@@ -15,52 +15,52 @@ 
 	protected $validationRules = [];
 	
 	public function addElements($elements, $parent = null) {
-		$parent = $parent?: $this;
+		$parent = $parent ?: $this;
 		
 		foreach ($elements as $name => $desc) {
-			$name = $desc['name']?? $name;
+			$name = $desc['name'] ?? $name;
 			
-			$this->addFieldRules($name, $desc['rules']?? []);
+			$this->addFieldRules($name, $desc['rules'] ?? []);
 			
-			switch ($desc['type']?? 'field') {
+			switch ($desc['type'] ?? 'field') {
 				case 'field':
-					$desc = is_string($desc)? [
+					$desc = is_string($desc) ? [
 					'decorator' => [$desc]
-					]: $desc;
+					] : $desc;
 					
-					$field = $parent->addControl($name, $desc['decorator']?? [], $desc['options']?? []);
+					$field = $parent->addControl($name, $desc['decorator'] ?? [], $desc['options'] ?? []);
 					
 					if ($default = $desc['default']) {
 						$field->set($default);
 					}
 					
-					if ($desc['display']?? false) {
+					if ($desc['display'] ?? false) {
 						$this->addFieldsDisplayRules([$name => $desc['display']]);
 					}
 					break;
 					
 				case 'group':
-					$seed = $desc['seed']?? [$name];
+					$seed = $desc['seed'] ?? [$name];
 					
 					$group = $parent->addGroup($seed);
 					
 					$this->addElements($desc['elements'], $group);
 					
-					if ($desc['display']?? false) {
+					if ($desc['display'] ?? false) {
 						$this->addGroupDisplayRules([$name => $desc['display']]);
 					}
 					break;
 					
 				case 'header':
-					$seed = $desc['seed']?? [$name];
+					$seed = $desc['seed'] ?? [$name];
 					
 					$parent->addHeader($seed);
 					break;
 					
 				case 'view':
-					$seed = $desc['seed']?? ['Label', $name];
+					$seed = $desc['seed'] ?? ['Label', $name];
 					
-					$region = $desc['region']?? null;
+					$region = $desc['region'] ?? null;
 					
 					$this->add($seed, $region);
 					break;
@@ -75,7 +75,7 @@ 
 	}
 	
 	public function addFieldsDisplayRules($fieldsDisplayRules) {
-		$this->setControlsDisplayRules(array_merge($this->fieldsDisplayRules?: [], $fieldsDisplayRules));
+		$this->setControlsDisplayRules(array_merge($this->fieldsDisplayRules ?: [], $fieldsDisplayRules));
 	}
 	
 	public function addGroupDisplayRules($groupDisplayRules) {
@@ -87,9 +87,9 @@ 
 	}
 	
 	public function addFieldRules($field, $rules = []) {
-		if (! $rules) return;
+		if (!$rules) return;
 		
-		$this->fieldRules[$field] = $rules['rules']?? [
+		$this->fieldRules[$field] = $rules['rules'] ?? [
 				'identifier' => $field,
 				'rules' => $rules
 		];
@@ -109,17 +109,17 @@ 
 				'fields' => $this->fieldRules
 		]);
 		
-		$this->onSubmit(function ($form) use ($callback) {
+		$this->onSubmit(function($form) use ($callback) {
 			$errors = [];
-			foreach ($this->validationRules?: [] as $ruleCallback) {
-				if (! is_callable($ruleCallback)) continue;
+			foreach ($this->validationRules ?: [] as $ruleCallback) {
+				if (!is_callable($ruleCallback)) continue;
 				
 				$ruleErrors = $ruleCallback($form);
 				
-				$errors = array_merge($errors, $ruleErrors?: []);
+				$errors = array_merge($errors, $ruleErrors ?: []);
 			}
 			
-			return $errors?: $callback($this);
+			return $errors ?: $callback($this);
 		});
 			
 			return $this;
@@ -132,7 +132,7 @@ 
 	
 	public function confirmLeave($confirm = true)
 	{
-		$this->canLeave = ! $confirm;
+		$this->canLeave = !$confirm;
 		
 		return $this;
 	}

src/System/View/ActionButton.php

Spacing +3 added lines, -3 removed lines

@@ -40,7 +40,7 @@ 
     
     protected function addIcon()
     {
-    	if (! $icon = $this->getIcon()) return;
+    	if (!$icon = $this->getIcon()) return;
     	
     	$this->add($icon, 'Icon')->id = null;
     	
@@ -51,14 +51,14 @@ 
     
     protected function addLabel()
     {
-    	$this->content = $this->label?: $this->content;
+    	$this->content = $this->label ?: $this->content;
     	
     	return $this;
     }
 
     public function getIcon()
     {
-    	return is_object($this->icon)? $this->icon: new Icon($this->icon);
+    	return is_object($this->icon) ? $this->icon : new Icon($this->icon);
     }
     
     public function callback($callable)

Indentation +51 added lines, -51 removed lines

@@ -8,79 +8,79 @@
 
 class ActionButton extends View
 {
-    public $defaultTemplate = 'action_button.html';
+	public $defaultTemplate = 'action_button.html';
 
-    public $ui = 'basic inverted action button';
+	public $ui = 'basic inverted action button';
 
-    /**
-     * Icon that will appear on the button (top).
-     *
-     * @var string|array|Icon
-     */
-    public $icon;
+	/**
+	 * Icon that will appear on the button (top).
+	 *
+	 * @var string|array|Icon
+	 */
+	public $icon;
     
-    public $label;
+	public $label;
 
-    public $element = 'a';
+	public $element = 'a';
     
-    public $weight = 10;
+	public $weight = 10;
     
-    public $callback;
+	public $callback;
 
-    public function renderView(): void
-    {
-        $this->addIcon();
+	public function renderView(): void
+	{
+		$this->addIcon();
         
-        $this->addLabel();
+		$this->addLabel();
         
-        $this->addCallback();
+		$this->addCallback();
 
-        parent::renderView();
-    }
+		parent::renderView();
+	}
     
-    protected function addIcon()
-    {
-    	if (! $icon = $this->getIcon()) return;
+	protected function addIcon()
+	{
+		if (! $icon = $this->getIcon()) return;
     	
-    	$this->add($icon, 'Icon')->id = null;
+		$this->add($icon, 'Icon')->id = null;
     	
-    	$this->addClass('icon');
+		$this->addClass('icon');
     	
-    	return $this;
-    }
+		return $this;
+	}
     
-    protected function addLabel()
-    {
-    	$this->content = $this->label?: $this->content;
+	protected function addLabel()
+	{
+		$this->content = $this->label?: $this->content;
     	
-    	return $this;
-    }
+		return $this;
+	}
 
-    public function getIcon()
-    {
-    	return is_object($this->icon)? $this->icon: new Icon($this->icon);
-    }
+	public function getIcon()
+	{
+		return is_object($this->icon)? $this->icon: new Icon($this->icon);
+	}
     
-    public function callback($callable)
-    {
-    	$this->callback = $callable;
+	public function callback($callable)
+	{
+		$this->callback = $callable;
     	
-    	return $this;
-    }
+		return $this;
+	}
     
-    public function addCallback()
-    {
-    	if (!$callable = $this->callback) return;
+	public function addCallback()
+	{
+		if (!$callable = $this->callback) return;
     	
-    	if (is_callable($callable)) {
-    		$callable = JsCallback::addTo($this)->set($callable);
-    	}
+		if (is_callable($callable)) {
+			$callable = JsCallback::addTo($this)->set($callable);
+		}
     	
-    	if ($callable instanceof JsCallback) {
-    		$this->on('click', $callable);
-    	}
+		if ($callable instanceof JsCallback) {
+			$this->on('click', $callable);
+		}
     	
-    	return $this;
-    }
+		return $this;
+	}
 
 }

Braces +6 added lines, -2 removed lines

@@ -40,7 +40,9 @@ 
     
     protected function addIcon()
     {
-    	if (! $icon = $this->getIcon()) return;
+    	if (! $icon = $this->getIcon()) {
+    		return;
+    	}
     	
     	$this->add($icon, 'Icon')->id = null;
     	
@@ -70,7 +72,9 @@ 
     
     public function addCallback()
     {
-    	if (!$callable = $this->callback) return;
+    	if (!$callable = $this->callback) {
+    		return;
+    	}
     	
     	if (is_callable($callable)) {
     		$callable = JsCallback::addTo($this)->set($callable);