updated 同性关系判断的优化!男性的爱人一定是妻子
This commit is contained in:
parent
d7313598c1
commit
ed9d9d1e1e
4
dist/relationship.js
vendored
4
dist/relationship.js
vendored
@ -822,6 +822,7 @@
|
|||||||
function selector2id(selector,sex){
|
function selector2id(selector,sex){
|
||||||
var result = [];
|
var result = [];
|
||||||
var hash = {};
|
var hash = {};
|
||||||
|
var sex2 = -1;
|
||||||
if(sex<0){ //如果自己的性别不确定
|
if(sex<0){ //如果自己的性别不确定
|
||||||
if(selector.indexOf(',w')==0){
|
if(selector.indexOf(',w')==0){
|
||||||
sex = 1;
|
sex = 1;
|
||||||
@ -832,6 +833,9 @@
|
|||||||
if(sex>-1){
|
if(sex>-1){
|
||||||
selector = ','+sex+selector;
|
selector = ','+sex+selector;
|
||||||
}
|
}
|
||||||
|
if(selector.match(/,[w0],w|,[h1],h/)){ //同志关系去除
|
||||||
|
return false;
|
||||||
|
}
|
||||||
var getId = function(selector){
|
var getId = function(selector){
|
||||||
var s='';
|
var s='';
|
||||||
if(!hash[selector]){
|
if(!hash[selector]){
|
||||||
|
2
dist/relationship.min.js
vendored
2
dist/relationship.min.js
vendored
File diff suppressed because one or more lines are too long
@ -77,7 +77,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<script src="script/common.js"></script>
|
<script src="script/common.js"></script>
|
||||||
<script src="dist/relationship.min.js"></script>
|
<script src="script/relationship.js"></script>
|
||||||
<script>
|
<script>
|
||||||
(function(){
|
(function(){
|
||||||
var $type = document.getElementsByName('type');
|
var $type = document.getElementsByName('type');
|
||||||
|
@ -822,6 +822,7 @@
|
|||||||
function selector2id(selector,sex){
|
function selector2id(selector,sex){
|
||||||
var result = [];
|
var result = [];
|
||||||
var hash = {};
|
var hash = {};
|
||||||
|
var sex2 = -1;
|
||||||
if(sex<0){ //如果自己的性别不确定
|
if(sex<0){ //如果自己的性别不确定
|
||||||
if(selector.indexOf(',w')==0){
|
if(selector.indexOf(',w')==0){
|
||||||
sex = 1;
|
sex = 1;
|
||||||
@ -832,6 +833,9 @@
|
|||||||
if(sex>-1){
|
if(sex>-1){
|
||||||
selector = ','+sex+selector;
|
selector = ','+sex+selector;
|
||||||
}
|
}
|
||||||
|
if(selector.match(/,[w0],w|,[h1],h/)){ //同志关系去除
|
||||||
|
return false;
|
||||||
|
}
|
||||||
var getId = function(selector){
|
var getId = function(selector){
|
||||||
var s='';
|
var s='';
|
||||||
if(!hash[selector]){
|
if(!hash[selector]){
|
||||||
|
@ -5,6 +5,9 @@ var relationship = require('..');
|
|||||||
test('relationship.js show to be tested', function (t) {
|
test('relationship.js show to be tested', function (t) {
|
||||||
// TODO
|
// TODO
|
||||||
t.deepEqual(relationship({text:'儿子的爸爸的妈妈',sex:1}),['妈妈']);
|
t.deepEqual(relationship({text:'儿子的爸爸的妈妈',sex:1}),['妈妈']);
|
||||||
|
t.deepEqual(relationship({text:'爱人',sex:1}),['老婆']);
|
||||||
|
t.deepEqual(relationship({text:'爱人的爱人',sex:1}),['自己']);
|
||||||
|
t.deepEqual(relationship({text:'老婆的爱人',sex:1}),['自己']);
|
||||||
t.deepEqual(relationship({text:'老婆的老公',sex:1}),['自己']);
|
t.deepEqual(relationship({text:'老婆的老公',sex:1}),['自己']);
|
||||||
t.deepEqual(relationship({text:'老婆的外孙的姥爷',sex:1}),['自己']);
|
t.deepEqual(relationship({text:'老婆的外孙的姥爷',sex:1}),['自己']);
|
||||||
t.deepEqual(relationship({text:'表姐的哥哥',sex:1}),['姑表哥','舅表哥','姨表哥']);
|
t.deepEqual(relationship({text:'表姐的哥哥',sex:1}),['姑表哥','舅表哥','姨表哥']);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user