Comparing version 0.1.11 to 0.1.12
@@ -99,4 +99,4 @@ var fs = require("fs"); | ||
global.tag = function(name, http, data){ | ||
var sys_tags = C('sys_tags.' + name); | ||
var tags = C('tags.' + name); | ||
var sys_tags = C('sys_tag.' + name); | ||
var tags = C('tag.' + name); | ||
//tag处理的数据 | ||
@@ -103,0 +103,0 @@ http.tag_data = data; |
@@ -13,2 +13,3 @@ /** | ||
"Dispatcher": THINK_LIB_PATH + "/Core/Dispatcher.class.js", | ||
"Filter": THINK_LIB_PATH + "/Core/Filter.class.js", | ||
"Http": THINK_LIB_PATH + "/Core/Http.class.js", | ||
@@ -15,0 +16,0 @@ "Log": THINK_LIB_PATH + "/Core/Log.class.js", |
@@ -11,6 +11,6 @@ /** | ||
action_name_black_list: ["super", "init", /^\_[^\_]+/], //不能通过URL访问的action名单 | ||
app_tags_on: true, //是否支持标签功能 | ||
app_tag_on: true, //是否支持标签功能 | ||
url_route_on: true, //开启自定义路由功能 | ||
url_html_suffix: ".html", //url后缀,这样可以做到伪静态,对搜索引擎更友好 | ||
app_group_list: ["Home"], //分组列表 | ||
app_group_list: ["Home", "Admin"], //分组列表 | ||
app_group_deny: [], //禁用分组列表 | ||
@@ -17,0 +17,0 @@ default_group: 'Home', //默认分组 |
@@ -16,2 +16,3 @@ /** | ||
this.view = null; | ||
tag('action_begin', this.http); | ||
//将http数据打到模版里 | ||
@@ -21,3 +22,2 @@ this.assign("http", this.http); | ||
this.assign("config", C()); | ||
tag('action_start', this.http); | ||
}, | ||
@@ -299,2 +299,12 @@ /** | ||
/** | ||
* 对数据进行过滤 | ||
* @param {[type]} data [description] | ||
* @param {[type]} type [description] | ||
* @return {[type]} [description] | ||
*/ | ||
filter: function(data, type){ | ||
var filter = think_require("Filter").filter; | ||
return filter.apply(null, arguments); | ||
}, | ||
/** | ||
* 校验一个值是否合法 | ||
@@ -301,0 +311,0 @@ * @param {[type]} data [description] |
@@ -59,9 +59,9 @@ /** | ||
//加载行为配置 | ||
if (C('app_tags_on')) { | ||
if (C('app_tag_on')) { | ||
//加载系统行为配置 | ||
C('sys_tags', require(THINK_PATH + "/Conf/tag.js")); | ||
C('sys_tag', require(THINK_PATH + "/Conf/tag.js")); | ||
//加载用户的行为配置 | ||
var tagFile = COMMON_PATH + "/tag.js"; | ||
var tagFile = CONF_PATH + "/tag.js"; | ||
if (is_file(tagFile)) { | ||
C('tags', require(tagFile)); | ||
C('tag', require(tagFile)); | ||
}; | ||
@@ -68,0 +68,0 @@ }; |
{ | ||
"name": "thinkjs", | ||
"description": "thinkphp web framework for nodejs", | ||
"version": "0.1.11", | ||
"version": "0.1.12", | ||
"author": { | ||
@@ -6,0 +6,0 @@ "name": "welefen", |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
164841
55
4922