mastercontroller 1.1.17 → 1.1.18
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/MasterHtml.js +42 -35
- package/package.json +1 -1
package/MasterHtml.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
|
|
2
|
-
// version 1.0.
|
|
2
|
+
// version 1.0.17
|
|
3
3
|
|
|
4
4
|
var master = require('./MasterControl');
|
|
5
5
|
var temp = require('./MasterTemplate');
|
|
@@ -37,24 +37,24 @@ class html {
|
|
|
37
37
|
// render all your link tags styles given the folder location
|
|
38
38
|
renderStyles(folderName, typeArray){
|
|
39
39
|
var styles = [];
|
|
40
|
-
var styleFolder =
|
|
41
|
-
var
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
40
|
+
var styleFolder = `/app/assets/stylesheets/`;
|
|
41
|
+
var rootLocation = master.router.currentRoute.root;
|
|
42
|
+
if(master.router.currentRoute.isComponent === true){
|
|
43
|
+
rootLocation = tools.getBackSlashBySection(master.router.currentRoute.root, 2, "/");
|
|
44
|
+
styleFolder = `${rootLocation}${styleFolder}`;
|
|
45
45
|
}
|
|
46
46
|
var type = typeArray === undefined ? ["css"] : typeArray;
|
|
47
47
|
|
|
48
48
|
if(folderName){
|
|
49
|
-
styleFolder = styleFolder
|
|
50
|
-
styleLocation = styleLocation + folderName+ "/";
|
|
49
|
+
styleFolder = `${styleFolder}${folderName}/`;
|
|
51
50
|
}
|
|
52
51
|
if (fs.existsSync(styleFolder)) {
|
|
53
|
-
|
|
52
|
+
fs.readdirSync(styleFolder).forEach(function(file){
|
|
54
53
|
|
|
55
54
|
var fileExtension = file.replace(/^.*\./, '');
|
|
56
55
|
if(type.indexOf(fileExtension) >= 0){
|
|
57
|
-
|
|
56
|
+
var fileLocatoon = `${styleFolder}${file}`
|
|
57
|
+
styles.push(`<link rel="stylesheet" type="text/${type}" href="/${fileLocatoon}">`);
|
|
58
58
|
}
|
|
59
59
|
});
|
|
60
60
|
}
|
|
@@ -74,24 +74,25 @@ class html {
|
|
|
74
74
|
renderScripts(folderName, typeArray){
|
|
75
75
|
|
|
76
76
|
var scripts = [];
|
|
77
|
-
var jsFolder
|
|
78
|
-
var
|
|
79
|
-
if(master.router.currentRoute.isComponent ===
|
|
80
|
-
|
|
77
|
+
var jsFolder =`/app/assets/javascripts/`;
|
|
78
|
+
var rootLocation = master.router.currentRoute.root;
|
|
79
|
+
if(master.router.currentRoute.isComponent === true){
|
|
80
|
+
rootLocation = tools.getBackSlashBySection(master.router.currentRoute.root, 2, "/");
|
|
81
|
+
jsFolder = `${rootLocation}${jsFolder}`;
|
|
81
82
|
}
|
|
82
83
|
|
|
83
84
|
var type = typeArray === undefined ? ["js"] : typeArray;
|
|
84
85
|
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
jsLocation = jsLocation + folderName + "/";
|
|
86
|
+
if(folderName){
|
|
87
|
+
jsFolder = `${jsFolder}${folderName}/`;
|
|
88
88
|
}
|
|
89
89
|
|
|
90
90
|
if (fs.existsSync(jsFolder)) {
|
|
91
91
|
fs.readdirSync(jsFolder).forEach(function(file){
|
|
92
92
|
var fileExtension = file.replace(/^.*\./, '');
|
|
93
93
|
if(type.indexOf(fileExtension) >= 0){
|
|
94
|
-
|
|
94
|
+
var fileLocatoon = `${jsFolder}${file}`
|
|
95
|
+
scripts.push(`<script src="/${fileLocatoon}"></script>`);
|
|
95
96
|
}
|
|
96
97
|
});
|
|
97
98
|
}
|
|
@@ -109,35 +110,41 @@ class html {
|
|
|
109
110
|
}
|
|
110
111
|
|
|
111
112
|
// renders js using location
|
|
112
|
-
renderJS(
|
|
113
|
-
if(name ===
|
|
114
|
-
return
|
|
113
|
+
renderJS(folderName, name){
|
|
114
|
+
if(folderName === undefined && name === undefined){
|
|
115
|
+
return "";
|
|
115
116
|
}
|
|
116
117
|
else{
|
|
117
|
-
var
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
118
|
+
var rootLocation = master.router.currentRoute.root;
|
|
119
|
+
var jsFolder = `/app/assets/javascripts/`;
|
|
120
|
+
if(master.router.currentRoute.isComponent === true){
|
|
121
|
+
rootLocation = tools.getBackSlashBySection(master.router.currentRoute.root, 2, "/");
|
|
122
|
+
jsFolder = `${rootLocation}${jsFolder}`;
|
|
122
123
|
}
|
|
123
|
-
|
|
124
|
+
if(folderName){
|
|
125
|
+
jsFolder = `${jsFolder}${folderName}/${name}`;
|
|
126
|
+
}
|
|
127
|
+
return `<script type="text/javascript" src="/${jsFolder}"></script>`;
|
|
124
128
|
}
|
|
125
129
|
}
|
|
126
130
|
|
|
127
131
|
// render css directly on the page suing location name
|
|
128
|
-
renderCss(
|
|
129
|
-
if(name ===
|
|
132
|
+
renderCss(folderName, name){
|
|
133
|
+
if(folderName === undefined && name === undefined){
|
|
130
134
|
return "";
|
|
131
135
|
}
|
|
132
136
|
else{
|
|
133
|
-
var
|
|
137
|
+
var styleFolder = `/app/assets/stylesheets/`;
|
|
138
|
+
var rootLocation = master.router.currentRoute.root;
|
|
139
|
+
if(master.router.currentRoute.isComponent === true){
|
|
140
|
+
rootLocation = tools.getBackSlashBySection(master.router.currentRoute.root, 2, "/");
|
|
141
|
+
styleFolder = `${rootLocation}${styleFolder}`;
|
|
142
|
+
}
|
|
134
143
|
|
|
135
|
-
if(
|
|
136
|
-
|
|
137
|
-
}else{
|
|
138
|
-
styleLocation = styleLocation + name;
|
|
144
|
+
if(folderName){
|
|
145
|
+
styleFolder = `${styleFolder}${folderName}/${name}`;
|
|
139
146
|
}
|
|
140
|
-
return `<link rel="stylesheet" type="text/css" href="/${
|
|
147
|
+
return `<link rel="stylesheet" type="text/css" href="/${styleFolder}">`;
|
|
141
148
|
}
|
|
142
149
|
}
|
|
143
150
|
|
package/package.json
CHANGED