Merge pull request #1 from hiteshaggarwal/master

Perfomance improvement for V1.0.1

Author: joomdevuser

astroid/astroid-framework/astroid.xml

@@ -5,7 +5,7 @@
    <libraryname>astroid</libraryname>
    <author>JoomDev</author>
    <creationDate>June 2018</creationDate>
-   <version>1.0.0</version>
+   <version>1.0.1</version>
    <url>http://astroidframework.com</url>
    <copyright>Copyright (C) 2018 Joomdev, Inc. All rights reserved.</copyright>
    <license>GNU General Public License version 2 or later; see LICENSE.txt</license>

astroid/astroid-framework/framework/helper.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @package   Astroid Framework
  * @author    JoomDev https://www.joomdev.com
@@ -8,6 +9,7 @@
 defined('_JEXEC') or die;
 jimport('astroid.framework.constants');
 jimport('joomla.filesystem.file');
+jimport('astroid.framework.template');
 jimport('joomla.filesystem.folder');
 jimport('joomla.filesystem.element');
 
@@ -33,7 +35,7 @@ public static function getAstroidElements() {
          $xmlfile = $element_dir . '/' . (str_replace($template_elements_dir, '', str_replace($elements_dir, '', $element_dir))) . '.xml';
          if (file_exists($xmlfile)) {
             $xml = simplexml_load_file($xmlfile);
-            $type = str_replace($elements_dir, '', $element_dir);
+            $type = str_replace($template_elements_dir, '', str_replace($elements_dir, '', $element_dir));
             $element = self::getElementConfig($xml, $type, $default['icon'], $default['description'], $default['color'], $default['multiple'], $default['options']);
             $return[] = $element;
          }
@@ -60,8 +62,12 @@ public static function getAllAstroidElements() {
       foreach ($elements as $element_dir) {
          $xmlfile = $element_dir . '/' . (str_replace($template_elements_dir, '', str_replace($elements_dir, '', $element_dir))) . '.xml';
          if (file_exists($xmlfile)) {
-            $type = str_replace($elements_dir, '', $element_dir);
-            $element = new AstroidElement($type);
+            $type = str_replace($template_elements_dir, '', str_replace($elements_dir, '', $element_dir));
+
+            $template = new \stdClass();
+            $template->template = ASTROID_TEMPLATE_NAME;
+            $template = new AstroidFrameworkTemplate($template);
+            $element = new AstroidElement($type, [], $template);
             $return[] = $element;
          }
       }
@@ -421,9 +427,9 @@ public static function getPositions() {
       }
       return $positions;
    }
-   
-   public static function isSystemFont($font){
-	   return isset(AstroidFrameworkConstants::$system_fonts[$font]);
+
+   public static function isSystemFont($font) {
+      return isset(AstroidFrameworkConstants::$system_fonts[$font]);
    }
 
 }

astroid/astroid-framework/framework/menu.php

@@ -324,6 +324,7 @@ public static function getMobileMenu($menutype = '') {
             echo '</li>';
          }
       }
+      echo '</ul>';
    }
 
    public static function getMegaMenu($item, $astroid_menu_options, $items) {

astroid/astroid-template-zero/frontend/header/horizontal.php

@@ -44,7 +44,6 @@
          // header nav starts
          AstroidMenu::getMenu($header_menu, $navClass);
          // header nav ends
-         $template->loadLayout('offcanvas');
       }
       ?>
    </div>

astroid/astroid-template-zero/frontend/header/sticky.php

@@ -49,7 +49,6 @@
          // header nav starts
          AstroidMenu::getMenu($header_menu, $navClass, null, 'left', 'sticky');
          // header nav ends
-         $template->loadLayout('offcanvas');
          ?>
       </div>
       <?php if ($enable_offcanvas): ?>

astroid/astroid-template-zero/templateDetails.xml

@@ -9,7 +9,7 @@
    <authorUrl>http://www.joomdev.com</authorUrl>
    <copyright>Copyright (C) 2018 Joomdev, Inc. All rights reserved.</copyright>
    <license>GNU General Public License version 2 or later; see LICENSE.txt</license>
-   <version>1.0.0</version>
+   <version>1.0.1</version>
    <description>TPL_ASTROID_XML_DESCRIPTION</description>
 
     <updateservers>

pkg_astroid.xml

@@ -7,7 +7,7 @@
    <packagerurl>http://astroidframework.com</packagerurl>
    <author>JoomDev</author>
    <creationDate>June 2018</creationDate>
-   <version>1.0.0</version>
+   <version>1.0.1</version>
    <url>http://www.joomdev.com</url>
    <copyright>Copyright (C) 2018 Joomdev, Inc. All rights reserved.</copyright>
    <license>GNU General Public License version 2 or later; see LICENSE.txt</license>