Skip to content

Commit fba8b36

Browse files
petersirkapetersirka
committed
new features
1 parent 6b38a57 commit fba8b36

14 files changed

Lines changed: 376 additions & 79 deletions

File tree

‎builders.js‎

Lines changed: 142 additions & 21 deletions
Large diffs are not rendered by default.

‎changes.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ BETA ======= 1.9.0
5151
- added: F.restful(url, flags, onQuery, onGet, onSave, onDelete) -> creates routing
5252
- added: F.onSchema(req, group, name, callback(err, body)) -> for custom schemas
5353
- added: @{insert(filename1, filename2, filenameN)}
54+
- added: SchemaBuilderEntity.setError(function(error, model, type, name));
5455

5556
- updated: (IMPORTANT) routing: `json` flag is not required for receiving incomming data as JSON
5657
- updated: `F.mail(address, subject, view, [model], [callback], [language])` added language

‎helpers/debug-raw.js‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ function app() {
6262
var pidInterval = null;
6363
var prefix = '------------> ';
6464
var isLoaded = false;
65+
var isSkip = false;
6566

6667
function onFilter(path, isDirectory) {
6768
return isDirectory ? true : path.indexOf('.js') !== -1 || path.indexOf('.resource') !== -1;
@@ -163,6 +164,7 @@ function app() {
163164
if (app !== null) {
164165
try
165166
{
167+
isSkip = true;
166168
process.kill(app.pid);
167169
} catch (err) {}
168170
app = null;
@@ -183,17 +185,21 @@ function app() {
183185

184186
app.on('message', function(msg) {
185187

186-
if (msg.substring(0, 5) === 'name:') {
187-
process.title = 'debug: ' + msg.substring(6);
188-
return;
189-
}
190-
191188
if (msg === 'eaddrinuse')
192189
process.exit(1);
193190

194191
});
195192

196193
app.on('exit', function() {
194+
195+
// checks unexpected exit
196+
if (isSkip === false) {
197+
app = null;
198+
process.exit();
199+
return;
200+
}
201+
202+
isSkip = false;
197203
if (status !== 255)
198204
return;
199205
app = null;
@@ -223,6 +229,7 @@ function app() {
223229
return;
224230
}
225231

232+
isSkip = true;
226233
process.kill(app.pid);
227234
app = null;
228235
process.exit(0);
@@ -243,8 +250,10 @@ function app() {
243250

244251
fs.unlink(pid, noop);
245252

246-
if (app !== null)
253+
if (app !== null) {
254+
isSkip = true;
247255
process.kill(app.pid);
256+
}
248257

249258
process.exit(0);
250259
});

‎helpers/debug.js‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎index.js‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ function Framework() {
198198

199199
this.id = null;
200200
this.version = 1900;
201-
this.version_header = '1.9.0-7';
201+
this.version_header = '1.9.0-8';
202202

203203
var version = process.version.toString().replace('v', '').replace(/\./g, '');
204204
if (version[1] === '0')
@@ -6807,6 +6807,7 @@ Framework.prototype._configure = function(arr, rewrite) {
68076807
* @return {String}
68086808
*/
68096809
Framework.prototype.routeJS = function(name) {
6810+
console.log('OBSOLETE framework.routeJS(): use framework.routeScript()');
68106811
return this.routeScript(name);
68116812
};
68126813

@@ -6831,6 +6832,7 @@ Framework.prototype.routeScript = function(name) {
68316832
* @return {String}
68326833
*/
68336834
Framework.prototype.routeCSS = function(name) {
6835+
console.log('OBSOLETE framework.routeCSS(): use framework.routeStyle()');
68346836
return this.routeStyle(name);
68356837
};
68366838

@@ -10171,9 +10173,9 @@ Controller.prototype.head = function() {
1017110173
var isRoute = (tmp[0] !== '/' && tmp[1] !== '/') && tmp !== 'http://' && tmp !== 'https:/';
1017210174

1017310175
if (val.endsWith('.css', true))
10174-
output += '<link type="text/css" rel="stylesheet" href="' + (isRoute ? self.routeCSS(val) : val) + '" />';
10176+
output += '<link type="text/css" rel="stylesheet" href="' + (isRoute ? self.routeStyle(val) : val) + '" />';
1017510177
else if (val.endsWith(EXTENSION_JS, true) !== -1)
10176-
output += '<script type="text/javascript" src="' + (isRoute ? self.routeJS(val) : val) + '"></script>';
10178+
output += '<script type="text/javascript" src="' + (isRoute ? self.routeScript(val) : val) + '"></script>';
1017710179
}
1017810180

1017910181
header += output;
@@ -10372,7 +10374,7 @@ Controller.prototype.$js = function() {
1037210374
var builder = '';
1037310375

1037410376
for (var i = 0; i < arguments.length; i++)
10375-
builder += self.routeJS(arguments[i], true);
10377+
builder += self.routeScript(arguments[i], true);
1037610378

1037710379
return builder;
1037810380
};
@@ -10396,6 +10398,12 @@ Controller.prototype.$import = function() {
1039610398
case '.ico':
1039710399
builder += self.$favicon(filename);
1039810400
break;
10401+
case '.jpg':
10402+
case '.gif':
10403+
case '.png':
10404+
case '.jpeg':
10405+
builder += self.routeImage(filename, true);
10406+
break;
1039910407
}
1040010408
}
1040110409

@@ -10413,7 +10421,7 @@ Controller.prototype.$css = function() {
1041310421
var builder = '';
1041410422

1041510423
for (var i = 0; i < arguments.length; i++)
10416-
builder += self.routeCSS(arguments[i], true);
10424+
builder += self.routeStyle(arguments[i], true);
1041710425

1041810426
return builder;
1041910427
};
@@ -10557,6 +10565,7 @@ Controller.prototype._routeHelper = function(current, name, fn) {
1055710565
* @return {String}
1055810566
*/
1055910567
Controller.prototype.routeJS = function(name, tag) {
10568+
console.log('OBSOLETE controller.routeJS(): use controller.routeScript()');
1056010569
return this.routeScript(name, tag);
1056110570
};
1056210571

@@ -10581,6 +10590,7 @@ Controller.prototype.routeScript = function(name, tag) {
1058110590
* @return {String}
1058210591
*/
1058310592
Controller.prototype.routeCSS = function(name, tag) {
10593+
console.log('OBSOLETE controller.routeCSS(): use controller.routeStyle()');
1058410594
return this.routeStyle(name, tag);
1058510595
};
1058610596

@@ -10596,7 +10606,7 @@ Controller.prototype.routeStyle = function(name, tag) {
1059610606
if (name === undefined)
1059710607
name = 'default.css';
1059810608

10599-
var url = self._routeHelper(self._currentStyle, name, framework.routeCSS);
10609+
var url = self._routeHelper(self._currentStyle, name, framework.routeStyle);
1060010610
return tag ? '<link type="text/css" rel="stylesheet" href="' + url + '" />' : url;
1060110611
};
1060210612

‎minify/merged/total.js‎

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)