* Replaced occurrences of User.visisted with User.modified
* Set application's charset to UTF8 * Added Layout.getFile() method returning the layout's directory as helma.File * Simplified Layout.getSkinPath() method (still work in progress) * Replaced occurrences of Site.language with Site.locale * Modified some wording * Added slight b/w compatibility fix in Story.macro_filter() method * Added timex factor in Story.getDelta() method to prevent counting edits as site updates in-beteen 10 minutes * Moved site-related aspect hooks to Site prototype of compatibility module * Removed obsolete conversion code in compatibility module (has moved to updater app) * Re-included spacer_macro() method in compat. module * Temporarily overwrote HopObject.renderSkin() method to debug skin rendering process * Replaced individual legacy macros of Layout prototype by appropriate code in onUnhandledMacro() method (compat.) * Reflect legacy macros of Layout prototype in value() method of compat. module * Added and improved compatibility methods * Implemented support for renamed prototypes in updater app (still needs to be applied for database, too)
This commit is contained in:
parent
1df1c87525
commit
aa11e5db88
23 changed files with 578 additions and 650 deletions
|
@ -440,7 +440,7 @@ Story.prototype.format_filter = function(value, param, mode) {
|
|||
};
|
||||
|
||||
Story.prototype.macro_filter = function(value, param) {
|
||||
var skin = createSkin(format(value));
|
||||
var skin = value.constructor === String ? createSkin(format(value)) : value;
|
||||
skin.allowMacro("image");
|
||||
skin.allowMacro("this.image");
|
||||
skin.allowMacro("site.image");
|
||||
|
@ -509,5 +509,7 @@ Story.prototype.getDelta = function(data) {
|
|||
delta += deltify(data.key, this.metadata.get(key))
|
||||
}
|
||||
}
|
||||
return delta;
|
||||
// In-between updates (10 min) get zero delta
|
||||
var timex = (new Date - this.modified) > Date.ONEMINUTE * 10 ? 1 : 0;
|
||||
return delta * timex;
|
||||
};
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue