Merge branch 'develop' of https://github.com/ONLYOFFICE/sdkjs into develop

common/editorscommon.js

@@ -2665,7 +2665,7 @@ CUserCacheColor.prototype.init = function(nColor) {
 };
 
   function loadScript(url, callback) {
-    if (window["NATIVE_EDITOR_ENJINE"] === true)
+    if (window["NATIVE_EDITOR_ENJINE"] === true || window["Native"] !== undefined)
     {
         callback();
         return;

word/api.js

@@ -264,6 +264,7 @@ function asc_docs_api(name)
 
   this.isCoMarksDraw = false;
   this.tmpCoMarksDraw = false;
+  this.tmpViewRulers = null;
 
 	// Spell Checking
 	this.SpellCheckApi = (window["AscDesktopEditor"] === undefined) ? new AscCommon.CSpellCheckApi() : new CSpellCheckApi_desktop();
@@ -6091,10 +6092,14 @@ asc_docs_api.prototype.asc_SetDocumentPlaceChangedEnabled = function(bEnabled)
 
 asc_docs_api.prototype.asc_SetViewRulers = function(bRulers)
 {
-  return;
     //if (false === this.bInit_word_control || true === this.isViewMode)
     //    return;
 
+  if (!this.isLoadFullApi) {
+    this.tmpViewRulers = bRulers;
+    return;
+  }
+
     if (this.WordControl.m_bIsRuler != bRulers)
     {
         this.WordControl.m_bIsRuler = bRulers;
@@ -6795,6 +6800,9 @@ asc_docs_api.prototype._onEndLoadSdk = function() {
   if (this.tmpFontRenderingMode) {
     this.SetFontRenderingMode(this.tmpFontRenderingMode);
   }
+  if (null !== this.tmpViewRulers) {
+    this.asc_SetViewRulers(this.tmpViewRulers);
+  }
 
   this.asc_setViewMode(this.isViewMode);
   this.asc_setDrawCollaborationMarks(this.tmpCoMarksDraw);