Commit cbad612e authored by Alexander.Trofimov's avatar Alexander.Trofimov

Merge branch 'feature/lf-line-endings' into develop

# Conflicts:
#	cell/.unit-tests/FormulaTests.js
#	cell/model/FormulaObjects/dateandtimeFunctions.js
parents 576dff3b 8904d3bc
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<title>Unit Tests</title> <title>Unit Tests</title>
<script type="text/javascript" src="../../../web-apps/vendor/jquery/jquery.min.js"></script> <script type="text/javascript" src="../../../web-apps/vendor/jquery/jquery.min.js"></script>
<link rel="stylesheet" href="qunit/qunit-1.11.0.css" type="text/css" media="screen" /> <link rel="stylesheet" href="qunit/qunit-1.11.0.css" type="text/css" media="screen" />
<script type="text/javascript" src="qunit/qunit-1.11.0.js"></script> <script type="text/javascript" src="qunit/qunit-1.11.0.js"></script>
<script type="text/javascript" src="../../../web-apps/vendor/xregexp/xregexp-all-min.js"></script> <script type="text/javascript" src="../../../web-apps/vendor/xregexp/xregexp-all-min.js"></script>
<script type="text/javascript" src="../../../web-apps/apps/spreadsheeteditor/sdk_dev_scripts.js"></script> <script type="text/javascript" src="../../../web-apps/apps/spreadsheeteditor/sdk_dev_scripts.js"></script>
<script> <script>
window.sdk_dev_scrpipts.forEach(function(item){ window.sdk_dev_scrpipts.forEach(function(item){
document.write('<script type="text/javascript" src="' + item.substring('../'.length) + '"><\/script>'); document.write('<script type="text/javascript" src="' + item.substring('../'.length) + '"><\/script>');
}); });
</script> </script>
<script type="text/javascript" src="FormulaTestEditor.js"></script> <script type="text/javascript" src="FormulaTestEditor.js"></script>
<script type="text/javascript" src="FormulaTests.js"></script> <script type="text/javascript" src="FormulaTests.js"></script>
</head> </head>
<body> <body>
<h1 id="qunit-header">Parser Formulas tests</h1> <h1 id="qunit-header">Parser Formulas tests</h1>
<h2 id="qunit-banner"></h2> <h2 id="qunit-banner"></h2>
<div id="qunit-testrunner-toolbar"></div> <div id="qunit-testrunner-toolbar"></div>
<h2 id="qunit-userAgent"></h2> <h2 id="qunit-userAgent"></h2>
<ol id="qunit-tests"></ol> <ol id="qunit-tests"></ol>
<div id="qunit-fixture">test markup, will be hidden</div> <div id="qunit-fixture">test markup, will be hidden</div>
</body> </body>
</html> </html>
\ No newline at end of file
This diff is collapsed.
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<title>Unit Tests</title> <title>Unit Tests</title>
<script type="text/javascript" src="../../../web-apps/vendor/jquery/jquery.min.js"></script> <script type="text/javascript" src="../../../web-apps/vendor/jquery/jquery.min.js"></script>
<link rel="stylesheet" href="qunit/qunit.css" type="text/css" media="screen" /> <link rel="stylesheet" href="qunit/qunit.css" type="text/css" media="screen" />
<script type="text/javascript" src="qunit/qunit.js"></script> <script type="text/javascript" src="qunit/qunit.js"></script>
<script type="text/javascript" src="../../../web-apps/vendor/xregexp/xregexp-all-min.js"></script> <script type="text/javascript" src="../../../web-apps/vendor/xregexp/xregexp-all-min.js"></script>
<script type="text/javascript" src="../../../web-apps/apps/spreadsheeteditor/sdk_dev_scripts.js"></script> <script type="text/javascript" src="../../../web-apps/apps/spreadsheeteditor/sdk_dev_scripts.js"></script>
<script> <script>
window.sdk_dev_scrpipts.forEach(function(item){ window.sdk_dev_scrpipts.forEach(function(item){
document.write('<script type="text/javascript" src="' + item.substring('../'.length) + '"><\/script>'); document.write('<script type="text/javascript" src="' + item.substring('../'.length) + '"><\/script>');
}); });
</script> </script>
<script type="text/javascript" src="CellFormatTests.js"></script> <script type="text/javascript" src="CellFormatTests.js"></script>
</head> </head>
<body> <body>
<h1 id="qunit-header">Cell Format Lib Tests</h1> <h1 id="qunit-header">Cell Format Lib Tests</h1>
<h2 id="qunit-banner"></h2> <h2 id="qunit-banner"></h2>
<div id="qunit-testrunner-toolbar"></div> <div id="qunit-testrunner-toolbar"></div>
<h2 id="qunit-userAgent"></h2> <h2 id="qunit-userAgent"></h2>
<ol id="qunit-tests"></ol> <ol id="qunit-tests"></ol>
<div id="qunit-fixture">test markup, will be hidden</div> <div id="qunit-fixture">test markup, will be hidden</div>
</body> </body>
</html> </html>
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<title>Unit Tests</title> <title>Unit Tests</title>
<script type="text/javascript" src="../../../web-apps/vendor/jquery/jquery.min.js"></script> <script type="text/javascript" src="../../../web-apps/vendor/jquery/jquery.min.js"></script>
<link rel="stylesheet" href="qunit/qunit.css" type="text/css" media="screen" /> <link rel="stylesheet" href="qunit/qunit.css" type="text/css" media="screen" />
<script type="text/javascript" src="qunit/qunit.js"></script> <script type="text/javascript" src="qunit/qunit.js"></script>
<script type="text/javascript" src="../../../web-apps/vendor/xregexp/xregexp-all-min.js"></script> <script type="text/javascript" src="../../../web-apps/vendor/xregexp/xregexp-all-min.js"></script>
<script type="text/javascript" src="../../../web-apps/apps/spreadsheeteditor/sdk_dev_scripts.js"></script> <script type="text/javascript" src="../../../web-apps/apps/spreadsheeteditor/sdk_dev_scripts.js"></script>
<script> <script>
window.sdk_dev_scrpipts.forEach(function(item){ window.sdk_dev_scrpipts.forEach(function(item){
document.write('<script type="text/javascript" src="' + item.substring('../'.length) + '"><\/script>'); document.write('<script type="text/javascript" src="' + item.substring('../'.length) + '"><\/script>');
}); });
</script> </script>
<script type="text/javascript" src="tests.js"></script> <script type="text/javascript" src="tests.js"></script>
</head> </head>
<body> <body>
<h1 id="qunit-header">Spreadsheets Tests</h1> <h1 id="qunit-header">Spreadsheets Tests</h1>
<h2 id="qunit-banner"></h2> <h2 id="qunit-banner"></h2>
<div id="qunit-testrunner-toolbar"></div> <div id="qunit-testrunner-toolbar"></div>
<h2 id="qunit-userAgent"></h2> <h2 id="qunit-userAgent"></h2>
<ol id="qunit-tests"></ol> <ol id="qunit-tests"></ol>
<div id="qunit-fixture">test markup, will be hidden</div> <div id="qunit-fixture">test markup, will be hidden</div>
</body> </body>
</html> </html>
/** /**
* QUnit v1.11.0 - A JavaScript Unit Testing Framework * QUnit v1.11.0 - A JavaScript Unit Testing Framework
* *
* http://qunitjs.com * http://qunitjs.com
* *
* Copyright 2012 jQuery Foundation and other contributors * Copyright 2012 jQuery Foundation and other contributors
* Released under the MIT license. * Released under the MIT license.
* http://jquery.org/license * http://jquery.org/license
*/ */
/** Font Family and Sizes */ /** Font Family and Sizes */
#qunit-tests, #qunit-header, #qunit-banner, #qunit-testrunner-toolbar, #qunit-userAgent, #qunit-testresult { #qunit-tests, #qunit-header, #qunit-banner, #qunit-testrunner-toolbar, #qunit-userAgent, #qunit-testresult {
font-family: "Helvetica Neue Light", "HelveticaNeue-Light", "Helvetica Neue", Calibri, Helvetica, Arial, sans-serif; font-family: "Helvetica Neue Light", "HelveticaNeue-Light", "Helvetica Neue", Calibri, Helvetica, Arial, sans-serif;
} }
#qunit-testrunner-toolbar, #qunit-userAgent, #qunit-testresult, #qunit-tests li { font-size: small; } #qunit-testrunner-toolbar, #qunit-userAgent, #qunit-testresult, #qunit-tests li { font-size: small; }
#qunit-tests { font-size: smaller; } #qunit-tests { font-size: smaller; }
/** Resets */ /** Resets */
#qunit-tests, #qunit-header, #qunit-banner, #qunit-userAgent, #qunit-testresult, #qunit-modulefilter { #qunit-tests, #qunit-header, #qunit-banner, #qunit-userAgent, #qunit-testresult, #qunit-modulefilter {
margin: 0; margin: 0;
padding: 0; padding: 0;
} }
/** Header */ /** Header */
#qunit-header { #qunit-header {
padding: 0.5em 0 0.5em 1em; padding: 0.5em 0 0.5em 1em;
color: #8699a4; color: #8699a4;
background-color: #0d3349; background-color: #0d3349;
font-size: 1.5em; font-size: 1.5em;
line-height: 1em; line-height: 1em;
font-weight: normal; font-weight: normal;
border-radius: 5px 5px 0 0; border-radius: 5px 5px 0 0;
-moz-border-radius: 5px 5px 0 0; -moz-border-radius: 5px 5px 0 0;
-webkit-border-top-right-radius: 5px; -webkit-border-top-right-radius: 5px;
-webkit-border-top-left-radius: 5px; -webkit-border-top-left-radius: 5px;
} }
#qunit-header a { #qunit-header a {
text-decoration: none; text-decoration: none;
color: #c2ccd1; color: #c2ccd1;
} }
#qunit-header a:hover, #qunit-header a:hover,
#qunit-header a:focus { #qunit-header a:focus {
color: #fff; color: #fff;
} }
#qunit-testrunner-toolbar label { #qunit-testrunner-toolbar label {
display: inline-block; display: inline-block;
padding: 0 .5em 0 .1em; padding: 0 .5em 0 .1em;
} }
#qunit-banner { #qunit-banner {
height: 15px; height: 15px;
} }
#qunit-testrunner-toolbar { #qunit-testrunner-toolbar {
padding: 0.5em 0 0.5em 2em; padding: 0.5em 0 0.5em 2em;
color: #5E740B; color: #5E740B;
background-color: #eee; background-color: #eee;
overflow: hidden; overflow: hidden;
} }
#qunit-userAgent { #qunit-userAgent {
padding: 0.5em 0 0.5em 2.5em; padding: 0.5em 0 0.5em 2.5em;
background-color: #2b81af; background-color: #2b81af;
color: #fff; color: #fff;
text-shadow: rgba(0, 0, 0, 0.5) 2px 2px 1px; text-shadow: rgba(0, 0, 0, 0.5) 2px 2px 1px;
} }
#qunit-modulefilter-container { #qunit-modulefilter-container {
float: right; float: right;
} }
/** Tests: Pass/Fail */ /** Tests: Pass/Fail */
#qunit-tests { #qunit-tests {
list-style-position: inside; list-style-position: inside;
} }
#qunit-tests li { #qunit-tests li {
padding: 0.4em 0.5em 0.4em 2.5em; padding: 0.4em 0.5em 0.4em 2.5em;
border-bottom: 1px solid #fff; border-bottom: 1px solid #fff;
list-style-position: inside; list-style-position: inside;
} }
#qunit-tests.hidepass li.pass, #qunit-tests.hidepass li.running { #qunit-tests.hidepass li.pass, #qunit-tests.hidepass li.running {
display: none; display: none;
} }
#qunit-tests li strong { #qunit-tests li strong {
cursor: pointer; cursor: pointer;
} }
#qunit-tests li a { #qunit-tests li a {
padding: 0.5em; padding: 0.5em;
color: #c2ccd1; color: #c2ccd1;
text-decoration: none; text-decoration: none;
} }
#qunit-tests li a:hover, #qunit-tests li a:hover,
#qunit-tests li a:focus { #qunit-tests li a:focus {
color: #000; color: #000;
} }
#qunit-tests li .runtime { #qunit-tests li .runtime {
float: right; float: right;
font-size: smaller; font-size: smaller;
} }
.qunit-assert-list { .qunit-assert-list {
margin-top: 0.5em; margin-top: 0.5em;
padding: 0.5em; padding: 0.5em;
background-color: #fff; background-color: #fff;
border-radius: 5px; border-radius: 5px;
-moz-border-radius: 5px; -moz-border-radius: 5px;
-webkit-border-radius: 5px; -webkit-border-radius: 5px;
} }
.qunit-collapsed { .qunit-collapsed {
display: none; display: none;
} }
#qunit-tests table { #qunit-tests table {
border-collapse: collapse; border-collapse: collapse;
margin-top: .2em; margin-top: .2em;
} }
#qunit-tests th { #qunit-tests th {
text-align: right; text-align: right;
vertical-align: top; vertical-align: top;
padding: 0 .5em 0 0; padding: 0 .5em 0 0;
} }
#qunit-tests td { #qunit-tests td {
vertical-align: top; vertical-align: top;
} }
#qunit-tests pre { #qunit-tests pre {
margin: 0; margin: 0;
white-space: pre-wrap; white-space: pre-wrap;
word-wrap: break-word; word-wrap: break-word;
} }
#qunit-tests del { #qunit-tests del {
background-color: #e0f2be; background-color: #e0f2be;
color: #374e0c; color: #374e0c;
text-decoration: none; text-decoration: none;
} }
#qunit-tests ins { #qunit-tests ins {
background-color: #ffcaca; background-color: #ffcaca;
color: #500; color: #500;
text-decoration: none; text-decoration: none;
} }
/*** Test Counts */ /*** Test Counts */
#qunit-tests b.counts { color: black; } #qunit-tests b.counts { color: black; }
#qunit-tests b.passed { color: #5E740B; } #qunit-tests b.passed { color: #5E740B; }
#qunit-tests b.failed { color: #710909; } #qunit-tests b.failed { color: #710909; }
#qunit-tests li li { #qunit-tests li li {
padding: 5px; padding: 5px;
background-color: #fff; background-color: #fff;
border-bottom: none; border-bottom: none;
list-style-position: inside; list-style-position: inside;
} }
/*** Passing Styles */ /*** Passing Styles */
#qunit-tests li li.pass { #qunit-tests li li.pass {
color: #5E740B; color: #5E740B;
background-color: #fff; background-color: #fff;
border-left: 26px solid #C6E746; border-left: 26px solid #C6E746;
} }
#qunit-tests .pass { color: #528CE0; background-color: #D2E0E6; } #qunit-tests .pass { color: #528CE0; background-color: #D2E0E6; }
#qunit-tests .pass .test-name { color: #366097; } #qunit-tests .pass .test-name { color: #366097; }
#qunit-tests .pass .test-actual, #qunit-tests .pass .test-actual,
#qunit-tests .pass .test-expected { color: #999999; } #qunit-tests .pass .test-expected { color: #999999; }
#qunit-banner.qunit-pass { background-color: #C6E746; } #qunit-banner.qunit-pass { background-color: #C6E746; }
/*** Failing Styles */ /*** Failing Styles */
#qunit-tests li li.fail { #qunit-tests li li.fail {
color: #710909; color: #710909;
background-color: #fff; background-color: #fff;
border-left: 26px solid #EE5757; border-left: 26px solid #EE5757;
white-space: pre; white-space: pre;
} }
#qunit-tests > li:last-child { #qunit-tests > li:last-child {
border-radius: 0 0 5px 5px; border-radius: 0 0 5px 5px;
-moz-border-radius: 0 0 5px 5px; -moz-border-radius: 0 0 5px 5px;
-webkit-border-bottom-right-radius: 5px; -webkit-border-bottom-right-radius: 5px;
-webkit-border-bottom-left-radius: 5px; -webkit-border-bottom-left-radius: 5px;
} }
#qunit-tests .fail { color: #000000; background-color: #ED6F6F; } #qunit-tests .fail { color: #000000; background-color: #ED6F6F; }
#qunit-tests .fail .test-name, #qunit-tests .fail .test-name,
#qunit-tests .fail .module-name { color: #000000; } #qunit-tests .fail .module-name { color: #000000; }
#qunit-tests .fail .test-actual { color: #EE5757; } #qunit-tests .fail .test-actual { color: #EE5757; }
#qunit-tests .fail .test-expected { color: green; } #qunit-tests .fail .test-expected { color: green; }
#qunit-banner.qunit-fail { background-color: #EE5757; } #qunit-banner.qunit-fail { background-color: #EE5757; }
/** Result */ /** Result */
#qunit-testresult { #qunit-testresult {
padding: 0.5em 0.5em 0.5em 2.5em; padding: 0.5em 0.5em 0.5em 2.5em;
color: #000000; color: #000000;
background-color: #D2E0E6; background-color: #D2E0E6;
font-size: 12pt; font-size: 12pt;
font-weight: bold; font-weight: bold;
border-bottom: 1px solid white; border-bottom: 1px solid white;
} }
#qunit-testresult .module-name { #qunit-testresult .module-name {
font-weight: bold; font-weight: bold;
} }
/** Fixture */ /** Fixture */
#qunit-fixture { #qunit-fixture {
position: absolute; position: absolute;
top: -10000px; top: -10000px;
left: -10000px; left: -10000px;
width: 1000px; width: 1000px;
height: 1000px; height: 1000px;
} }
This diff is collapsed.
This diff is collapsed.
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd"> "http://www.w3.org/TR/html4/loose.dtd">
<html> <html>
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<title>Unit Test</title> <title>Unit Test</title>
<script type="text/javascript" src="../../../web-apps/vendor/jquery/jquery.min.js"></script> <script type="text/javascript" src="../../../web-apps/vendor/jquery/jquery.min.js"></script>
<link rel="stylesheet" href="qunit/qunit.css" type="text/css" media="screen" /> <link rel="stylesheet" href="qunit/qunit.css" type="text/css" media="screen" />
<script type="text/javascript" src="qunit/qunit.js"></script> <script type="text/javascript" src="qunit/qunit.js"></script>
<script type="text/javascript" src="../../../web-apps/vendor/xregexp/xregexp-all-min.js"></script> <script type="text/javascript" src="../../../web-apps/vendor/xregexp/xregexp-all-min.js"></script>
<script type="text/javascript" src="../../../web-apps/apps/spreadsheeteditor/sdk_dev_scripts.js"></script> <script type="text/javascript" src="../../../web-apps/apps/spreadsheeteditor/sdk_dev_scripts.js"></script>
<script> <script>
window.sdk_dev_scrpipts.forEach(function(item){ window.sdk_dev_scrpipts.forEach(function(item){
document.write('<script type="text/javascript" src="' + item + '"><\/script>'); document.write('<script type="text/javascript" src="' + item + '"><\/script>');
}); });
</script> </script>
<script type="text/javascript" src="testsForFWB.html.js"></script> <script type="text/javascript" src="testsForFWB.html.js"></script>
</head> </head>
<body> <body>
<h1 id="qunit-header">Spreadsheets Tests</h1> <h1 id="qunit-header">Spreadsheets Tests</h1>
<h2 id="qunit-banner"></h2> <h2 id="qunit-banner"></h2>
<div id="qunit-testrunner-toolbar"></div> <div id="qunit-testrunner-toolbar"></div>
<h2 id="qunit-userAgent"></h2> <h2 id="qunit-userAgent"></h2>
<ol id="qunit-tests"></ol> <ol id="qunit-tests"></ol>
<div id="qunit-fixture">test markup, will be hidden</div> <div id="qunit-fixture">test markup, will be hidden</div>
</body> </body>
</html> </html>
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
/* /*
* (c) Copyright Ascensio System SIA 2010-2017 * (c) Copyright Ascensio System SIA 2010-2017
* *
* This program is a free software product. You can redistribute it and/or * This program is a free software product. You can redistribute it and/or
* modify it under the terms of the GNU Affero General Public License (AGPL) * modify it under the terms of the GNU Affero General Public License (AGPL)
* version 3 as published by the Free Software Foundation. In accordance with * version 3 as published by the Free Software Foundation. In accordance with
* Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
* that Ascensio System SIA expressly excludes the warranty of non-infringement * that Ascensio System SIA expressly excludes the warranty of non-infringement
* of any third-party rights. * of any third-party rights.
* *
* This program is distributed WITHOUT ANY WARRANTY; without even the implied * This program is distributed WITHOUT ANY WARRANTY; without even the implied
* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For
* details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
* *
* You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia,
* EU, LV-1021. * EU, LV-1021.
* *
* The interactive user interfaces in modified source and object code versions * The interactive user interfaces in modified source and object code versions
* of the Program must display Appropriate Legal Notices, as required under * of the Program must display Appropriate Legal Notices, as required under
* Section 5 of the GNU AGPL version 3. * Section 5 of the GNU AGPL version 3.
* *
* Pursuant to Section 7(b) of the License you must retain the original Product * Pursuant to Section 7(b) of the License you must retain the original Product
* logo when distributing the program. Pursuant to Section 7(e) we decline to * logo when distributing the program. Pursuant to Section 7(e) we decline to
* grant you any rights under trademark law for use of our trademarks. * grant you any rights under trademark law for use of our trademarks.
* *
* All the Product's GUI elements, including illustrations and icon sets, as * All the Product's GUI elements, including illustrations and icon sets, as
* well as technical writing content are licensed under the terms of the * well as technical writing content are licensed under the terms of the
* Creative Commons Attribution-ShareAlike 4.0 International. See the License * Creative Commons Attribution-ShareAlike 4.0 International. See the License
* terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
* *
*/ */
"use strict"; "use strict";
(/** (/**
* @param {Window} window * @param {Window} window
* @param {undefined} undefined * @param {undefined} undefined
*/ */
function(window, undefined) { function(window, undefined) {
var asc = window["Asc"]; var asc = window["Asc"];
var prot; var prot;
asc['spreadsheet_api'].prototype.asc_addComment = function(oComment) { asc['spreadsheet_api'].prototype.asc_addComment = function(oComment) {
var oPlace = oComment.bDocument ? this.wb : this.wb.getWorksheet(); var oPlace = oComment.bDocument ? this.wb : this.wb.getWorksheet();
oPlace.cellCommentator.addComment(oComment); oPlace.cellCommentator.addComment(oComment);
}; };
prot = asc['spreadsheet_api'].prototype; prot = asc['spreadsheet_api'].prototype;
prot['asc_addComment'] = prot.asc_addComment; prot['asc_addComment'] = prot.asc_addComment;
AscCommonExcel.CCellCommentator.prototype.addComment = function(comment, bIsNotUpdate) { AscCommonExcel.CCellCommentator.prototype.addComment = function(comment, bIsNotUpdate) {
var t = this; var t = this;
var oComment = comment; var oComment = comment;
var bChange = false; var bChange = false;
oComment.wsId = this.model.getId(); oComment.wsId = this.model.getId();
oComment.setId(); oComment.setId();
if (!oComment.bDocument) { if (!oComment.bDocument) {
if (!bIsNotUpdate) { if (!bIsNotUpdate) {
var activeCell = this.model.selectionRange.activeCell; var activeCell = this.model.selectionRange.activeCell;
oComment.asc_putCol(activeCell.col); oComment.asc_putCol(activeCell.col);
oComment.asc_putRow(activeCell.row); oComment.asc_putRow(activeCell.row);
} }
var existComments = this.getComments(oComment.nCol, oComment.nRow); var existComments = this.getComments(oComment.nCol, oComment.nRow);
if (existComments.length) { if (existComments.length) {
oComment = existComments[0]; oComment = existComments[0];
bChange = true; bChange = true;
} }
} }
var onAddCommentCallback = function (isSuccess) { var onAddCommentCallback = function (isSuccess) {
if (false === isSuccess) if (false === isSuccess)
return; return;
t._addComment(oComment, bChange, bIsNotUpdate); t._addComment(oComment, bChange, bIsNotUpdate);
}; };
if (bIsNotUpdate) { if (bIsNotUpdate) {
onAddCommentCallback(true); onAddCommentCallback(true);
} else { } else {
this.isLockedComment(oComment, onAddCommentCallback); this.isLockedComment(oComment, onAddCommentCallback);
} }
}; };
})(window); })(window);
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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