@magic-xpa/cli 4.1000.0 → 4.1100.0-dev000.0

package/templates/angular/src/app.module.ts

@@ -1,70 +1,70 @@
-import {BrowserModule} from '@angular/platform-browser';
-import {NgModule} from '@angular/core';
-import {ReactiveFormsModule} from '@angular/forms';
-
-import {AppComponent} from './app.component';
-import {DynamicModule} from 'ng-dynamic-component';
-import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
-import {ComponentArray, compHash, title} from './component-list.g';
-import {InfiniteScrollModule} from 'ngx-infinite-scroll';
-import {
-  MatButtonModule,
-  MatCheckboxModule,
-  MatInputModule,
-  MatListModule,
-  MatPaginatorModule,
-  MatSelectModule,
-  MatTableModule,
-  MatTabsModule,
-  MatCardModule,
-  MatTooltipModule,
-  MatRadioModule,
-  MatDatepickerModule,
-  MatNativeDateModule,
-  MatSortModule
-
-} from '@angular/material';
-import {RouterModule} from '@angular/router';
-import {routes} from './app.routes';
-import {MagicModule,ComponentListMagicService} from '@magic-xpa/angular';
-
-
-@NgModule({
-   declarations: [AppComponent, ...ComponentArray],
-   imports: [
-      // Angular modules
-      BrowserModule,
-      ReactiveFormsModule,
-      RouterModule.forRoot(routes),
-
-      // Material modules
-      BrowserAnimationsModule,
-      MatTableModule,
-      MatPaginatorModule,
-      MatSortModule,
-      MatInputModule,
-      MatButtonModule,
-      MatListModule,
-      MatCheckboxModule,
-      MatTabsModule,
-      MatSelectModule,
-      MatTooltipModule,
-      MatCardModule,
-      MatRadioModule,
-      MatDatepickerModule,
-      MatNativeDateModule,
-
-      // Magic modules
-      MagicModule.forRoot(),
-      InfiniteScrollModule,
-      DynamicModule.withComponents(ComponentArray)
-   ],
-   bootstrap: [AppComponent],
-})
-export class AppModule {
-   constructor(componentList:ComponentListMagicService) {
-      componentList.addComponents(compHash);
-      componentList.title = title;
-   }
-
-}
+import {BrowserModule} from '@angular/platform-browser';
+import {NgModule} from '@angular/core';
+import {ReactiveFormsModule} from '@angular/forms';
+
+import {AppComponent} from './app.component';
+import {DynamicModule} from 'ng-dynamic-component';
+import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
+import {ComponentArray, compHash, title} from './component-list.g';
+import {InfiniteScrollModule} from 'ngx-infinite-scroll';
+import {
+  MatButtonModule,
+  MatCheckboxModule,
+  MatInputModule,
+  MatListModule,
+  MatPaginatorModule,
+  MatSelectModule,
+  MatTableModule,
+  MatTabsModule,
+  MatCardModule,
+  MatTooltipModule,
+  MatRadioModule,
+  MatDatepickerModule,
+  MatNativeDateModule,
+  MatSortModule
+
+} from '@angular/material';
+import {RouterModule} from '@angular/router';
+import {routes} from './app.routes';
+import {MagicModule,ComponentListMagicService} from '@magic-xpa/angular';
+
+
+@NgModule({
+   declarations: [AppComponent, ...ComponentArray],
+   imports: [
+      // Angular modules
+      BrowserModule,
+      ReactiveFormsModule,
+      RouterModule.forRoot(routes),
+
+      // Material modules
+      BrowserAnimationsModule,
+      MatTableModule,
+      MatPaginatorModule,
+      MatSortModule,
+      MatInputModule,
+      MatButtonModule,
+      MatListModule,
+      MatCheckboxModule,
+      MatTabsModule,
+      MatSelectModule,
+      MatTooltipModule,
+      MatCardModule,
+      MatRadioModule,
+      MatDatepickerModule,
+      MatNativeDateModule,
+
+      // Magic modules
+      MagicModule.forRoot(),
+      InfiniteScrollModule,
+      DynamicModule.withComponents(ComponentArray)
+   ],
+   bootstrap: [AppComponent],
+})
+export class AppModule {
+   constructor(componentList:ComponentListMagicService) {
+      componentList.addComponents(compHash);
+      componentList.title = title;
+   }
+
+}

package/templates/angular/src/app.routes.ts

@@ -1,73 +1,73 @@
-import {Routes, RouterModule} from '@angular/router';
-import {RouterContainerMagicComponent} from  "@magic-xpa/angular";
-
-import { CommonModule } from "@angular/common";
-import { NgModule }  from '@angular/core';
-
- export const routes: Routes = [
-    <%- startRanderForRootModule (createRootRoute); -%>
-    <%- renderRoutes (routesArray, createRootRoute); -%>
-    <%- endRanderForRootModule (createRootRoute); -%>
-];
-
-<% randerModule (createRootRoute); %>
-
-<%#   some functions for help %>
-<%#   ======================= %>
-
-<%# Generate the routes using routesArray from json file %>
-<% function renderRoutes (routesCollection, createRootRoute) { -%> <% routesCollection.forEach(route=>{ -%>
-        {
-          path : '<%=route.RouteName%>',
-          <% if (route.ModuleName!= "") {-%>
-               <% if (createRootRoute) { -%>
-                    loadChildren:()=> import(`./magic/<%=route.ModuleName%>/magic.gen.lib.module`).then(m =>m.Magic<%=route.ModuleName%>Module),
-               <%} else {-%>
-                    loadChildren:()=> import(`../<%=route.ModuleName%>/magic.gen.lib.module`).then(m => m.Magic<%=route.ModuleName%>Module),
-               <%}-%>
-          <%} else {-%>
-               component: RouterContainerMagicComponent,
-          <%}-%>
-
-        <% if (route.OutletName != "") { -%>
-            outlet: '<%=route.OutletName%>',
-            <%}-%>
-            <%# Generate the children of routes %>
-            <% if (route.children != null) {%>
-            children: [
-                <%- renderRoutes(route.children, createRootRoute)-%>
-            ]
-            <%}-%>
-        },
-        <%})-%>
-    <%}-%>
-
-
-<%# Generate the ngModule using from json file %>
-<% function randerModule (createRootRoute) { %>
-  @NgModule({
-          imports: [CommonModule,
-            <% if (createRootRoute == true) {%> RouterModule.forRoot(routes)], <%}else {%> RouterModule.forChild(routes)],<%}-%>
-          exports: [RouterModule]
-  })
-  export class MagicRoutingModule { }
-
-<%}%>
-
-<%# start Generate the child  ?? ModuleEntryMagicComponent %>
-<% function startRanderForRootModule (createRootRoute)
-  { %>
-  <% if (!createRootRoute) { -%>
-    {
-      path: '',
-        component: RouterContainerMagicComponent,
-        children: [
-    <%}-%>
-      <%}-%>
-
-    <%# end Generate the child %>
-    <% function endRanderForRootModule (createRootRoute) { %>
-      <% if (!createRootRoute) {%>
-      ]}
-      <%}-%>
-    <%}-%>
+import {Routes, RouterModule} from '@angular/router';
+import {RouterContainerMagicComponent} from  "@magic-xpa/angular";
+
+import { CommonModule } from "@angular/common";
+import { NgModule }  from '@angular/core';
+
+ export const routes: Routes = [
+    <%- startRanderForRootModule (createRootRoute); -%>
+    <%- renderRoutes (routesArray, createRootRoute); -%>
+    <%- endRanderForRootModule (createRootRoute); -%>
+];
+
+<% randerModule (createRootRoute); %>
+
+<%#   some functions for help %>
+<%#   ======================= %>
+
+<%# Generate the routes using routesArray from json file %>
+<% function renderRoutes (routesCollection, createRootRoute) { -%> <% routesCollection.forEach(route=>{ -%>
+        {
+          path : '<%=route.RouteName%>',
+          <% if (route.ModuleName!= "") {-%>
+               <% if (createRootRoute) { -%>
+                    loadChildren:()=> import(`./magic/<%=route.ModuleName%>/magic.gen.lib.module`).then(m =>m.Magic<%=route.ModuleName%>Module),
+               <%} else {-%>
+                    loadChildren:()=> import(`../<%=route.ModuleName%>/magic.gen.lib.module`).then(m => m.Magic<%=route.ModuleName%>Module),
+               <%}-%>
+          <%} else {-%>
+               component: RouterContainerMagicComponent,
+          <%}-%>
+
+        <% if (route.OutletName != "") { -%>
+            outlet: '<%=route.OutletName%>',
+            <%}-%>
+            <%# Generate the children of routes %>
+            <% if (route.children != null) {%>
+            children: [
+                <%- renderRoutes(route.children, createRootRoute)-%>
+            ]
+            <%}-%>
+        },
+        <%})-%>
+    <%}-%>
+
+
+<%# Generate the ngModule using from json file %>
+<% function randerModule (createRootRoute) { %>
+  @NgModule({
+          imports: [CommonModule,
+            <% if (createRootRoute == true) {%> RouterModule.forRoot(routes)], <%}else {%> RouterModule.forChild(routes)],<%}-%>
+          exports: [RouterModule]
+  })
+  export class MagicRoutingModule { }
+
+<%}%>
+
+<%# start Generate the child  ?? ModuleEntryMagicComponent %>
+<% function startRanderForRootModule (createRootRoute)
+  { %>
+  <% if (!createRootRoute) { -%>
+    {
+      path: '',
+        component: RouterContainerMagicComponent,
+        children: [
+    <%}-%>
+      <%}-%>
+
+    <%# end Generate the child %>
+    <% function endRanderForRootModule (createRootRoute) { %>
+      <% if (!createRootRoute) {%>
+      ]}
+      <%}-%>
+    <%}-%>

package/templates/angular/src/styles/app.css

@@ -1,6 +1,6 @@
-@import "~@angular/material/prebuilt-themes/indigo-pink.css";
-
-body
-{
-	margin : 0;
+@import "~@angular/material/prebuilt-themes/indigo-pink.css";
+
+body
+{
+	margin : 0;
 }

package/templates/attributes/button_attributes.ejs

@@ -1,2 +1,2 @@
-<%- include('./common/base_attributes', {ctrl : ctrl}) %>
-<%- include('./common/base/enabled', {ctrl : ctrl}) %>
+<%- include('./common/base_attributes', {ctrl : ctrl}) %>
+<%- include('./common/base/enabled', {ctrl : ctrl}) %>

package/templates/attributes/common/base/class.ejs

@@ -1,6 +1,6 @@
-<% if (ctrl.hasClassExpression) { %>
-[ngClass]="mg.getClasses(<%= ctrl.props.enum_id %><% if(ctrl.props.is_table_child && ctrl.controlType !== MgControlType.CTRL_TYPE_COLUMN){ %>, row.rowId<%}%>)"
-<% } %>
-<% if (ctrl.classes && ctrl.controlType !== MgControlType.CTRL_TYPE_COLUMN) { %>
-class="<%= ctrl.classes %>"
-<% } %>
+<% if (ctrl.hasClassExpression) { %>
+[ngClass]="mg.getClasses(<%= ctrl.props.enum_id %><% if(ctrl.props.is_table_child && ctrl.controlType !== MgControlType.CTRL_TYPE_COLUMN){ %>, row.rowId<%}%>)"
+<% } %>
+<% if (ctrl.classes && ctrl.controlType !== MgControlType.CTRL_TYPE_COLUMN) { %>
+class="<%= ctrl.classes %>"
+<% } %>

package/templates/attributes/common/base/control_type.ejs

@@ -1,54 +1,54 @@
-<% if(magicConfig.allow_testing) { %>
-    <% switch (ctrl.controlType){
-        case MgControlType.CTRL_TYPE_TEXT: %>
-            <% if (ctrl.controlType === MgControlType.CTRL_TYPE_TEXT && ctrl.props.style != null && ctrl.props.style != undefined && ctrl.props.style.multiline_edit) { %>
-                MgControlType="MgMultiLineEdit"
-            <% } else { %>
-                MgControlType="MgEdit"
-            <% } %>
-        <% break;
-        case MgControlType.CTRL_TYPE_LABEL: %>
-            MgControlType="MgLabel"
-        <% break;
-        case MgControlType.CTRL_TYPE_BUTTON: %>
-            <% switch ((ctrl.props.button_style)) {
-                default : %>
-                    MgControlType="MgPushButton"
-                <% break;
-                case CtrlButtonTypeGui.Image : %>
-                    MgControlType="MgImageButton"
-                <% break;
-                case CtrlButtonTypeGui.Hypertext : %>
-                    MgControlType="MgHyperText"
-                <% break;
-            } %>
-        <% break;
-        case MgControlType.CTRL_TYPE_IMAGE: %>
-            MgControlType="MgImage"
-        <% break;
-        case MgControlType.CTRL_TYPE_SUBFORM: %>
-            MgControlType="MgSubform"
-        <% break;
-        case MgControlType.CTRL_TYPE_CHECKBOX: %>
-            MgControlType="MgCheckBox"
-        <% break;
-        case MgControlType.CTRL_TYPE_COMBO: %>
-            MgControlType="MgComboBox"
-        <% break;
-        case MgControlType.CTRL_TYPE_LIST: %>
-            MgControlType="MgListBox"
-        <% break;
-        case MgControlType.CTRL_TYPE_RADIO: %>
-            MgControlType="MgRadio"
-        <% break;
-        case MgControlType.CTRL_TYPE_TABLE: %>
-            MgControlType="MgTable"
-        <% break;
-        case MgControlType.CTRL_TYPE_GROUP: %>
-            MgControlType="MgGroupBox"
-        <% break;
-        case MgControlType.CTRL_TYPE_TAB: %>
-            MgControlType="MgTab"
-        <% break;
-    } %>
+<% if(magicConfig.allow_testing) { %>
+    <% switch (ctrl.controlType){
+        case MgControlType.CTRL_TYPE_TEXT: %>
+            <% if (ctrl.controlType === MgControlType.CTRL_TYPE_TEXT && ctrl.props.style != null && ctrl.props.style != undefined && ctrl.props.style.multiline_edit) { %>
+                MgControlType="MgMultiLineEdit"
+            <% } else { %>
+                MgControlType="MgEdit"
+            <% } %>
+        <% break;
+        case MgControlType.CTRL_TYPE_LABEL: %>
+            MgControlType="MgLabel"
+        <% break;
+        case MgControlType.CTRL_TYPE_BUTTON: %>
+            <% switch ((ctrl.props.button_style)) {
+                default : %>
+                    MgControlType="MgPushButton"
+                <% break;
+                case CtrlButtonTypeGui.Image : %>
+                    MgControlType="MgImageButton"
+                <% break;
+                case CtrlButtonTypeGui.Hypertext : %>
+                    MgControlType="MgHyperText"
+                <% break;
+            } %>
+        <% break;
+        case MgControlType.CTRL_TYPE_IMAGE: %>
+            MgControlType="MgImage"
+        <% break;
+        case MgControlType.CTRL_TYPE_SUBFORM: %>
+            MgControlType="MgSubform"
+        <% break;
+        case MgControlType.CTRL_TYPE_CHECKBOX: %>
+            MgControlType="MgCheckBox"
+        <% break;
+        case MgControlType.CTRL_TYPE_COMBO: %>
+            MgControlType="MgComboBox"
+        <% break;
+        case MgControlType.CTRL_TYPE_LIST: %>
+            MgControlType="MgListBox"
+        <% break;
+        case MgControlType.CTRL_TYPE_RADIO: %>
+            MgControlType="MgRadio"
+        <% break;
+        case MgControlType.CTRL_TYPE_TABLE: %>
+            MgControlType="MgTable"
+        <% break;
+        case MgControlType.CTRL_TYPE_GROUP: %>
+            MgControlType="MgGroupBox"
+        <% break;
+        case MgControlType.CTRL_TYPE_TAB: %>
+            MgControlType="MgTab"
+        <% break;
+    } %>
 <% } %>

package/templates/attributes/common/base/enabled.ejs

@@ -1,9 +1,9 @@
-<% if (ctrl.props.enabled){ %>
-<% if (ctrl.controlType == MgControlType.CTRL_TYPE_LIST ||
-  (ctrl.controlType == MgControlType.CTRL_TYPE_BUTTON && ctrl.props.button_style != CtrlButtonTypeGui.Hypertext)){ %>
-    [disabled]
-<% } else { %>
-    [attr.disabled]
-<% } %>
-="mg.isDisabled(<%= ctrl.props.enum_id %> <% if(ctrl.props.is_table_child && (ctrl.controlType !== MgControlType.CTRL_TYPE_COLUMN)){ %>, row.rowId<% } %>)"
-<% } %>
+<% if (ctrl.props.enabled){ %>
+<% if (ctrl.controlType == MgControlType.CTRL_TYPE_LIST ||
+  (ctrl.controlType == MgControlType.CTRL_TYPE_BUTTON && ctrl.props.button_style != CtrlButtonTypeGui.Hypertext)){ %>
+    [disabled]
+<% } else { %>
+    [attr.disabled]
+<% } %>
+="mg.isDisabled(<%= ctrl.props.enum_id %> <% if(ctrl.props.is_table_child && (ctrl.controlType !== MgControlType.CTRL_TYPE_COLUMN)){ %>, row.rowId<% } %>)"
+<% } %>

package/templates/attributes/common/base/imageFileName.ejs

@@ -1,3 +1,3 @@
-<% if (ctrl.props.button_style && ctrl.props.button_style == CtrlButtonTypeGui.Image){ %>
-[ngStyle]="{'background-image': mg.getStyle(<%= ctrl.props.enum_id %>, magicProperties.ImageFile)}"
-<%}%>
+<% if (ctrl.props.button_style && ctrl.props.button_style == CtrlButtonTypeGui.Image){ %>
+[ngStyle]="{'background-image': mg.getStyle(<%= ctrl.props.enum_id %>, magicProperties.ImageFile)}"
+<%}%>

package/templates/attributes/common/base/no_control_class.ejs

@@ -1,3 +1,3 @@
-<% if (ctrl.classes) { %>
-class="<%= ctrl.classes %>"
-<% } %>
+<% if (ctrl.classes) { %>
+class="<%= ctrl.classes %>"
+<% } %>

package/templates/attributes/common/base/rtol.ejs

@@ -1,3 +1,3 @@
-<% if (ctrl.props.rtol){ %>
-direction="<%= ctrl.props.rtol ? 'rtl' : 'ltr' %>"
-<% } %>
+<% if (ctrl.props.rtol){ %>
+direction="<%= ctrl.props.rtol ? 'rtl' : 'ltr' %>"
+<% } %>

package/templates/attributes/common/base/tabindex.ejs

@@ -1,11 +1,11 @@
-<% if(ctrl.props.tab_into && !ctrl.props.tab_into.value) { %>
-tabindex="-1"
-<% } else{ %>
-<% if(ctrl.props.tab_into && ctrl.props.tab_into.has_exp || ctrl.props.tab_order && ctrl.props.tab_order.has_exp ){ %>
-[tabindex]="mg.getTabIndex('id')"
-<% } else{ %>
-<% if( ctrl.props.tab_order && ctrl.props.tab_order.value) { %>
-tabindex= "<%= ctrl.props.tab_order.value %>"
-<% } %>
-<% } %>
-<% } %>
+<% if(ctrl.props.tab_into && !ctrl.props.tab_into.value) { %>
+tabindex="-1"
+<% } else{ %>
+<% if(ctrl.props.tab_into && ctrl.props.tab_into.has_exp || ctrl.props.tab_order && ctrl.props.tab_order.has_exp ){ %>
+[tabindex]="mg.getTabIndex('id')"
+<% } else{ %>
+<% if( ctrl.props.tab_order && ctrl.props.tab_order.value) { %>
+tabindex= "<%= ctrl.props.tab_order.value %>"
+<% } %>
+<% } %>
+<% } %>

package/templates/attributes/common/base/testingId.ejs

@@ -1,9 +1,9 @@
-<% if(magicConfig.allow_testing) { %>
-    <% if (ctrl.controlType != MgControlType.CTRL_TYPE_COLUMN && !(ctrl.controlType === MgControlType.CTRL_TYPE_CHECKBOX && theme === "basicHTML")){ %>
-        <% if (ctrl.props.is_table_child){ %>
-            id="<%-ctrl.props.id%>_{{row.rowId}}"
-        <% } else { %>
-            id="<%-ctrl.props.id%>"
-        <%}%>
-    <%}%>
+<% if(magicConfig.allow_testing) { %>
+    <% if (ctrl.controlType != MgControlType.CTRL_TYPE_COLUMN && !(ctrl.controlType === MgControlType.CTRL_TYPE_CHECKBOX && theme === "basicHTML")){ %>
+        <% if (ctrl.props.is_table_child){ %>
+            id="<%-ctrl.props.id%>_{{row.rowId}}"
+        <% } else { %>
+            id="<%-ctrl.props.id%>"
+        <%}%>
+    <%}%>
 <%}%>

package/templates/attributes/common/base/tooltip.ejs

@@ -1,7 +1,7 @@
-<% if(ctrl.props.tooltip && ctrl.props.tooltip.has_exp){ %>
-    <% if(ctrl.controlType === MgControlType.CTRL_TYPE_TABLE && !(ctrl.web_style && ctrl.web_style === TableWebStyle.RepeatableItems) || (ctrl.controlType !== MgControlType.CTRL_TYPE_TABLE && theme === "material")){ %>
-        [matTooltip]="mg.getTitle(<%= ctrl.props.enum_id %><% if(ctrl.props.is_table_child && (ctrl.controlType !== MgControlType.CTRL_TYPE_COLUMN)){ %>, row.rowId<% } %>)"
-    <% } else { %>
-        [title]="mg.getTitle(<%= ctrl.props.enum_id %><% if(ctrl.props.is_table_child && (ctrl.controlType !== MgControlType.CTRL_TYPE_COLUMN)){ %>, row.rowId<% } %>)"
-    <% } %>
-<% } %>
+<% if(ctrl.props.tooltip && ctrl.props.tooltip.has_exp){ %>
+    <% if(ctrl.controlType === MgControlType.CTRL_TYPE_TABLE && !(ctrl.web_style && ctrl.web_style === TableWebStyle.RepeatableItems) || (ctrl.controlType !== MgControlType.CTRL_TYPE_TABLE && theme === "material")){ %>
+        [matTooltip]="mg.getTitle(<%= ctrl.props.enum_id %><% if(ctrl.props.is_table_child && (ctrl.controlType !== MgControlType.CTRL_TYPE_COLUMN)){ %>, row.rowId<% } %>)"
+    <% } else { %>
+        [title]="mg.getTitle(<%= ctrl.props.enum_id %><% if(ctrl.props.is_table_child && (ctrl.controlType !== MgControlType.CTRL_TYPE_COLUMN)){ %>, row.rowId<% } %>)"
+    <% } %>
+<% } %>

package/templates/attributes/common/base/visible.ejs

@@ -1,6 +1,6 @@
-<% if (ctrl.props.visible && ctrl.props.visible.has_exp){ %>
-[style.visibility]="mg.getVisible(<%= ctrl.props.enum_id %><% if(ctrl.props.is_table_child && (ctrl.controlType !== MgControlType.CTRL_TYPE_COLUMN)){ %>, row.rowId<%}%>)"
-
-
-<%}%>
-
+<% if (ctrl.props.visible && ctrl.props.visible.has_exp){ %>
+[style.visibility]="mg.getVisible(<%= ctrl.props.enum_id %><% if(ctrl.props.is_table_child && (ctrl.controlType !== MgControlType.CTRL_TYPE_COLUMN)){ %>, row.rowId<%}%>)"
+
+
+<%}%>
+

package/templates/attributes/common/base/wallpaper.ejs

@@ -1,3 +1,3 @@
-<% if (ctrl.props.wallpaper ){ %>
-[ngStyle]="{'background-image': mg.getStyle(<%- ctrl.props.enum_id %>, magicProperties.Wallpaper)}"
-<%}%>
+<% if (ctrl.props.wallpaper ){ %>
+[ngStyle]="{'background-image': mg.getStyle(<%- ctrl.props.enum_id %>, magicProperties.Wallpaper)}"
+<%}%>

package/templates/attributes/common/base_attributes.ejs

@@ -1,10 +1,10 @@
-<%- include('./base/id',            {ctrl : ctrl})%>
-<%- include('./base/rtol',          {ctrl : ctrl})%>
-<%- include('./base/visible',       {ctrl : ctrl})%>
-<%- include('./base/tooltip',       {ctrl : ctrl})%>
-<%- include('./base/tabindex',      {ctrl : ctrl})%>
-<%- include('./base/class',         {ctrl : ctrl})%>
-<%- include('./base/wallpaper',     {ctrl : ctrl})%>
-<%- include('./base/imageFileName', {ctrl : ctrl})%>
-<%- include('./base/testingId',     {ctrl : ctrl})%>
-<%- include('./base/control_type',  {ctrl : ctrl})%>
+<%- include('./base/id',            {ctrl : ctrl})%>
+<%- include('./base/rtol',          {ctrl : ctrl})%>
+<%- include('./base/visible',       {ctrl : ctrl})%>
+<%- include('./base/tooltip',       {ctrl : ctrl})%>
+<%- include('./base/tabindex',      {ctrl : ctrl})%>
+<%- include('./base/class',         {ctrl : ctrl})%>
+<%- include('./base/wallpaper',     {ctrl : ctrl})%>
+<%- include('./base/imageFileName', {ctrl : ctrl})%>
+<%- include('./base/testingId',     {ctrl : ctrl})%>
+<%- include('./base/control_type',  {ctrl : ctrl})%>

package/templates/attributes/common/container_attributes.ejs

@@ -1,7 +1,7 @@
-<%- include('./base/rtol', {ctrl : ctrl})%>
-<%- include('./base/visible', {ctrl : ctrl})%>
-<%- include('./base/tooltip', {ctrl : ctrl})%>
-<%- include('./base/tabindex', {ctrl : ctrl})%>
-<%- include('./base/class', {ctrl : ctrl})%>
-<%- include('./base/wallpaper', {ctrl : ctrl})%>
+<%- include('./base/rtol', {ctrl : ctrl})%>
+<%- include('./base/visible', {ctrl : ctrl})%>
+<%- include('./base/tooltip', {ctrl : ctrl})%>
+<%- include('./base/tabindex', {ctrl : ctrl})%>
+<%- include('./base/class', {ctrl : ctrl})%>
+<%- include('./base/wallpaper', {ctrl : ctrl})%>
 <%- include('./base/imageFileName', {ctrl : ctrl})%>

package/templates/attributes/common/control_attributes.ejs

@@ -1,3 +1,3 @@
-<%- include('./base/id', {ctrl : ctrl})%>
-<%- include('./base/testingId', {ctrl : ctrl}) %>
-<%- include('./base/control_type', {ctrl : ctrl}) %>
+<%- include('./base/id', {ctrl : ctrl})%>
+<%- include('./base/testingId', {ctrl : ctrl}) %>
+<%- include('./base/control_type', {ctrl : ctrl}) %>

package/templates/attributes/common/format.ejs

@@ -1,5 +1,5 @@
-<%if(ctrl.props.format && !ctrl.props.format.has_exp) { %>
-    <%=ctrl.props.format%>
-<% } else {%>
-    {{mg.getValue(<%- ctrl.props.enum_id %><% if(ctrl.props.is_table_child){ %>, row.rowId<%}%>)}}
-<% } %>
+<%if(ctrl.props.format && !ctrl.props.format.has_exp) { %>
+    <%=ctrl.props.format%>
+<% } else {%>
+    {{mg.getValue(<%- ctrl.props.enum_id %><% if(ctrl.props.is_table_child){ %>, row.rowId<%}%>)}}
+<% } %>

package/templates/attributes/common/input/hint.ejs

@@ -1,13 +1,13 @@
-<% if(ctrl.hint){ %>
-<% if (ctrl.hint.text){ %>
-
-<% if (!ctrl.hint.text.has_exp){ %>
-placeholder="<%= ctrl.hint.text.value %>"
-<% } %>
-
-<% if (ctrl.hint.text.has_exp){ %>
-[placeholder]="mg.getPlaceholder(<%= ctrl.props.enum_id %><% if(ctrl.props.is_table_child){ %>, row.rowId<%}%>)"
-<% } %>
-
-<% } %>
-<% } %>
+<% if(ctrl.hint){ %>
+<% if (ctrl.hint.text){ %>
+
+<% if (!ctrl.hint.text.has_exp){ %>
+placeholder="<%= ctrl.hint.text.value %>"
+<% } %>
+
+<% if (ctrl.hint.text.has_exp){ %>
+[placeholder]="mg.getPlaceholder(<%= ctrl.props.enum_id %><% if(ctrl.props.is_table_child){ %>, row.rowId<%}%>)"
+<% } %>
+
+<% } %>
+<% } %>