Comparing version 0.5.4 to 0.5.5
@@ -55,3 +55,3 @@ /** | ||
var action = this.http.action; | ||
var oldAction = action; | ||
var act = action; | ||
//添加action后缀 | ||
@@ -81,3 +81,3 @@ action += C('action_suffix') || ""; | ||
return initReturnPromise.then(function(){ | ||
return self.execAction(controller, action, oldAction, data); | ||
return self.execAction(controller, action, act, data); | ||
}); | ||
@@ -87,3 +87,3 @@ } | ||
return initReturnPromise.then(function(){ | ||
return self.execAction(controller, action, oldAction); | ||
return self.execAction(controller, action, act); | ||
}); | ||
@@ -96,3 +96,3 @@ }else{ | ||
return initReturnPromise.then(function(){ | ||
return controller[callMethod](action); | ||
return controller[callMethod](act, action); | ||
}); | ||
@@ -109,7 +109,7 @@ } | ||
* @param {[type]} action [description] | ||
* @param {[type]} oldAction [description] | ||
* @param {[type]} act [description] | ||
* @param {[type]} data [description] | ||
* @return {[type]} [description] | ||
*/ | ||
execAction: function(controller, action, oldAction, data){ | ||
execAction: function(controller, action, act, data){ | ||
var promise = getPromise(); | ||
@@ -119,3 +119,3 @@ //before action | ||
if (before && typeof controller[before] === 'function') { | ||
promise = getPromise(controller[before](oldAction, action)); | ||
promise = getPromise(controller[before](act, action)); | ||
} | ||
@@ -129,3 +129,3 @@ return promise.then(function(){ | ||
if (after && typeof controller[after] === 'function') { | ||
return controller[after](oldAction, action); | ||
return controller[after](act, action); | ||
} | ||
@@ -132,0 +132,0 @@ }); |
{ | ||
"name": "thinkjs", | ||
"description": "thinkphp web framework for nodejs", | ||
"version": "0.5.4", | ||
"version": "0.5.5", | ||
"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
231205