Commit ad505a5c authored by Alexey Golubev's avatar Alexey Golubev Committed by GitHub

Merge pull request #182 from ONLYOFFICE/feature/pre5.0.3

Feature/pre5.0.3
parents bc86a987 06f9427a
......@@ -1368,6 +1368,15 @@
baseEditorsApi.prototype.Input_UpdatePos = function()
{
};
baseEditorsApi.prototype["setInputParams"] = function(_obj)
{
window["AscInputMethod"] = window["AscInputMethod"] || {};
for (var _prop in _obj)
{
window["AscInputMethod"][_prop] = _obj[_prop];
}
};
baseEditorsApi.prototype.asc_addSignatureLine = function (sGuid, sSigner, sSigner2, sEmail, Width, Height, sImgUrl) {
......
......@@ -196,7 +196,7 @@
ifr.id = "plugin_iframe";
var _add = this.current.baseUrl == "" ? this.path : this.current.baseUrl;
ifr.src = _add + this.current.variations[this.currentVariation].url;
ifr.style.position = 'absolute';
ifr.style.position = AscCommon.AscBrowser.isIE ? 'fixed' : "absolute";
ifr.style.top = '-100px';
ifr.style.left = '0px';
ifr.style.width = '10000px';
......@@ -247,6 +247,9 @@
init : function()
{
if (!this.startData)
return;
switch (this.current.variations[this.currentVariation].initDataType)
{
case Asc.EPluginDataType.text:
......@@ -374,7 +377,7 @@
onExternalMouseUp : function()
{
if (!this.current)
if (!this.current || !this.startData)
return;
this.startData.setAttribute("type", "onExternalMouseUp");
......
......@@ -34,8 +34,7 @@
(function(window, undefined)
{
window["AscInputMethod"] = {};
window["AscInputMethod"]["SogouPinyin"] = false;
window["AscInputMethod"] = window["AscInputMethod"] || {};
///
// такие методы нужны в апи
// baseEditorsApi.prototype.Begin_CompositeInput = function()
......@@ -1114,7 +1113,7 @@
this.clear();
var isSendToApi = true;
if (window["AscInputMethod"]["SogouPinyin"])
if (true === window["AscInputMethod"]["SogouPinyin"])
{
if (AscCommon.AscBrowser.isChrome)
{
......
......@@ -675,6 +675,9 @@ function CEditorPage(api)
styleContent += ".btn-pointer:active { background-position: -20px -100px; }";
styleContent += ".btn-text-default-img2 { background-repeat: no-repeat; position: absolute; background-color: #7d858c; border: none; color: #7d858c; font-size: 11px; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; height: 22px; cursor: pointer; }";
styleContent += ".btn-text-default-img2:focus { outline: 0; outline-offset: 0; }";
styleContent += ".btn-text-default::-moz-focus-inner { border: 0; padding: 0; }";
styleContent += ".btn-text-default-img::-moz-focus-inner { border: 0; padding: 0; }";
styleContent += ".btn-text-default-img2::-moz-focus-inner { border: 0; padding: 0; }";
var style = document.createElement('style');
......
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