Skip to content

Commit c6f2b77

Browse files
committed
Update F.memorize() about themeName.
1 parent 8ce4777 commit c6f2b77

3 files changed

Lines changed: 6 additions & 3 deletions

File tree

changes.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
- updated: Mail error handling (added Message instance)
4343
- updated: `U.request()` add a new flag `noredirect`
4444
- updated: `F.exists(req, res, [max], callback(next, filename, req, res))` added a new arguments into the callback `req` and `res`
45+
- updated: `F.memorize()` uses `themeName` as a part of the cache key
4546

4647
- fixed: config `static-accepts` (it didn't work)
4748
- fixed: routing with `upload` flag

index.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -489,7 +489,7 @@ function Framework() {
489489

490490
this.id = null;
491491
this.version = 2500;
492-
this.version_header = '2.5.0-15';
492+
this.version_header = '2.5.0-16';
493493
this.version_node = process.version.toString().replace('v', '').replace(/\./g, '').parseFloat();
494494

495495
this.config = {
@@ -12400,7 +12400,9 @@ Controller.prototype.memorize = function(key, expires, disabled, fnTo, fnFrom) {
1240012400
return self;
1240112401
}
1240212402

12403-
var output = self.cache.read2(key);
12403+
self.themeName && (key += '#' + self.themeName);
12404+
12405+
var output = self.cache.read2();
1240412406
if (!output)
1240512407
return self.$memorize_prepare(key, expires, disabled, fnTo, fnFrom);
1240612408

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
"name": "Peter Štolc",
7676
"email": "stolcp@gmail.com"
7777
}],
78-
"version": "2.5.0-15",
78+
"version": "2.5.0-16",
7979
"homepage": "http://www.totaljs.com",
8080
"bugs": {
8181
"url": "https://github.com/totaljs/framework/issues",

0 commit comments

Comments
 (0)