require

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@68071 954022d7-b5bf-4e40-9824-e11837661b57

require
git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@68071 954022d7-b5bf-4e40-9824-e11837661b57
700418de · Dmitry.Shahtanov · Alexander.Trofimov · c7d7ef0c · 700418de · 700418de
Commit 700418de authored Feb 09, 2016 by Dmitry.Shahtanov Committed by Alexander.Trofimov May 18, 2016
3 changed files
--- a/Common/3rdparty/XRegExp/xregexp-all-min.js
+++ b/Common/3rdparty/XRegExp/xregexp-all-min.js
--- a/Common/3rdparty/XRegExp/xregexp-all.js
+++ b/Common/3rdparty/XRegExp/xregexp-all.js
--- a/Common/editorscommon.js
+++ b/Common/editorscommon.js
@@ -64,9 +64,7 @@ String.prototype.strongMatch = function(regExp){
    return false;
 };

-if (!window['IS_NATIVE_EDITOR']) {
-    if(!window["XRegExp"]){window["XRegExp"] = require("xregexp");}
-}
+if (typeof require =="function" && !window["XRegExp"]){window["XRegExp"] = require("xregexp");}

 var g_oZipChanges = null;
 var g_sDownloadServiceLocalUrl = "/downloadas";