Commit 38791ab6 authored by Alexey.Musinov's avatar Alexey.Musinov

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

parents 0b8a3a47 329eba27
.idea/
Common/AllFonts.js
Common/Images/fonts_thumbnail.png
Common/Images/fonts_thumbnail@2x.png
cell/sdk-all.js
slide/sdk-all.js
word/sdk-all.js
**/node_modules
common/AllFonts.js
common/Images/fonts_thumbnail.png
common/Images/fonts_thumbnail@2x.png
copy "D:\Projects\wwwrootOffice\apps\documenteditor\main\index.html" "D:\Projects\wwwrootOffice\apps\documenteditor\main\index_new.html"
copy "D:\Projects\activex\AVS\Sources\TeamlabOffice\trunk\OfficeWeb\Word\index.html" "D:\Projects\wwwrootOffice\apps\documenteditor\main\index.html"
copy "D:\Projects\wwwrootOffice\apps\documenteditor\main\app.js" "D:\Projects\wwwrootOffice\apps\documenteditor\main\app_new.js"
copy "D:\Projects\activex\AVS\Sources\TeamlabOffice\trunk\OfficeWeb\Word\app.js" "D:\Projects\wwwrootOffice\apps\documenteditor\main\app.js"
copy "D:\Projects\wwwrootOffice\apps\spreadsheeteditor\main\index.html" "D:\Projects\wwwrootOffice\apps\spreadsheeteditor\main\index_new.html"
copy "D:\Projects\activex\AVS\Sources\TeamlabOffice\trunk\OfficeWeb\Excel\index.html" "D:\Projects\wwwrootOffice\apps\spreadsheeteditor\main\index.html"
copy "D:\Projects\wwwrootOffice\apps\spreadsheeteditor\main\app.js" "D:\Projects\wwwrootOffice\apps\spreadsheeteditor\main\app_new.js"
copy "D:\Projects\activex\AVS\Sources\TeamlabOffice\trunk\OfficeWeb\Excel\app.js" "D:\Projects\wwwrootOffice\apps\spreadsheeteditor\main\app.js"
copy "D:\Projects\wwwrootOffice\apps\presentationeditor\main\app.js" "D:\Projects\wwwrootOffice\apps\presentationeditor\main\app_new.js"
copy "D:\Projects\activex\AVS\Sources\TeamlabOffice\trunk\OfficeWeb\PowerPoint\app.js" "D:\Projects\wwwrootOffice\apps\presentationeditor\main\app.js"
copy "D:\Projects\wwwrootOffice\apps\presentationeditor\main\index.html" "D:\Projects\wwwrootOffice\apps\presentationeditor\main\index_new.html"
copy "D:\Projects\activex\AVS\Sources\TeamlabOffice\trunk\OfficeWeb\PowerPoint\index.html" "D:\Projects\wwwrootOffice\apps\presentationeditor\main\index.html"
copy "D:\Projects\wwwrootOffice\apps\common\main\lib\component\ComboBoxFonts.js" "D:\Projects\wwwrootOffice\apps\common\main\lib\component\ComboBoxFonts_new.js"
copy "D:\Projects\activex\AVS\Sources\TeamlabOffice\trunk\OfficeWeb\Common\ComboBoxFonts.js" "D:\Projects\wwwrootOffice\apps\common\main\lib\component\ComboBoxFonts.js"
This diff is collapsed.
......@@ -2,4 +2,4 @@
cd /D %~dp0
@echo on
call grunt.cmd --no-color
\ No newline at end of file
call grunt --no-color
\ No newline at end of file
@echo off
cd /D %~dp0
SET GRUNT_OLD=grunt@0.3.17
SET GRUNT_CLI=grunt-cli
echo Check is there old grunt installed.
call npm list -g %GRUNT_OLD% && call npm uninstall -g grunt
echo Installation grunt-cli
call npm list -g %GRUNT_CLI% || call npm install -g %GRUNT_CLI%
echo Installation
call npm install -g grunt-cli
call npm install
{
"name": "common",
"version": "0.0.0",
"homepage": "http://www.teamlab.com",
"private": true,
"dependencies": {
"grunt": "0.4.2",
"grunt-contrib-clean": "0.5.0",
"grunt-contrib-concat": "0.3.0",
"grunt-contrib-copy": "0.5.0",
"grunt-exec": "0.4.5",
"grunt-replace": "0.7.3",
"grunt-closure-tools": "0.9.9"
}
}
\ No newline at end of file
"name": "common",
"version": "0.0.0",
"homepage": "http://www.teamlab.com",
"private": true,
"dependencies": {
"google-closure-compiler": "^20160315.0.0",
"grunt": "0.4.5",
"grunt-contrib-clean": "0.5.0",
"grunt-contrib-concat": "0.3.0",
"grunt-contrib-copy": "0.5.0",
"grunt-exec": "0.4.5",
"grunt-replace": "0.7.3"
}
}
......@@ -169,7 +169,7 @@
"dst": "../../word/sdk-all.js",
"externs": [
"../../common/Native/jquery_native.js",
"../../common/3rdparty/XRegExp/xregexp-all-min.js"
"../../../web-apps/vendor/xregexp/xregexp-all-min.js"
],
"map": "sdk-all.js.map",
"log": "../../word/Build/Log"
......
......@@ -9,7 +9,7 @@
},
"compile": {
"sdk": {
"src": [
"common": [
"../../common/Build/License.js",
"../../common/browser.js",
"../../common/docscoapicommon.js",
......@@ -23,7 +23,7 @@
"../../common/Charts/DrawingArea.js",
"../../common/Charts/DrawingObjects.js",
"../../common/Charts/ChartsDrawer.js",
"../../common/Charts/3DTransformation.js",
"../../common/Charts/3DTransformation.js",
"../../common/FontsFreeType/font_engine.js",
"../../common/FontsFreeType/FontFile.js",
"../../common/FontsFreeType/FontManager.js",
......@@ -44,7 +44,7 @@
"../../cell/model/ConditionalFormatting.js",
"../../cell/model/FormulaObjects/parserFormula.js",
"../../cell/model/FormulaObjects/_xlfnFunctions.js",
"../../cell/model/FormulaObjects/dateandtimeFunctions.js",
"../../cell/model/FormulaObjects/dateandtimeFunctions.js",
"../../cell/model/FormulaObjects/engineeringFunctions.js",
"../../cell/model/FormulaObjects/cubeFunctions.js",
"../../cell/model/FormulaObjects/databaseFunctions.js",
......@@ -133,10 +133,10 @@
"../../word/Editor/Document.js",
"../../word/Editor/DocumentContent.js",
"../../word/Editor/Table.js",
"../../word/Editor/Table/TableRecalculate.js",
"../../word/Editor/Table/TableDraw.js",
"../../word/Editor/Table/TableRow.js",
"../../word/Editor/Table/TableCell.js",
"../../word/Editor/Table/TableRecalculate.js",
"../../word/Editor/Table/TableDraw.js",
"../../word/Editor/Table/TableRow.js",
"../../word/Editor/Table/TableCell.js",
"../../word/Editor/Serialize2.js",
"../../word/Editor/FontClassification.js",
"../../word/Editor/Spelling.js",
......@@ -155,27 +155,31 @@
"../../word/Math/operators.js",
"../../word/Math/accent.js",
"../../word/Math/borderBox.js",
"../../common/CollaborativeEditingBase.js",
"../../common/CollaborativeEditingBase.js",
"../../cell/model/DrawingObjects/GlobalCounters.js",
"../../word/apiCommon.js",
"../../cell/apiCommonExport.js",
"../../common/apiBase.js",
"../../cell/api.js",
"../../common/Private/license.js",
"../../cell/Private/comments.js"
"../../common/Private/license.js",
"../../cell/Private/comments.js"
],
"desktop": [
"../../common/Local/common.js",
"../../cell/Local/api.js"
],
"dst": "../../cell/sdk-all.js",
"externs": [
"../../common/Build/Externs.js",
"../../common/3rdparty/jquery/jquery.min.js",
"../../common/3rdparty/Underscore/underscore-min.js",
"../../common/3rdparty/Sockjs/sockjs.min.js",
"../../common/3rdparty/XRegExp/xregexp-all-min.js",
"../../common/3rdparty/jszip/jszip.min.js",
"../../common/3rdparty/jszip-utils/jszip-utils.min.js",
"../../common/3rdparty/jsrsasign/jsrsasign-latest-all-min.js",
"../../common/3rdparty/perfect-scrollbar/jquery.mousewheel.js",
"../../common/3rdparty/perfect-scrollbar/perfect-scrollbar.js"
"../../../web-apps/vendor/jquery/jquery.min.js",
"../../../web-apps/vendor/underscore/underscore-min.js",
"../../../web-apps/vendor/sockjs/sockjs.min.js",
"../../../web-apps/vendor/xregexp/xregexp-all-min.js",
"../../../web-apps/vendor/jszip/jszip.min.js",
"../../../web-apps/vendor/jszip-utils/jszip-utils.min.js",
"../../../web-apps/vendor/jsrsasign/jsrsasign-latest-all-min.js",
"../../../web-apps/vendor/perfect-scrollbar/src/jquery.mousewheel.js",
"../../../web-apps/vendor/perfect-scrollbar/src/perfect-scrollbar.js"
],
"map": "sdk-all.js.map",
"log": "../../cell/Build/Log"
......@@ -192,70 +196,6 @@
"url": "http://localhost:8080/sdkjs/cell"
}
},
"deploy": {
"copy": {
"common": {
"expand": true,
"cwd": "../../common/Charts/",
"src": "DrawingObjects.js",
"dest": "<%= pkg.menu_path %>/cell/model/"
},
"api": {
"expand": true,
"cwd": "../../cell/",
"src": [
"../common/apiBase.js",
"api.js",
"apiDefines.js",
"view/EventsController.js",
"view/HandlerList.js",
"../common/AdvancedOptions.js",
"model/CellInfo.js",
"model/CellComment.js",
"utils/utils.js",
"css/*.css"
],
"dest": "<%= pkg.menu_path %>/cell/"
},
"sdk": {
"expand": true,
"cwd": "../../cell/",
"src": "sdk-all.js",
"dest": "<%= pkg.menu_path %>/cell/"
},
"doc": {
"expand": true,
"cwd": "../../cell/",
"src": "document/**",
"dest": "<%= pkg.menu_path %>/cell/"
},
"log": {
"expand": true,
"cwd": "../../cell/",
"src": "sdk-all.js.map",
"dest": "<%= pkg.menu_path %>/cell/"
},
"samlpe": {
"expand": true,
"cwd": "../../cell/",
"src": "Spreadsheet.html.deploy",
"dest": "<%= pkg.menu_path %>/cell/"
},
"samlpe_files": {
"expand": true,
"cwd": "../../cell/",
"src": [
"jquery/jquery-1.7.1.js",
"css/nav-buttons.png",
"css/gradient.png"
],
"dest": "<%= pkg.menu_path %>/cell/"
}
},
"store_log": {
"dst": "../../cell/Build/Log"
}
},
"tasks": {
"build": [
"increment_build",
......
......@@ -9,7 +9,7 @@
},
"compile": {
"sdk": {
"src": [
"common": [
"../../common/Build/License.js",
"../../common/browser.js",
"../../common/FontsFreeType/font_engine.js",
......@@ -38,17 +38,17 @@
"../../word/Editor/Styles.js",
"../../word/Editor/Numbering.js",
"../../word/Drawing/Metafile.js",
"../../common/CollaborativeEditingBase.js",
"../../common/CollaborativeEditingBase.js",
"../../slide/Editor/CollaborativeEditing.js",
"../../word/Drawing/GraphicsEvents.js",
"../../word/Drawing/WorkEvents.js",
"../../common/Controls.js",
"../../word/Drawing/Rulers.js",
"../../word/Editor/Table.js",
"../../word/Editor/Table/TableRecalculate.js",
"../../word/Editor/Table/TableDraw.js",
"../../word/Editor/Table/TableRow.js",
"../../word/Editor/Table/TableCell.js",
"../../word/Editor/Table/TableRecalculate.js",
"../../word/Editor/Table/TableDraw.js",
"../../word/Editor/Table/TableRow.js",
"../../word/Editor/Table/TableCell.js",
"../../word/Editor/Common.js",
"../../word/Editor/Sections.js",
"../../common/scroll.js",
......@@ -134,8 +134,8 @@
"../../slide/Editor/Format/GraphicFrame.js",
"../../common/apiBase.js",
"../../slide/api.js",
"../../common/Private/license.js",
"../../slide/Private/comments.js",
"../../common/Private/license.js",
"../../slide/Private/comments.js",
"../../slide/apiCommon.js",
"../../word/apiCommon.js",
"../../slide/apiExport.js",
......@@ -147,16 +147,20 @@
"../../common/AdvancedOptions.js",
"../../common/Private/Locks.js"
],
"desktop": [
"../../common/Local/common.js",
"../../slide/Local/api.js"
],
"dst": "../../slide/sdk-all.js",
"externs": [
"../../common/Build/Externs.js",
"../../common/3rdparty/jquery/jquery.min.js",
"../../common/3rdparty/Underscore/underscore-min.js",
"../../common/3rdparty/Sockjs/sockjs.min.js",
"../../common/3rdparty/XRegExp/xregexp-all-min.js",
"../../common/3rdparty/jszip/jszip.min.js",
"../../common/3rdparty/jszip-utils/jszip-utils.min.js",
"../../common/3rdparty/jsrsasign/jsrsasign-latest-all-min.js"
"../../../web-apps/vendor/jquery/jquery.min.js",
"../../../web-apps/vendor/underscore/underscore-min.js",
"../../../web-apps/vendor/sockjs/sockjs.min.js",
"../../../web-apps/vendor/xregexp/xregexp-all-min.js",
"../../../web-apps/vendor/jszip/jszip.min.js",
"../../../web-apps/vendor/jszip-utils/jszip-utils.min.js",
"../../../web-apps/vendor/jsrsasign/jsrsasign-latest-all-min.js"
],
"map": "sdk-all.js.map",
"log": "../../slide/Build/Log"
......@@ -174,56 +178,6 @@
"url": "http://localhost:8080/sdkjs/slide"
}
},
"deploy": {
"copy": {
"api": {
"expand": true,
"cwd": "../../slide/",
"src": [
"../common/apiBase.js",
"api.js",
"apiCommon.js",
"apiDefines.js"
],
"dest": "<%= pkg.menu_path %>/slide/"
},
"sdk": {
"expand": true,
"cwd": "../../slide/",
"src": [
"sdk-all.js",
"themes/theme*/**"
],
"dest": "<%= pkg.menu_path %>/slide/"
},
"doc": {
"expand": true,
"cwd": "../../slide/",
"src": "document/**",
"dest": "<%= pkg.menu_path %>/slide/"
},
"log": {
"expand": true,
"cwd": "../../slide/",
"flatten": true,
"src": [
"sdk-all.js.map",
"Build/Log/property.map",
"Build/Log/variable.map"
],
"dest": "<%= pkg.menu_path %>/slide/"
},
"sample": {
"expand": true,
"cwd": "../../slide/",
"src": "index.html.deploy",
"dest": "<%= pkg.menu_path %>/slide/"
}
},
"store_log": {
"dst": "../../slide/Build/Log"
}
},
"tasks": {
"build": [
"increment_build",
......
......@@ -9,7 +9,7 @@
},
"compile": {
"sdk": {
"src": [
"common": [
"../../common/Build/License.js",
"../../common/browser.js",
"../../common/docscoapicommon.js",
......@@ -37,7 +37,7 @@
"../../word/Drawing/translations.js",
"../../common/Charts/charts.js",
"../../common/Charts/ChartsDrawer.js",
"../../common/Charts/3DTransformation.js",
"../../common/Charts/3DTransformation.js",
"../../common/Charts/DrawingArea.js",
"../../common/Charts/DrawingObjects.js",
"../../common/NumFormat.js",
......@@ -94,10 +94,10 @@
"../../word/Editor/Common.js",
"../../word/Editor/DocumentContent.js",
"../../word/Editor/Table.js",
"../../word/Editor/Table/TableRecalculate.js",
"../../word/Editor/Table/TableDraw.js",
"../../word/Editor/Table/TableRow.js",
"../../word/Editor/Table/TableCell.js",
"../../word/Editor/Table/TableRecalculate.js",
"../../word/Editor/Table/TableDraw.js",
"../../word/Editor/Table/TableRow.js",
"../../word/Editor/Table/TableCell.js",
"../../word/Editor/Serialize2.js",
"../../word/Editor/Search.js",
"../../word/Editor/FontClassification.js",
......@@ -107,7 +107,7 @@
"../../word/Drawing/HatchPattern.js",
"../../word/Drawing/ShapeDrawer.js",
"../../word/Drawing/Metafile.js",
"../../common/CollaborativeEditingBase.js",
"../../common/CollaborativeEditingBase.js",
"../../word/Drawing/DrawingDocument.js",
"../../word/Drawing/GraphicsEvents.js",
"../../common/Scrolls/iscroll.js",
......@@ -121,9 +121,9 @@
"../../word/apiDefines.js",
"../../common/apiBase.js",
"../../word/api.js",
"../../common/Private/license.js",
"../../common/Private/versionHistory.js",
"../../word/Private/comments.js",
"../../common/Private/license.js",
"../../common/Private/versionHistory.js",
"../../word/Private/comments.js",
"../../word/Private/StyleManager.js",
"../../word/Private/MailMerge.js",
"../../word/Private/TrackRevisions.js",
......@@ -152,16 +152,20 @@
"../../common/AdvancedOptions.js",
"../../common/Private/Locks.js"
],
"desktop": [
"../../common/Local/common.js",
"../../word/Local/api.js"
],
"dst": "../../word/sdk-all.js",
"externs": [
"../../common/Build/Externs.js",
"../../common/3rdparty/jquery/jquery.min.js",
"../../common/3rdparty/Underscore/underscore-min.js",
"../../common/3rdparty/Sockjs/sockjs.min.js",
"../../common/3rdparty/XRegExp/xregexp-all-min.js",
"../../common/3rdparty/jszip/jszip.min.js",
"../../common/3rdparty/jszip-utils/jszip-utils.min.js",
"../../common/3rdparty/jsrsasign/jsrsasign-latest-all-min.js"
"../../../web-apps/vendor/jquery/jquery.min.js",
"../../../web-apps/vendor/underscore/underscore-min.js",
"../../../web-apps/vendor/sockjs/sockjs.min.js",
"../../../web-apps/vendor/xregexp/xregexp-all-min.js",
"../../../web-apps/vendor/jszip/jszip.min.js",
"../../../web-apps/vendor/jszip-utils/jszip-utils.min.js",
"../../../web-apps/vendor/jsrsasign/jsrsasign-latest-all-min.js"
],
"map": "sdk-all.js.map",
"log": "../../word/Build/Log"
......@@ -178,63 +182,10 @@
"url": "http://localhost:8080/sdkjs/word"
}
},
"deploy": {
"copy": {
"api": {
"expand": true,
"cwd": "../../word/",
"src": [
"../common/apiBase.js",
"api.js",
"apiCommon.js",
"apiDefines.js"
],
"dest": "<%= pkg.menu_path %>/word/"
},
"sdk": {
"expand": true,
"cwd": "../../word/",
"src": "sdk-all.js",
"dest": "<%= pkg.menu_path %>/word/"
},
"doc": {
"expand": true,
"cwd": "../../word/",
"src": "document/**",
"dest": "<%= pkg.menu_path %>/word/"
},
"apisettings": {
"expand": true,
"cwd": "../../common/",
"src": [
"spellcheckapisettings.js",
"commonDefines.js",
"apiCommon.js",
"downloaderfiles.js",
"Images/*.cur",
"Native/jquery_native.js",
"Native/native.js"
],
"dest": "<%= pkg.menu_path %>/common/"
},
"log": {
"expand": true,
"cwd": "../../word/",
"src": [
"Build/Log/property.map",
"Build/Log/variable.map"
],
"dest": "<%= pkg.menu_path %>/word/"
}
},
"store_log": {
"dst": "../../word/Build/Log"
}
},
"tasks": {
"build": [
"increment_build",
"compile_sdk"
]
}
}
}
\ No newline at end of file
{
"closure_compiler": "compiler.jar",
"menu_path": "../../../menu/sdk"
}
\ No newline at end of file
......@@ -2,6 +2,6 @@
cd /D %~dp0
@echo on
call grunt.cmd
call grunt
pause
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
/*
*
* (c) Copyright Ascensio System Limited 2010-2016
*
* This program is freeware. You can redistribute it and/or modify it under the terms of the GNU
* General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html).
* In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that
* Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
*
* THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
* FITNESS FOR A PARTICULAR PURPOSE. For more details, see GNU GPL at https://www.gnu.org/copyleft/gpl.html
*
* You can contact Ascensio System SIA by email at sales@onlyoffice.com
*
* The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display
* Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
*
* Pursuant to Section 7  3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains
* relevant author attributions when distributing the software. If the display of the logo in its graphic
* form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE"
* in every copy of the program you distribute.
* Pursuant to Section 7  3(e) we decline to grant you any rights under trademark law for use of our trademarks.
*
*/
/**
* app.js
*
* Created by Maxim Kadushkin on 21 March 2014
* Copyright (c) 2014 Ascensio System SIA. All rights reserved.
*
*/
'use strict';
require.config({
// The shim config allows us to configure dependencies for
// scripts that do not call define() to register a module
baseUrl: '../../',
paths: {
jquery : '../vendor/jquery/jquery',
underscore : '../vendor/underscore/underscore',
backbone : '../vendor/backbone/backbone',
bootstrap : '../vendor/bootstrap/dist/js/bootstrap',
text : '../vendor/requirejs-text/text',
perfectscrollbar: 'common/main/lib/mods/perfect-scrollbar',
jmousewheel : '../vendor/perfect-scrollbar/src/jquery.mousewheel',
xregexp : '../vendor/xregexp/xregexp-all-min',
sockjs : '../vendor/sockjs/sockjs.min',
jsziputils : '../vendor/jszip-utils/jszip-utils.min',
jsrsasign : '../vendor/jsrsasign/jsrsasign-latest-all-min',
//allfonts : '../sdk/Common/AllFonts',
//sdk : '../sdk/Excel/sdk-all',
api : 'api/documents/api',
core : 'common/main/lib/core/application',
notification : 'common/main/lib/core/NotificationCenter',
keymaster : 'common/main/lib/core/keymaster',
tip : 'common/main/lib/util/Tip',
localstorage : 'common/main/lib/util/LocalStorage',
analytics : 'common/Analytics',
gateway : 'common/Gateway',
locale : 'common/locale',
irregularstack : 'common/IrregularStack'
},
shim: {
underscore: {
exports: '_'
},
backbone: {
deps: [
'underscore',
'jquery'
],
exports: 'Backbone'
},
bootstrap: {
deps: [
'jquery'
]
},
perfectscrollbar: {
deps: [
'jmousewheel'
]
},
notification: {
deps: [
'backbone'
]
},
core: {
deps: [
'backbone',
'notification',
'irregularstack'
]
},
sdk: {
deps: [
'jquery',
'underscore',
'allfonts',
'xregexp',
'sockjs',
'jsziputils',
'jsrsasign'
]
},
gateway: {
deps: [
'jquery'
]
},
analytics: {
deps: [
'jquery'
]
}
}
});
require([
'backbone',
'bootstrap',
'core',
//'sdk',
'api',
'analytics',
'gateway',
'locale',
'jsziputils',
'jsrsasign',
//'allfonts',
'sockjs',
'underscore'
], function (Backbone, Bootstrap, Core) {
Backbone.history.start();
/**
* Application instance with SSE namespace defined
*/
var app = new Backbone.Application({
nameSpace: 'SSE',
autoCreate: false,
controllers : [
'Viewport',
'DocumentHolder',
'CellEditor',
'FormulaDialog',
'Print',
'Toolbar',
'Statusbar',
'RightMenu',
'LeftMenu',
'Main',
'Common.Controllers.Fonts',
'Common.Controllers.Chat',
'Common.Controllers.Comments'
]
});
Common.Locale.apply();
require([
'spreadsheeteditor/main/app/controller/Viewport',
'spreadsheeteditor/main/app/controller/DocumentHolder',
'spreadsheeteditor/main/app/controller/CellEditor',
'spreadsheeteditor/main/app/controller/Toolbar',
'spreadsheeteditor/main/app/controller/Statusbar',
'spreadsheeteditor/main/app/controller/RightMenu',
'spreadsheeteditor/main/app/controller/LeftMenu',
'spreadsheeteditor/main/app/controller/Main',
'spreadsheeteditor/main/app/controller/Print',
'spreadsheeteditor/main/app/view/ParagraphSettings',
'spreadsheeteditor/main/app/view/ImageSettings',
'spreadsheeteditor/main/app/view/ChartSettings',
'spreadsheeteditor/main/app/view/ShapeSettings',
'spreadsheeteditor/main/app/view/TextArtSettings',
'common/main/lib/util/utils',
'common/main/lib/util/LocalStorage',
'common/main/lib/controller/Fonts',
'common/main/lib/controller/Comments',
'common/main/lib/controller/Chat'
], function() {
app.start();
});
});
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
/*
*
* (c) Copyright Ascensio System Limited 2010-2016
*
* This program is freeware. You can redistribute it and/or modify it under the terms of the GNU
* General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html).
* In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that
* Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
*
* THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
* FITNESS FOR A PARTICULAR PURPOSE. For more details, see GNU GPL at https://www.gnu.org/copyleft/gpl.html
*
* You can contact Ascensio System SIA by email at sales@onlyoffice.com
*
* The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display
* Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
*
* Pursuant to Section 7  3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains
* relevant author attributions when distributing the software. If the display of the logo in its graphic
* form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE"
* in every copy of the program you distribute.
* Pursuant to Section 7  3(e) we decline to grant you any rights under trademark law for use of our trademarks.
*
*/
/*
*
* (c) Copyright Ascensio System Limited 2010-2016
*
* This program is freeware. You can redistribute it and/or modify it under the terms of the GNU
* General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html).
* In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that
* Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
*
* THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
* FITNESS FOR A PARTICULAR PURPOSE. For more details, see GNU GPL at https://www.gnu.org/copyleft/gpl.html
*
* You can contact Ascensio System SIA by email at sales@onlyoffice.com
*
* The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display
* Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
*
* Pursuant to Section 7  3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains
* relevant author attributions when distributing the software. If the display of the logo in its graphic
* form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE"
* in every copy of the program you distribute.
* Pursuant to Section 7  3(e) we decline to grant you any rights under trademark law for use of our trademarks.
*
*/
"use strict";
function CCMapIndex()
......@@ -631,7 +631,7 @@ function CFontFile(fileName, faceIndex)
oSizes.oBBox.fMinY = (yMin >> 6);
oSizes.oBBox.fMaxY = (yMax >> 6);
if (this.m_bNeedDoBold)
if (this.m_bNeedDoBold && this.m_oFontManager.IsAdvanceNeedBoldFonts)
oSizes.fAdvanceX += 1;
var dstM = oSizes.oMetrics;
......@@ -710,7 +710,7 @@ function CFontFile(fileName, faceIndex)
pString.SetBBox( nIndex, charSymbolObj.oBBox.fMinX, charSymbolObj.oBBox.fMaxY, charSymbolObj.oBBox.fMaxX, charSymbolObj.oBBox.fMinY );
fPenX += charSymbolObj.fAdvanceX + this.m_fCharSpacing;
if (this.m_bNeedDoBold)
if (this.m_bNeedDoBold && this.m_oFontManager.IsAdvanceNeedBoldFonts)
{
// Когда текст делаем жирным сами, то мы увеличиваем расстояние на 1 пиксель в ширину (независимо от DPI и размера текста всегда 1 пиксель)
fPenX += 1;
......@@ -982,7 +982,7 @@ function CFontFile(fileName, faceIndex)
pString.SetBBox (nIndex, charSymbolObj.oBBox.fMinX, charSymbolObj.oBBox.fMaxY, charSymbolObj.oBBox.fMaxX, charSymbolObj.oBBox.fMinY);
fPenX += charSymbolObj.fAdvanceX + this.m_fCharSpacing;
if (this.m_bNeedDoBold)
if (this.m_bNeedDoBold && this.m_oFontManager.IsAdvanceNeedBoldFonts)
{
// Когда текст делаем жирным сами, то мы увеличиваем расстояние на 1 пиксель в ширину (независимо от DPI и размера текста всегда 1 пиксель)
fPenX += 1;
......@@ -1271,7 +1271,7 @@ function CFontFile(fileName, faceIndex)
}
fPenX += charSymbolObj.fAdvanceX + this.m_fCharSpacing;
if (this.m_bNeedDoBold)
if (this.m_bNeedDoBold && this.m_oFontManager.IsAdvanceNeedBoldFonts)
{
// Когда текст делаем жирным сами, то мы увеличиваем расстояние на 1 пиксель в ширину (независимо от DPI и размера текста всегда 1 пиксель)
//fPenX += 1;
......@@ -1437,7 +1437,7 @@ function CFontFile(fileName, faceIndex)
oSizes.oBBox.fMinY = (yMin >> 6);
oSizes.oBBox.fMaxY = (yMax >> 6);
if (this.m_bNeedDoBold)
if (this.m_bNeedDoBold && this.m_oFontManager.IsAdvanceNeedBoldFonts)
oSizes.fAdvanceX += 1;
var dstM = oSizes.oMetrics;
......
/*
*
* (c) Copyright Ascensio System Limited 2010-2016
*
* This program is freeware. You can redistribute it and/or modify it under the terms of the GNU
* General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html).
* In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that
* Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
*
* THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
* FITNESS FOR A PARTICULAR PURPOSE. For more details, see GNU GPL at https://www.gnu.org/copyleft/gpl.html
*
* You can contact Ascensio System SIA by email at sales@onlyoffice.com
*
* The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display
* Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
*
* Pursuant to Section 7  3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains
* relevant author attributions when distributing the software. If the display of the logo in its graphic
* form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE"
* in every copy of the program you distribute.
* Pursuant to Section 7  3(e) we decline to grant you any rights under trademark law for use of our trademarks.
*
*/
/*
*
* (c) Copyright Ascensio System Limited 2010-2016
*
* This program is freeware. You can redistribute it and/or modify it under the terms of the GNU
* General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html).
* In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that
* Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
*
* THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
* FITNESS FOR A PARTICULAR PURPOSE. For more details, see GNU GPL at https://www.gnu.org/copyleft/gpl.html
*
* You can contact Ascensio System SIA by email at sales@onlyoffice.com
*
* The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display
* Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
*
* Pursuant to Section 7  3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains
* relevant author attributions when distributing the software. If the display of the logo in its graphic
* form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE"
* in every copy of the program you distribute.
* Pursuant to Section 7  3(e) we decline to grant you any rights under trademark law for use of our trademarks.
*
*/
"use strict";
var g_bIsAppleDevices = AscBrowser.isAppleDevices;
......@@ -1335,6 +1335,8 @@ function CFontManager()
this.LOAD_MODE = 40970;
this.IsAdvanceNeedBoldFonts = true;
this.AfterLoad = function()
{
if (null == this.m_pFont)
......@@ -1719,4 +1721,9 @@ function CFontManager()
this.LOAD_MODE = 40970;
}
}
this.SetAdvanceNeedBoldFonts = function(value)
{
this.IsAdvanceNeedBoldFonts = value;
}
}
\ No newline at end of file
/*
*
* (c) Copyright Ascensio System Limited 2010-2016
*
* This program is freeware. You can redistribute it and/or modify it under the terms of the GNU
* General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html).
* In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that
* Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
*
* THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
* FITNESS FOR A PARTICULAR PURPOSE. For more details, see GNU GPL at https://www.gnu.org/copyleft/gpl.html
*
* You can contact Ascensio System SIA by email at sales@onlyoffice.com
*
* The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display
* Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
*
* Pursuant to Section 7  3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains
* relevant author attributions when distributing the software. If the display of the logo in its graphic
* form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE"
* in every copy of the program you distribute.
* Pursuant to Section 7  3(e) we decline to grant you any rights under trademark law for use of our trademarks.
*
*/
/**
* app.js
*
* Created by Julia Radzhabova on 26 March 2014
* Copyright (c) 2014 Ascensio System SIA. All rights reserved.
*
*/
'use strict';
require.config({
// The shim config allows us to configure dependencies for
// scripts that do not call define() to register a module
baseUrl: '../../',
paths: {
jquery : '../vendor/jquery/jquery',
underscore : '../vendor/underscore/underscore',
backbone : '../vendor/backbone/backbone',
bootstrap : '../vendor/bootstrap/dist/js/bootstrap',
text : '../vendor/requirejs-text/text',
perfectscrollbar: 'common/main/lib/mods/perfect-scrollbar',
jmousewheel : '../vendor/perfect-scrollbar/src/jquery.mousewheel',
xregexp : '../vendor/xregexp/xregexp-all-min',
sockjs : '../vendor/sockjs/sockjs.min',
jsziputils : '../vendor/jszip-utils/jszip-utils.min',
jsrsasign : '../vendor/jsrsasign/jsrsasign-latest-all-min',
//allfonts : '../sdk/Common/AllFonts',
//sdk : '../sdk/PowerPoint/sdk-all',
api : 'api/documents/api',
core : 'common/main/lib/core/application',
notification : 'common/main/lib/core/NotificationCenter',
keymaster : 'common/main/lib/core/keymaster',
tip : 'common/main/lib/util/Tip',
localstorage : 'common/main/lib/util/LocalStorage',
analytics : 'common/Analytics',
gateway : 'common/Gateway',
locale : 'common/locale',
irregularstack : 'common/IrregularStack'
},
shim: {
underscore: {
exports: '_'
},
backbone: {
deps: [
'underscore',
'jquery'
],
exports: 'Backbone'
},
bootstrap: {
deps: [
'jquery'
]
},
perfectscrollbar: {
deps: [
'jmousewheel'
]
},
notification: {
deps: [
'backbone'
]
},
core: {
deps: [
'backbone',
'notification',
'irregularstack'
]
},
sdk: {
deps: [
'jquery',
'underscore',
'allfonts',
'xregexp',
'sockjs',
'jsziputils',
'jsrsasign'
]
},
gateway: {
deps: [
'jquery'
]
},
analytics: {
deps: [
'jquery'
]
}
}
});
require([
'backbone',
'bootstrap',
'core',
//'sdk',
'api',
'analytics',
'gateway',
'locale',
'jsziputils',
'jsrsasign',
//'allfonts',
'sockjs',
'xregexp',
'underscore'
], function (Backbone, Bootstrap, Core) {
Backbone.history.start();
/**
* Application instance with PE namespace defined
*/
var app = new Backbone.Application({
nameSpace: 'PE',
autoCreate: false,
controllers : [
'Viewport',
'DocumentHolder',
'Toolbar',
'Statusbar',
'RightMenu',
'LeftMenu',
'Main',
'Common.Controllers.Fonts'
/** coauthoring begin **/
, 'Common.Controllers.Chat',
'Common.Controllers.Comments',
/** coauthoring end **/
/** proprietary begin **/
'Common.Controllers.ExternalDiagramEditor'
/** proprietary end **/
]
});
Common.Locale.apply();
require([
'presentationeditor/main/app/controller/Viewport',
'presentationeditor/main/app/controller/DocumentHolder',
'presentationeditor/main/app/controller/Toolbar',
'presentationeditor/main/app/controller/Statusbar',
'presentationeditor/main/app/controller/RightMenu',
'presentationeditor/main/app/controller/LeftMenu',
'presentationeditor/main/app/controller/Main',
'presentationeditor/main/app/view/ParagraphSettings',
'presentationeditor/main/app/view/ImageSettings',
'presentationeditor/main/app/view/ShapeSettings',
'presentationeditor/main/app/view/SlideSettings',
'presentationeditor/main/app/view/TableSettings',
'presentationeditor/main/app/view/TextArtSettings',
'common/main/lib/util/utils',
'common/main/lib/util/LocalStorage',
'common/main/lib/controller/Fonts'
/** coauthoring begin **/
,'common/main/lib/controller/Comments',
'common/main/lib/controller/Chat',
/** coauthoring end **/
/** proprietary begin **/
'presentationeditor/main/app/view/ChartSettings',
'common/main/lib/controller/ExternalDiagramEditor'
/** proprietary end **/
], function() {
app.start();
});
});
\ No newline at end of file
This diff is collapsed.
......@@ -432,8 +432,9 @@ function CEditorPage(api)
_text_bx_back.setAttribute("autocomplete", "off");
_text_bx_back.setAttribute("type", "password");
}
_text_bx_back.willValidate = false;
// в некоторых браузерах - readonly
try {_text_bx_back.willValidate = false;}catch(err){}
this.m_oMainView.HtmlElement.appendChild(_text_bx_back);
this.TextBoxBackground = CreateControl("id_text_box_background");
......
/*
*
* (c) Copyright Ascensio System Limited 2010-2016
*
* This program is freeware. You can redistribute it and/or modify it under the terms of the GNU
* General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html).
* In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that
* Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
*
* THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
* FITNESS FOR A PARTICULAR PURPOSE. For more details, see GNU GPL at https://www.gnu.org/copyleft/gpl.html
*
* You can contact Ascensio System SIA by email at sales@onlyoffice.com
*
* The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display
* Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
*
* Pursuant to Section 7  3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains
* relevant author attributions when distributing the software. If the display of the logo in its graphic
* form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE"
* in every copy of the program you distribute.
* Pursuant to Section 7  3(e) we decline to grant you any rights under trademark law for use of our trademarks.
*
*/
/**
* app.js
*
* Created by Alexander Yuzhin on 12/27/13
* Copyright (c) 2013 Ascensio System SIA. All rights reserved.
*
*/
'use strict';
require.config({
// The shim config allows us to configure dependencies for
// scripts that do not call define() to register a module
baseUrl: '../../',
paths: {
jquery : '../vendor/jquery/jquery',
underscore : '../vendor/underscore/underscore',
backbone : '../vendor/backbone/backbone',
bootstrap : '../vendor/bootstrap/dist/js/bootstrap',
text : '../vendor/requirejs-text/text',
perfectscrollbar: 'common/main/lib/mods/perfect-scrollbar',
jmousewheel : '../vendor/perfect-scrollbar/src/jquery.mousewheel',
xregexp : '../vendor/xregexp/xregexp-all-min',
sockjs : '../vendor/sockjs/sockjs.min',
jszip : '../vendor/jszip/jszip.min',
jsziputils : '../vendor/jszip-utils/jszip-utils.min',
jsrsasign : '../vendor/jsrsasign/jsrsasign-latest-all-min',
//allfonts : '../sdk/Common/AllFonts',
//sdk : '../sdk/Word/sdk-all',
api : 'api/documents/api',
core : 'common/main/lib/core/application',
notification : 'common/main/lib/core/NotificationCenter',
keymaster : 'common/main/lib/core/keymaster',
tip : 'common/main/lib/util/Tip',
localstorage : 'common/main/lib/util/LocalStorage',
analytics : 'common/Analytics',
gateway : 'common/Gateway',
locale : 'common/locale',
irregularstack : 'common/IrregularStack'
},
// urlArgs: "_dc=" + (new Date()).getTime(), // debug only, be sure to remove it before deploying your code.
shim: {
underscore: {
exports: '_'
},
backbone: {
deps: [
'underscore',
'jquery'
],
exports: 'Backbone'
},
bootstrap: {
deps: [
'jquery'
]
},
perfectscrollbar: {
deps: [
'jmousewheel'
]
},
notification: {
deps: [
'backbone'
]
},
core: {
deps: [
'backbone',
'notification',
'irregularstack'
]
},
sdk: {
deps: [
'jquery',
'underscore',
'allfonts',
'xregexp',
'sockjs',
'jszip',
'jsziputils',
'jsrsasign'
]
},
gateway: {
deps: [
'jquery'
]
},
analytics: {
deps: [
'jquery'
]
}
}
});
require([
'backbone',
'bootstrap',
'core',
//'sdk',
'api',
'analytics',
'gateway',
'locale',
'jszip',
'jsziputils',
'jsrsasign',
//'allfonts',
'sockjs',
'underscore'
], function (Backbone, Bootstrap, Core) {
Backbone.history.start();
/**
* Application instance with DE namespace defined
*/
var app = new Backbone.Application({
nameSpace: 'DE',
autoCreate: false,
controllers : [
'Viewport',
'DocumentHolder',
'Toolbar',
'Statusbar',
'RightMenu',
'LeftMenu',
'Main',
'Common.Controllers.Fonts',
'Common.Controllers.History'
/** coauthoring begin **/
,'Common.Controllers.Chat'
,'Common.Controllers.Comments'
/** coauthoring end **/
/** proprietary begin **/
,'Common.Controllers.ExternalDiagramEditor'
/** proprietary end **/
,'Common.Controllers.ExternalMergeEditor'
,'Common.Controllers.ReviewChanges'
]
});
Common.Locale.apply();
require([
'documenteditor/main/app/controller/Viewport',
'documenteditor/main/app/controller/DocumentHolder',
'documenteditor/main/app/controller/Toolbar',
'documenteditor/main/app/controller/Statusbar',
'documenteditor/main/app/controller/RightMenu',
'documenteditor/main/app/controller/LeftMenu',
'documenteditor/main/app/controller/Main',
'documenteditor/main/app/view/ParagraphSettings',
'documenteditor/main/app/view/HeaderFooterSettings',
'documenteditor/main/app/view/ImageSettings',
'documenteditor/main/app/view/TableSettings',
'documenteditor/main/app/view/ShapeSettings',
'documenteditor/main/app/view/TextArtSettings',
'common/main/lib/util/utils',
'common/main/lib/util/LocalStorage',
'common/main/lib/controller/Fonts',
'common/main/lib/controller/History'
/** coauthoring begin **/
,'common/main/lib/controller/Comments'
,'common/main/lib/controller/Chat'
/** coauthoring end **/
/** proprietary begin **/
,'documenteditor/main/app/view/ChartSettings'
,'common/main/lib/controller/ExternalDiagramEditor'
/** proprietary end **/
,'common/main/lib/controller/ExternalMergeEditor'
,'common/main/lib/controller/ReviewChanges'
], function() {
app.start();
});
});
\ No newline at end of file
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