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