Skip to content

S
sdkjs
Commit 6c720898 authored by Alexander.Trofimov's avatar Alexander.Trofimov Committed by Alexander.Trofimov
Browse files
Options

add asc_setViewMode 

asc_coAuthoringDisconnect to baseEditorsApi
asc_setViewerMode -> asc_setViewMode
SetViewMode -> asc_setViewMode

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@66484 954022d7-b5bf-4e40-9824-e11837661b57
parent 1c32fee6
Show whitespace changes
Inline Side-by-side
Showing with 33 additions and 47 deletions
Common/apiBase.js
View file @ 6c720898
......@@ -165,6 +165,8 @@ baseEditorsApi.prototype.sync_TryUndoInFastCollaborative = function()
{
this.sendEvent("asc_OnTryUndoInFastCollaborative");
};
baseEditorsApi.prototype.asc_setViewMode = function() {
};
baseEditorsApi.prototype.getViewMode = function() {
};
// Open
......@@ -284,7 +286,13 @@ baseEditorsApi.prototype._coAuthoringInit = function() {
};
baseEditorsApi.prototype._coAuthoringInitEnd = function() {
};
// server disconnect
baseEditorsApi.prototype.asc_coAuthoringDisconnect = function() {
this.CoAuthoringApi.disconnect();
this.isCoAuthoringEnable = false;
// Выставляем view-режим
this.asc_setViewMode(true);
};
// SpellCheck
baseEditorsApi.prototype._coSpellCheckInit = function() {
......
Excel/SpreadsheetTestMobile.html
View file @ 6c720898
......@@ -407,7 +407,7 @@
var api = new Asc.spreadsheet_api("wb-widget", null);
api.asc_setMobileVersion(true);
api.asc_setViewerMode(true);
api.asc_setViewMode(true);
api.asc_registerCallback("asc_onStartAction", onStartAction);
api.asc_registerCallback("asc_onEndAction", onEndAction);
api.asc_registerCallback("asc_onError", onError);
......
Excel/api.js
View file @ 6c720898
......@@ -554,7 +554,7 @@ var editor;
return this.controller.getViewerMode();
};
spreadsheet_api.prototype.asc_setViewerMode = function(isViewerMode) {
spreadsheet_api.prototype.asc_setViewMode = function(isViewerMode) {
this.controller.setViewerMode(isViewerMode);
if (this.collaborativeEditing) {
this.collaborativeEditing.setViewerMode(isViewerMode);
......@@ -584,6 +584,9 @@ var editor;
}
}
};
spreadsheet_api.prototype.asc_setViewerMode = function(isViewerMode) {
this.asc_setViewMode(isViewerMode);
};
spreadsheet_api.prototype.asc_setUseEmbeddedCutFonts = function(bUse) {
this.isUseEmbeddedCutFonts = bUse;
......@@ -1325,7 +1328,7 @@ var editor;
// Посылаем наверх эвент об отключении от сервера
t.handlers.trigger("asc_onCoAuthoringDisconnect");
// И переходим в режим просмотра т.к. мы не можем сохранить таблицу
t.asc_setViewerMode(true);
t.asc_setViewMode(true);
t.handlers.trigger("asc_onError", isCloseCoAuthoring ? c_oAscError.ID.UserDrop : c_oAscError.ID.CoAuthoringDisconnect, c_oAscError.Level.NoCritical);
}
};
......@@ -2963,19 +2966,6 @@ var editor;
}
};
/////////////////////////////////////////////////////////////////////////
///////////////////CoAuthoring and Chat api//////////////////////////////
/////////////////////////////////////////////////////////////////////////
// server disconnect
spreadsheet_api.prototype.asc_coAuthoringDisconnect = function() {
this.CoAuthoringApi.disconnect();
this.isCoAuthoringEnable = false;
// Выставляем view-режим
this.asc_setViewerMode(true);
};
/////////////////////////////////////////////////////////////////////////
////////////////////////////AutoSave api/////////////////////////////////
/////////////////////////////////////////////////////////////////////////
......@@ -3249,6 +3239,7 @@ var editor;
prot["asc_setAutoSaveGap"] = prot.asc_setAutoSaveGap;
prot["asc_setMobileVersion"] = prot.asc_setMobileVersion;
prot["asc_setViewMode"] = prot.asc_setViewMode;
prot["asc_setViewerMode"] = prot.asc_setViewerMode;
prot["asc_setUseEmbeddedCutFonts"] = prot.asc_setUseEmbeddedCutFonts;
prot["asc_setAdvancedOptions"] = prot.asc_setAdvancedOptions;
......
Excel/menu/menu.js
View file @ 6c720898
......@@ -419,7 +419,6 @@
var api = new Asc.spreadsheet_api("wb-widget", "cv1");
// Выставляем русскую локализацию для SUM (СУММ)
api.asc_setLocalization(JSON.parse('{"DATE":{"n":"DATE","a":"( year, month, day )"},"DATEDIF":{"n":"DATEDIF","a":"( start-date , end-date , unit )"},"DATEVALUE":{"n":"DATEVALUE","a":"( date-time-string )"},"DAY":{"n":"DAY","a":"( date-value )"},"DAYS360":{"n":"DAYS360","a":"( start-date , end-date [ , method-flag ] )"},"EDATE":{"n":"EDATE","a":"( start-date , month-offset )"},"EOMONTH":{"n":"EOMONTH","a":"( start-date , month-offset )"},"HOUR":{"n":"HOUR","a":"( time-value )"},"MINUTE":{"n":"MINUTE","a":"( time-value )"},"MONTH":{"n":"MONTH","a":"( date-value )"},"NETWORKDAYS":{"n":"NETWORKDAYS","a":"( start-date , end-date [ , holidays ] )"},"NOW":{"n":"NOW","a":"()"},"SECOND":{"n":"SECOND","a":"( time-value )"},"TIME":{"n":"TIME","a":"( hour, minute, second )"},"TIMEVALUE":{"n":"TIMEVALUE","a":"( date-time-string )"},"TODAY":{"n":"TODAY","a":"()"},"WEEKDAY":{"n":"WEEKDAY","a":"( serial-value [ , weekday-start-flag ] )"},"WEEKNUM":{"n":"WEEKNUM","a":"( serial-value [ , weekday-start-flag ] )"},"WORKDAY":{"n":"WORKDAY","a":"( start-date , day-offset [ , holidays ] )"},"YEAR":{"n":"YEAR","a":"( date-value )"},"YEARFRAC":{"n":"YEARFRAC","a":"( start-date , end-date [ , basis ] )"},"BIN2DEC":{"n":"BIN2DEC","a":"( number )"},"BIN2HEX":{"n":"BIN2HEX","a":"( number [ , num-hex-digits ] )"},"BIN2OCT":{"n":"BIN2OCT","a":"( number [ , num-hex-digits ] )"},"COMPLEX":{"n":"COMPLEX","a":"( real-number , imaginary-number [ , suffix ] )"},"DEC2BIN":{"n":"DEC2BIN","a":"( number [ , num-hex-digits ] )"},"DEC2HEX":{"n":"DEC2HEX","a":"( number [ , num-hex-digits ] )"},"DEC2OCT":{"n":"DEC2OCT","a":"( number [ , num-hex-digits ] )"},"DELTA":{"n":"DELTA","a":"( number-1 [ , number-2 ] )"},"ERF":{"n":"ERF","a":"( lower-bound [ , upper-bound ] )"},"ERFC":{"n":"ERFC","a":"( lower-bound )"},"GESTEP":{"n":"GESTEP","a":"( number [ , step ] )"},"HEX2BIN":{"n":"HEX2BIN","a":"( number [ , num-hex-digits ] )"},"HEX2DEC":{"n":"HEX2DEC","a":"( number )"},"HEX2OCT":{"n":"HEX2OCT","a":"( number [ , num-hex-digits ] )"},"IMABS":{"n":"IMABS","a":"( complex-number )"},"IMAGINARY":{"n":"IMAGINARY","a":"( complex-number )"},"IMARGUMENT":{"n":"IMARGUMENT","a":"( complex-number )"},"IMCONJUGATE":{"n":"IMCONJUGATE","a":"( complex-number )"},"IMCOS":{"n":"IMCOS","a":"( complex-number )"},"IMDIV":{"n":"IMDIV","a":"( complex-number-1 , complex-number-2 )"},"IMEXP":{"n":"IMEXP","a":"( complex-number )"},"IMLN":{"n":"IMLN","a":"( complex-number )"},"IMLOG10":{"n":"IMLOG10","a":"( complex-number )"},"IMLOG2":{"n":"IMLOG2","a":"( complex-number )"},"IMPOWER":{"n":"IMPOWER","a":"( complex-number, power )"},"IMPRODUCT":{"n":"IMPRODUCT","a":"( argument-list )"},"IMREAL":{"n":"IMREAL","a":"( complex-number )"},"IMSIN":{"n":"IMSIN","a":"( complex-number )"},"IMSQRT":{"n":"IMSQRT","a":"( complex-number )"},"IMSUB":{"n":"IMSUB","a":"( complex-number-1 , complex-number-2 )"},"IMSUM":{"n":"IMSUM","a":"( argument-list )"},"OCT2BIN":{"n":"OCT2BIN","a":"( number [ , num-hex-digits ] )"},"OCT2DEC":{"n":"OCT2DEC","a":"( number )"},"OCT2HEX":{"n":"OCT2HEX","a":"( number [ , num-hex-digits ] )"},"CHAR":{"n":"CHAR","a":"( number )"},"CLEAN":{"n":"CLEAN","a":"( string )"},"CODE":{"n":"CODE","a":"( string )"},"CONCATENATE":{"n":"CONCATENATE","a":"(text1, text2, ...)"},"DOLLAR":{"n":"DOLLAR","a":"( number [ , num-decimal ] )"},"EXACT":{"n":"EXACT","a":"(text1, text2)"},"FIND":{"n":"FIND","a":"( string-1 , string-2 [ , start-pos ] )"},"FINDB":{"n":"FINDB","a":"( string-1 , string-2 [ , start-pos ] )"},"FIXED":{"n":"FIXED","a":"( number [ , [ num-decimal ] [ , suppress-commas-flag ] ] )"},"LEFT":{"n":"LEFT","a":"( string [ , number-chars ] )"},"LEFTB":{"n":"LEFTB","a":"( string [ , number-chars ] )"},"LEN":{"n":"LEN","a":"( string )"},"LENB":{"n":"LENB","a":"( string )"},"LOWER":{"n":"LOWER","a":"(text)"},"MID":{"n":"MID","a":"( string , start-pos , number-chars )"},"MIDB":{"n":"MIDB","a":"( string , start-pos , number-chars )"},"PROPER":{"n":"PROPER","a":"( string )"},"REPLACE":{"n":"REPLACE","a":"( string-1, start-pos, number-chars, string-2 )"},"REPLACEB":{"n":"REPLACEB","a":"( string-1, start-pos, number-chars, string-2 )"},"REPT":{"n":"REPT","a":"(text, number_of_times)"},"RIGHT":{"n":"RIGHT","a":"( string [ , number-chars ] )"},"RIGHTB":{"n":"RIGHTB","a":"( string [ , number-chars ] )"},"SEARCH":{"n":"SEARCH","a":"( string-1 , string-2 [ , start-pos ] )"},"SEARCHB":{"n":"SEARCHB","a":"( string-1 , string-2 [ , start-pos ] )"},"SUBSTITUTE":{"n":"SUBSTITUTE","a":"( string , old-string , new-string [ , occurence ] )"},"T":{"n":"T","a":"( value )"},"TEXT":{"n":"TEXT","a":"( value , format )"},"TRIM":{"n":"TRIM","a":"( string )"},"UPPER":{"n":"UPPER","a":"(text)"},"VALUE":{"n":"VALUE","a":"( string )"},"AVEDEV":{"n":"AVEDEV","a":"( argument-list )"},"AVERAGE":{"n":"AVERAGE","a":"( argument-list )"},"AVERAGEA":{"n":"AVERAGEA","a":"( argument-list )"},"AVERAGEIF":{"n":"AVERAGEIF","a":"( cell-range, selection-criteria [ , average-range ] )"},"BINOMDIST":{"n":"BINOMDIST","a":"( number-successes , number-trials , success-probability , cumulative-flag )"},"CONFIDENCE":{"n":"CONFIDENCE","a":"( alpha , standard-dev , size )"},"CORREL":{"n":"CORREL","a":"( array-1 , array-2 )"},"COUNT":{"n":"COUNT","a":"( argument-list )"},"COUNTA":{"n":"COUNTA","a":"( argument-list )"},"COUNTBLANK":{"n":"COUNTBLANK","a":"( argument-list )"},"COUNTIF":{"n":"COUNTIF","a":"( cell-range, selection-criteria )"},"COVAR":{"n":"COVAR","a":"( array-1 , array-2 )"},"CRITBINOM":{"n":"CRITBINOM","a":"( number-trials , success-probability , alpha )"},"DEVSQ":{"n":"DEVSQ","a":"( argument-list )"},"EXPONDIST":{"n":"EXPONDIST","a":"( x , lambda , cumulative-flag )"},"FISHER":{"n":"FISHER","a":"( number )"},"FISHERINV":{"n":"FISHERINV","a":"( number )"},"FORECAST":{"n":"FORECAST","a":"( x , array-1 , array-2 )"},"FREQUENCY":{"n":"FREQUENCY","a":"( data-array , bins-array )"},"GAMMALN":{"n":"GAMMALN","a":"(number)"},"GEOMEAN":{"n":"GEOMEAN","a":"( argument-list )"},"HARMEAN":{"n":"HARMEAN","a":"( argument-list )"},"HYPGEOMDIST":{"n":"HYPGEOMDIST","a":"( sample-successes , number-sample , population-successes , number-population )"},"INTERCEPT":{"n":"INTERCEPT","a":"( array-1 , array-2 )"},"KURT":{"n":"KURT","a":"( argument-list )"},"LARGE":{"n":"LARGE","a":"( array , k )"},"LOGINV":{"n":"LOGINV","a":"( x , mean , standard-deviation )"},"LOGNORMDIST":{"n":"LOGNORMDIST","a":"( x , mean , standard-deviation )"},"MAX":{"n":"MAX","a":"(number1, number2, ...)"},"MAXA":{"n":"MAXA","a":"(number1, number2, ...)"},"MEDIAN":{"n":"MEDIAN","a":"( argument-list )"},"MIN":{"n":"MIN","a":"(number1, number2, ...)"},"MINA":{"n":"MINA","a":"(number1, number2, ...)"},"MODE":{"n":"MODE","a":"( argument-list )"},"NEGBINOMDIST":{"n":"NEGBINOMDIST","a":"( number-failures , number-successes , success-probability )"},"NORMDIST":{"n":"NORMDIST","a":"( x , mean , standard-deviation , cumulative-flag )"},"NORMINV":{"n":"NORMINV","a":"( x , mean , standard-deviation )"},"NORMSDIST":{"n":"NORMSDIST","a":"(number)"},"NORMSINV":{"n":"NORMSINV","a":"( probability )"},"PEARSON":{"n":"PEARSON","a":"( array-1 , array-2 )"},"PERCENTILE":{"n":"PERCENTILE","a":"( array , k )"},"PERCEBTRANK":{"n":"PERCEBTRANK","a":"( array , x [ , significance ] )"},"PERMUT":{"n":"PERMUT","a":"( number , number-chosen )"},"POISSON":{"n":"POISSON","a":"( x , mean , cumulative-flag )"},"PROB":{"n":"PROB","a":"( x-range , probability-range , lower-limit [ , upper-limit ] )"},"QUARTILE":{"n":"QUARTILE","a":"( array , result-category )"},"RSQ":{"n":"RSQ","a":"( array-1 , array-2 )"},"SKEW":{"n":"SKEW","a":"( argument-list )"},"SLOPE":{"n":"SLOPE","a":"( array-1 , array-2 )"},"SMALL":{"n":"SMALL","a":"( array , k )"},"STANDARDIZE":{"n":"STANDARDIZE","a":"( x , mean , standard-deviation )"},"STDEV":{"n":"STDEV","a":"( argument-list )"},"STDEVA":{"n":"STDEVA","a":"( argument-list )"},"STDEVP":{"n":"STDEVP","a":"( argument-list )"},"STDEVPA":{"n":"STDEVPA","a":"( argument-list )"},"STEYX":{"n":"STEYX","a":"( known-ys , known-xs )"},"VAR":{"n":"VAR","a":"( argument-list )"},"VARA":{"n":"VARA","a":"( argument-list )"},"VARP":{"n":"VARP","a":"( argument-list )"},"VARPA":{"n":"VARPA","a":"( argument-list )"},"ACCRINT":{"n":"ACCRINT","a":"( issue , first-interest , settlement , rate , [ par ] , frequency [ , [ basis ] ] )"},"ACCRINTM":{"n":"ACCRINTM","a":"( issue , settlement , rate , [ [ par ] [ , [ basis ] ] ] )"},"AMORDEGRC":{"n":"AMORDEGRC","a":"( cost , date-purchased , first-period , salvage , period , rate [ , [ basis ] ] )"},"AMORLINC":{"n":"AMORLINC","a":"( cost , date-purchased , first-period , salvage , period , rate [ , [ basis ] ] )"},"COUPDAYBS":{"n":"COUPDAYBS","a":"( settlement , maturity , frequency [ , [ basis ] ] )"},"COUPDAYS":{"n":"COUPDAYS","a":"( settlement , maturity , frequency [ , [ basis ] ] )"},"COUPDAYSNC":{"n":"COUPDAYSNC","a":"( settlement , maturity , frequency [ , [ basis ] ] )"},"COUPNCD":{"n":"COUPNCD","a":"( settlement , maturity , frequency [ , [ basis ] ] )"},"COUPNUM":{"n":"COUPNUM","a":"( settlement , maturity , frequency [ , [ basis ] ] )"},"COUPPCD":{"n":"COUPPCD","a":"( settlement , maturity , frequency [ , [ basis ] ] )"},"CUMIPMT":{"n":"CUMIPMT","a":"( rate , nper , pv , start-period , end-period , type )"},"CUMPRINC":{"n":"CUMPRINC","a":"( rate , nper , pv , start-period , end-period , type )"},"DB":{"n":"DB","a":"( cost , salvage , life , period [ , [ month ] ] )"},"DDB":{"n":"DDB","a":"( cost , salvage , life , period [ , factor ] )"},"DISC":{"n":"DISC","a":"( settlement , maturity , pr , redemption [ , [ basis ] ] )"},"DOLLARDE":{"n":"DOLLARDE","a":"( fractional-dollar , fraction )"},"DOLLARFR":{"n":"DOLLARFR","a":"( decimal-dollar , fraction )"},"DURATION":{"n":"DURATION","a":"( settlement , maturity , coupon , yld , frequency [ , [ basis ] ] )"},"EFFECT":{"n":"EFFECT","a":"( nominal-rate , npery )"},"FV":{"n":"FV","a":"( rate , nper , pmt [ , [ pv ] [ ,[ type ] ] ] )"},"FVSCHEDULE":{"n":"FVSCHEDULE","a":"( principal , schedule )"},"INTRATE":{"n":"INTRATE","a":"( settlement , maturity , pr , redemption [ , [ basis ] ] )"},"IPMT":{"n":"IPMT","a":"( rate , per , nper , pv [ , [ fv ] [ , [ type ] ] ] )"},"IRR":{"n":"IRR","a":"( values [ , [ guess ] ] )"},"ISPMT":{"n":"ISPMT","a":"( rate , per , nper , pv )"},"MDURATION":{"n":"MDURATION","a":"( settlement , maturity , coupon , yld , frequency [ , [ basis ] ] )"},"MIRR":{"n":"MIRR","a":"( values , finance-rate , reinvest-rate )"},"NOMINAL":{"n":"NOMINAL","a":"( effect-rate , npery )"},"NPER":{"n":"NPER","a":"( rate , pmt , pv [ , [ fv ] [ , [ type ] ] ] )"},"NPV":{"n":"NPV","a":"( rate , argument-list )"},"ODDFPRICE":{"n":"ODDFPRICE","a":"( settlement , maturity , issue , first-coupon , rate , yld , redemption , frequency [ , [ basis ] ] )"},"ODDFYIELD":{"n":"ODDFYIELD","a":"( settlement , maturity , issue , first-coupon , rate , pr , redemption , frequency [ , [ basis ] ] )"},"ODDLPRICE":{"n":"ODDLPRICE","a":"( settlement , maturity , last-interest , rate , yld , redemption , frequency [ , [ basis ] ] )"},"ODDLYIELD":{"n":"ODDLYIELD","a":"( settlement , maturity , last-interest , rate , pr , redemption , frequency [ , [ basis ] ] )"},"PMT":{"n":"PMT","a":"( rate , nper , pv [ , [ fv ] [ ,[ type ] ] ] )"},"PPMT":{"n":"PPMT","a":"( rate , per , nper , pv [ , [ fv ] [ , [ type ] ] ] )"},"PRICE":{"n":"PRICE","a":"( settlement , maturity , rate , yld , redemption , frequency [ , [ basis ] ] )"},"PRICEDISC":{"n":"PRICEDISC","a":"( settlement , maturity , discount , redemption [ , [ basis ] ] )"},"PRICEMAT":{"n":"PRICEMAT","a":"( settlement , maturity , issue , rate , yld [ , [ basis ] ] )"},"PV":{"n":"PV","a":"( rate , nper , pmt [ , [ fv ] [ ,[ type ] ] ] )"},"RATE":{"n":"RATE","a":"( nper , pmt , pv [ , [ [ fv ] [ , [ [ type ] [ , [ guess ] ] ] ] ] ] )"},"RECEIVED":{"n":"RECEIVED","a":"( settlement , maturity , investment , discount [ , [ basis ] ] )"},"SLN":{"n":"SLN","a":"( cost , salvage , life )"},"SYD":{"n":"SYD","a":"( cost , salvage , life , per )"},"TBILLEQ":{"n":"TBILLEQ","a":"( settlement , maturity , discount )"},"TBILLPRICE":{"n":"TBILLPRICE","a":"( settlement , maturity , discount )"},"TBILLYIELD":{"n":"TBILLYIELD","a":"( settlement , maturity , pr )"},"VDB":{"n":"VDB","a":"( cost , salvage , life , start-period , end-period [ , [ [ factor ] [ , [ no-switch-flag ] ] ] ] ] )"},"XIRR":{"n":"XIRR","a":"( values , dates [ , [ guess ] ] )"},"XNPV":{"n":"XNPV","a":"( rate , values , dates )"},"YIELD":{"n":"YIELD","a":"( settlement , maturity , rate , pr , redemption , frequency [ , [ basis ] ] )"},"YIELDDISC":{"n":"YIELDDISC","a":"( settlement , maturity , pr , redemption , [ , [ basis ] ] )"},"YIELDMAT":{"n":"YIELDMAT","a":"( settlement , maturity , issue , rate , pr [ , [ basis ] ] )"},"ABS":{"n":"ABS","a":"( x )"},"ACOS":{"n":"ACOS","a":"( x )"},"ACOSH":{"n":"ACOSH","a":"( x )"},"ASIN":{"n":"ASIN","a":"( x )"},"ASINH":{"n":"ASINH","a":"( x )"},"ATAN":{"n":"ATAN","a":"( x )"},"ATAN2":{"n":"ATAN2","a":"( x, y )"},"ATANH":{"n":"ATANH","a":"( x )"},"CEILING":{"n":"CEILING","a":"( x, significance )"},"COMBIN":{"n":"COMBIN","a":"( number , number-chosen )"},"COS":{"n":"COS","a":"( x )"},"COSH":{"n":"COSH","a":"( x )"},"DEGREES":{"n":"DEGREES","a":"( angle )"},"EVEN":{"n":"EVEN","a":"( x )"},"EXP":{"n":"EXP","a":"( x )"},"FACT":{"n":"FACT","a":"( x )"},"FACTDOUBLE":{"n":"FACTDOUBLE","a":"( x )"},"FLOOR":{"n":"FLOOR","a":"( x, significance )"},"GCD":{"n":"GCD","a":"( argument-list )"},"INT":{"n":"INT","a":"( x )"},"LCM":{"n":"LCM","a":"( argument-list )"},"LN":{"n":"LN","a":"( x )"},"LOG":{"n":"LOG","a":"( x [ , base ] )"},"LOG10":{"n":"LOG10","a":"( x )"},"MDETERM":{"n":"MDETERM","a":"( array )"},"MINVERSE":{"n":"MINVERSE","a":"( array )"},"MMULT":{"n":"MMULT","a":"( array1, array2 )"},"MOD":{"n":"MOD","a":"( x, y )"},"MROUND":{"n":"MROUND","a":"( x, multiple )"},"MULTINOMIAL":{"n":"MULTINOMIAL","a":"( argument-list )"},"ODD":{"n":"ODD","a":"( x )"},"PI":{"n":"PI","a":"()"},"POWER":{"n":"POWER","a":"( x, y )"},"PRODUCT":{"n":"PRODUCT","a":"( argument-list )"},"QUOTIENT":{"n":"QUOTIENT","a":"( dividend , divisor )"},"RADIANS":{"n":"RADIANS","a":"( angle )"},"RAND":{"n":"RAND","a":"()"},"RANDBETWEEN":{"n":"RANDBETWEEN","a":"( lower-bound , upper-bound )"},"ROMAN":{"n":"ROMAN","a":"( number, form )"},"ROUND":{"n":"ROUND","a":"( x , number-digits )"},"ROUNDDOWN":{"n":"ROUNDDOWN","a":"( x , number-digits )"},"ROUNDUP":{"n":"ROUNDUP","a":"( x , number-digits )"},"SERIESSUM":{"n":"SERIESSUM","a":"( input-value , initial-power , step , coefficients )"},"SIGN":{"n":"SIGN","a":"( x )"},"SIN":{"n":"SIN","a":"( x )"},"SINH":{"n":"SINH","a":"( x )"},"SQRT":{"n":"SQRT","a":"( x )"},"SQRTPI":{"n":"SQRTPI","a":"( x )"},"SUM":{"n":"СУММ","a":"( argument-list )"},"SUMIF":{"n":"SUMIF","a":"( cell-range, selection-criteria [ , sum-range ] )"},"SUMPRODUCT":{"n":"SUMPRODUCT","a":"( argument-list )"},"SUMSQ":{"n":"SUMSQ","a":"( argument-list )"},"SUMX2MY2":{"n":"SUMX2MY2","a":"( array-1 , array-2 )"},"SUMX2PY2":{"n":"SUMX2PY2","a":"( array-1 , array-2 )"},"SUMXMY2":{"n":"SUMXMY2","a":"( array-1 , array-2 )"},"TAN":{"n":"TAN","a":"( x )"},"TANH":{"n":"TANH","a":"( x )"},"TRUNC":{"n":"TRUNC","a":"( x [ , number-digits ] )"},"ADDRESS":{"n":"ADDRESS","a":"( row-number , col-number [ , [ ref-type ] [ , [ A1-ref-style-flag ] [ , sheet-name ] ] ] )"},"CHOOSE":{"n":"CHOOSE","a":"( index , argument-list )"},"COLUMN":{"n":"COLUMN","a":"( [ reference ] )"},"COLUMNS":{"n":"COLUMNS","a":"( array )"},"HLOOKUP":{"n":"HLOOKUP","a":"( lookup-value , table-array , row-index-num [ , [ range-lookup-flag ] ] )"},"INDEX":{"n":"INDEX","a":"( array , [ row-number ] [ , [ column-number ] ] ) INDEX( reference , [ row-number ] [ , [ column-number ] [ , [ area-number ] ] ] )"},"INDIRECT":{"n":"INDIRECT","a":"( ref-text [ , [ A1-ref-style-flag ] ] )"},"LOOKUP":{"n":"LOOKUP","a":"( lookup-value , lookup-vector , result-vector )"},"MATCH":{"n":"MATCH","a":"( lookup-value , lookup-array [ , [ match-type ]] )"},"OFFSET":{"n":"OFFSET","a":"( reference , rows , cols [ , [ height ] [ , [ width ] ] ] )"},"ROW":{"n":"ROW","a":"( [ reference ] )"},"ROWS":{"n":"ROWS","a":"( array )"},"TRANSPOSE":{"n":"TRANSPOSE","a":"( array )"},"VLOOKUP":{"n":"VLOOKUP","a":"( lookup-value , table-array , col-index-num [ , [ range-lookup-flag ] ] )"},"ERROR.TYPE":{"n":"ERROR.TYPE","a":"(value)"},"ISBLANK":{"n":"ISBLANK","a":"(value)"},"ISERR":{"n":"ISERR","a":"(value)"},"ISERROR":{"n":"ISERROR","a":"(value)"},"ISEVEN":{"n":"ISEVEN","a":"(number)"},"ISLOGICAL":{"n":"ISLOGICAL","a":"(value)"},"ISNA":{"n":"ISNA","a":"(value)"},"ISNONTEXT":{"n":"ISNONTEXT","a":"(value)"},"ISNUMBER":{"n":"ISNUMBER","a":"(value)"},"ISODD":{"n":"ISODD","a":"(number)"},"ISREF":{"n":"ISREF","a":"(value)"},"ISTEXT":{"n":"ISTEXT","a":"(value)"},"N":{"n":"N","a":"(value)"},"NA":{"n":"NA","a":"()"},"TYPE":{"n":"TYPE","a":"(value)"},"AND":{"n":"AND","a":"(logical1, logical2, ...)"},"FALSE":{"n":"FALSE","a":"()"},"IF":{"n":"IF","a":"(logical_test, value_if_true, value_if_false)"},"IFERROR":{"n":"IFERROR","a":"(value, value_if_error)"},"NOT":{"n":"NOT","a":"(logical)"},"OR":{"n":"OR","a":"(logical1, logical2, ...)"},"TRUE":{"n":"TRUE","a":"()"}}'))
//api.asc_setViewerMode(true);
var aDialogNames = [];
var bIsUpdateChartProperties = false;
var bIsReopenDialog = false;
......@@ -533,7 +532,6 @@
});
api.asc_SetFontsPath("../Fonts/");
//api.asc_setViewerMode(true);
function getURLParameter(name) {
return (RegExp(name + '=' + '(.+?)(&|$)').exec(location.search)||[,null])[1];
......
PowerPoint/api.js
View file @ 6c720898
......@@ -376,7 +376,7 @@ asc_docs_api.prototype._coAuthoringInitEnd = function() {
if (isDisconnectAtAll) {
// Посылаем наверх эвент об отключении от сервера
t.asc_fireCallback("asc_onCoAuthoringDisconnect");
t.SetViewMode(true, true);
t.asc_setViewMode(true);
t.sync_ErrorCallback(isCloseCoAuthoring ? c_oAscError.ID.UserDrop : c_oAscError.ID.CoAuthoringDisconnect, c_oAscError.Level.NoCritical);
}
};
......@@ -406,15 +406,6 @@ asc_docs_api.prototype.sync_CollaborativeChanges = function()
this.asc_fireCallback("asc_onCollaborativeChanges");
};
// server disconnect
asc_docs_api.prototype.asc_coAuthoringDisconnect = function () {
this.CoAuthoringApi.disconnect();
this.isCoAuthoringEnable = false;
//Just set viewer mode
this.SetViewMode(true);
};
asc_docs_api.prototype.asyncServerIdEndLoaded = function () {
this.ServerIdWaitComplete = true;
if (true == this.ServerImagesWaitComplete)
......@@ -3528,7 +3519,7 @@ asc_docs_api.prototype.asyncFontsDocumentEndLoaded = function()
if (this.isLoadNoCutFonts)
{
this.isLoadNoCutFonts = false;
this.SetViewMode(false);
this.asc_setViewMode(false);
return;
}
......@@ -3765,7 +3756,7 @@ asc_docs_api.prototype.OpenDocumentEndCallback = function()
}
if (this.isViewMode)
this.SetViewMode(true);
this.asc_setViewMode(true);
// Меняем тип состояния (на никакое)
this.advancedOptionsAction = c_oAscAdvancedOptionsAction.None;
......@@ -4359,7 +4350,7 @@ asc_docs_api.prototype.SetDeviceInputHelperId = function(idKeyboard)
asc_docs_api.prototype.getViewMode = function() {
return this.isViewMode;
};
asc_docs_api.prototype.SetViewMode = function(isViewMode) {
asc_docs_api.prototype.asc_setViewMode = function(isViewMode) {
if (isViewMode) {
this.isViewMode = true;
this.ShowParaMarks = false;
......@@ -4395,6 +4386,9 @@ asc_docs_api.prototype.SetViewMode = function(isViewMode) {
}
}
};
asc_docs_api.prototype.SetViewMode = function(isViewMode) {
this.asc_setViewMode(isViewMode);
};
asc_docs_api.prototype.SetUseEmbeddedCutFonts = function(bUse)
{
......
PowerPoint/apiExport.js
View file @ 6c720898
......@@ -351,6 +351,7 @@ asc_docs_api.prototype['SetPaintFormat'] = asc_docs_api.prototype.SetPaintFormat
asc_docs_api.prototype['sync_PaintFormatCallback'] = asc_docs_api.prototype.sync_PaintFormatCallback;
asc_docs_api.prototype['ClearFormating'] = asc_docs_api.prototype.ClearFormating;
asc_docs_api.prototype['SetDeviceInputHelperId'] = asc_docs_api.prototype.SetDeviceInputHelperId;
asc_docs_api.prototype['asc_setViewMode'] = asc_docs_api.prototype.asc_setViewMode;
asc_docs_api.prototype['SetViewMode'] = asc_docs_api.prototype.SetViewMode;
asc_docs_api.prototype['SetUseEmbeddedCutFonts'] = asc_docs_api.prototype.SetUseEmbeddedCutFonts;
asc_docs_api.prototype['IsNeedDefaultFonts'] = asc_docs_api.prototype.IsNeedDefaultFonts;
......
PowerPoint/menu/main_menu.js
View file @ 6c720898
......@@ -1109,7 +1109,6 @@ $(document).ready(function(){
case "td_formatmodel":
//console.log("td_formatmodel");
editor.SetPaintFormat(true);
//editor.SetViewMode(false);
break;
}
......@@ -3050,7 +3049,7 @@ $(document).ready(function(){
c_DocInfo.put_UserName( globalCurentUser );
var isViewMode = "true" == getURLParameter("isViewMode");
editor.SetViewMode(isViewMode);
editor.asc_setViewMode(isViewMode);
editor.asc_setDocInfo(c_DocInfo);
editor.asc_getEditorPermissions();
......
Word/api.js
View file @ 6c720898
......@@ -1077,7 +1077,7 @@ asc_docs_api.prototype._coAuthoringInitEnd = function() {
if (isDisconnectAtAll) {
// Посылаем наверх эвент об отключении от сервера
t.asc_fireCallback("asc_onCoAuthoringDisconnect");
t.SetViewMode(true);
t.asc_setViewMode(true);
t.sync_ErrorCallback(isCloseCoAuthoring ? c_oAscError.ID.UserDrop : c_oAscError.ID.CoAuthoringDisconnect, c_oAscError.Level.NoCritical);
}
};
......@@ -1085,15 +1085,6 @@ asc_docs_api.prototype._coAuthoringInitEnd = function() {
this.CoAuthoringApi.init(this.User, this.documentId, this.documentCallbackUrl, 'fghhfgsjdgfjs', c_oEditorId.Word, this.documentFormatSave);
};
// server disconnect
asc_docs_api.prototype.asc_coAuthoringDisconnect = function () {
this.CoAuthoringApi.disconnect();
this.isCoAuthoringEnable = false;
// Выставляем view-режим
this.SetViewMode(true);
};
/////////////////////////////////////////////////////////////////////////
//////////////////////////SpellChecking api//////////////////////////////
/////////////////////////////////////////////////////////////////////////
......@@ -5433,7 +5424,7 @@ asc_docs_api.prototype.asyncFontsDocumentEndLoaded = function()
if (this.isLoadNoCutFonts)
{
this.isLoadNoCutFonts = false;
this.SetViewMode(false);
this.asc_setViewMode(false);
return;
}
......@@ -5629,7 +5620,7 @@ asc_docs_api.prototype.asyncImagesDocumentEndLoaded = function()
this.WordControl.InitControl();
if (this.isViewMode)
this.SetViewMode(true);
this.asc_setViewMode(true);
return;
}
......@@ -5785,7 +5776,7 @@ asc_docs_api.prototype.OpenDocumentEndCallback = function()
this.WordControl.m_oDrawingDocument.SendMathToMenu();
if (this.isViewMode)
this.SetViewMode(true);
this.asc_setViewMode(true);
// Меняем тип состояния (на никакое)
this.advancedOptionsAction = c_oAscAdvancedOptionsAction.None;
......@@ -6283,7 +6274,7 @@ asc_docs_api.prototype.add_SectionBreak = function(_Type)
asc_docs_api.prototype.getViewMode = function() {
return this.isViewMode;
};
asc_docs_api.prototype.SetViewMode = function(isViewMode) {
asc_docs_api.prototype.asc_setViewMode = function(isViewMode) {
if (isViewMode) {
this.asc_SpellCheckDisconnect();
......@@ -6326,6 +6317,9 @@ asc_docs_api.prototype.SetViewMode = function(isViewMode) {
this.WordControl.OnResize(true);
}
};
asc_docs_api.prototype.SetViewMode = function(isViewMode) {
this.asc_setViewMode(isViewMode);
};
asc_docs_api.prototype.SetUseEmbeddedCutFonts = function(bUse)
{
......
Word/apiExport.js
View file @ 6c720898
......@@ -473,6 +473,7 @@ asc_docs_api.prototype['StartChangeWrapPolygon'] = asc_docs_api.prototype.StartC
asc_docs_api.prototype['ClearFormating'] = asc_docs_api.prototype.ClearFormating;
asc_docs_api.prototype['GetSectionInfo'] = asc_docs_api.prototype.GetSectionInfo;
asc_docs_api.prototype['add_SectionBreak'] = asc_docs_api.prototype.add_SectionBreak;
asc_docs_api.prototype['asc_setViewMode'] = asc_docs_api.prototype.asc_setViewMode;
asc_docs_api.prototype['SetViewMode'] = asc_docs_api.prototype.SetViewMode;
asc_docs_api.prototype['SetUseEmbeddedCutFonts'] = asc_docs_api.prototype.SetUseEmbeddedCutFonts;
asc_docs_api.prototype['IsNeedDefaultFonts'] = asc_docs_api.prototype.IsNeedDefaultFonts;
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7