Comparing version 0.1.12 to 0.1.13
@@ -99,7 +99,7 @@ var fs = require("fs"); | ||
global.tag = function(name, http, data){ | ||
var sys_tags = C('sys_tag.' + name); | ||
var tags = C('tag.' + name); | ||
var sys_tags = C('sys_tag.' + name) || []; | ||
var tags = C('tag.' + name) || []; | ||
//tag处理的数据 | ||
http.tag_data = data; | ||
if (tags) { | ||
if (tags.length) { | ||
var override = false; | ||
@@ -110,4 +110,4 @@ if (typeof tags[0] == 'boolean') { | ||
}; | ||
if (!override && sys_tags) { | ||
tags = tags.push.apply(tags, sys_tags); | ||
if (!override && sys_tags.length) { | ||
tags = sys_tags.concat(tags); | ||
}; | ||
@@ -117,3 +117,3 @@ }else{ | ||
} | ||
if (tags) { | ||
if (tags.length) { | ||
if (APP_DEBUG) { | ||
@@ -120,0 +120,0 @@ G(name + '_start'); |
@@ -10,2 +10,3 @@ /** | ||
route_check: ['CheckRoute'], | ||
url_dispatch: [], | ||
app_end: [], | ||
@@ -12,0 +13,0 @@ path_info: [], |
@@ -28,3 +28,3 @@ /** | ||
}catch(e){ | ||
//console.log(e); | ||
console.log(e); | ||
} | ||
@@ -31,0 +31,0 @@ } |
@@ -50,2 +50,5 @@ /** | ||
ids: function(value){ | ||
if (is_number(value)) { | ||
return this.id(value); | ||
}; | ||
if (is_string(value)) { | ||
@@ -88,2 +91,3 @@ value = value.split(","); | ||
var args = [].slice.call(arguments, 2); | ||
args.unshift(value); | ||
return Filter[type].apply(Filter, args); | ||
@@ -90,0 +94,0 @@ }; |
{ | ||
"name": "thinkjs", | ||
"description": "thinkphp web framework for nodejs", | ||
"version": "0.1.12", | ||
"version": "0.1.13", | ||
"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
164964
4927