Commit 5f85a72f authored by Anna.Pavlova's avatar Anna.Pavlova Committed by Alexander.Trofimov

поправила баги со скобками, в тч в случае когда одна скобка рисуется

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@52862 954022d7-b5bf-4e40-9824-e11837661b57
parent f21e542d
...@@ -55,7 +55,7 @@ var BOX_ALIGN = 2; ...@@ -55,7 +55,7 @@ var BOX_ALIGN = 2;
var BOX_BREAK = 3; var BOX_BREAK = 3;
var BOX_NOBREAK = 4; var BOX_NOBREAK = 4;
var BRACKET_EMPTY = -1; var OPERATOR_EMPTY = -1;
var PARENTHESIS_LEFT = 0; var PARENTHESIS_LEFT = 0;
var PARENTHESIS_RIGHT = 1; var PARENTHESIS_RIGHT = 1;
var BRACKET_CURLY_LEFT = 2; var BRACKET_CURLY_LEFT = 2;
......
...@@ -2409,9 +2409,9 @@ COperator.prototype.init = function(props, defaultProps) // props (chr, t ...@@ -2409,9 +2409,9 @@ COperator.prototype.init = function(props, defaultProps) // props (chr, t
}; };
operator.init(props); operator.init(props);
} }
else if(type === BRACKET_EMPTY) else if(type === OPERATOR_EMPTY)
{ {
typeOper = BRACKET_EMPTY; typeOper = OPERATOR_EMPTY;
operator = -1; operator = -1;
} }
...@@ -2534,20 +2534,29 @@ COperator.prototype.getProps = function(props, defaultProps) ...@@ -2534,20 +2534,29 @@ COperator.prototype.getProps = function(props, defaultProps)
var bDelimiter = this.type == OPER_DELIMITER || this.type == OPER_SEPARATOR, var bDelimiter = this.type == OPER_DELIMITER || this.type == OPER_SEPARATOR,
bNotType = typeof(props.type)=="undefined" || props.type == null, bNotType = typeof(props.type)=="undefined" || props.type == null,
bEmptyStr = typeof(chr) === "string" && chr.length == 0, bStr = typeof(chr) === "string",
bEmptyStr = bStr && chr.length == 0,
bCode = typeof(chr) === "string" && chr.length > 0; bCode = typeof(chr) === "string" && chr.length > 0;
var code = bCode ? chr.charCodeAt(0) : null; var code = bCode ? chr.charCodeAt(0) : null;
var bDPrpDelim = bDelimiter && bNotType && bEmptyStr, var bDPrpDelim = bDelimiter && bNotType && !bStr,
bDPrpOther = !bDelimiter && bNotType && !bCode; bDPrpOther = !bDelimiter && bNotType && !bCode;
if(bDPrpDelim || bDPrpOther) var bDefault = bDPrpDelim || bDPrpOther,
bEmpty = bDelimiter && bEmptyStr;
if(bDefault)
{ {
type = defaultProps.type; type = defaultProps.type;
if(defaultProps.loc !== null && typeof(defaultProps.loc)!== "undefined") if(defaultProps.loc !== null && typeof(defaultProps.loc)!== "undefined")
location = defaultProps.loc; location = defaultProps.loc;
} }
else if(bEmpty)
{
type = OPERATOR_EMPTY;
}
return {loc: location, type: type, code: code}; return {loc: location, type: type, code: code};
} }
...@@ -2721,16 +2730,6 @@ CDelimiter.prototype.init = function(props) ...@@ -2721,16 +2730,6 @@ CDelimiter.prototype.init = function(props)
this.grow = true; this.grow = true;
else if(props.grow == false || props.grow == 0) else if(props.grow == false || props.grow == 0)
this.grow = false; this.grow = false;
if(props.begChr == undefined)
props.begChrType = PARENTHESIS_LEFT;
if(props.endChr == undefined)
props.endChrType = PARENTHESIS_RIGHT;
if(props.sepChr == undefined && props.column >1)
props.sepChrType = DELIMITER_LINE;
var begPrp = var begPrp =
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment