Skip to content

W
web-apps
Commit 12b10efa authored by Julia Radzhabova's avatar Julia Radzhabova
Browse files
Options

Merge branch 'develop' into feature/sse-table-settings

parents c7c8037c 5a747644
Show whitespace changes
Inline Side-by-side
Showing with 291 additions and 292 deletions
apps/documenteditor/main/app.js
View file @ 12b10efa
...@@ -25,8 +25,8 @@ require.config({ ...@@ -25,8 +25,8 @@ require.config({
jszip : '../vendor/jszip/jszip.min', jszip : '../vendor/jszip/jszip.min',
jsziputils : '../vendor/jszip-utils/jszip-utils.min', jsziputils : '../vendor/jszip-utils/jszip-utils.min',
jsrsasign : '../vendor/jsrsasign/jsrsasign-latest-all-min', jsrsasign : '../vendor/jsrsasign/jsrsasign-latest-all-min',
allfonts : '../sdkjs/common/AllFonts', allfonts : '../../sdkjs/common/AllFonts',
sdk : '../sdkjs/word/sdk-all', sdk : '../../sdkjs/word/sdk-all',
api : 'api/documents/api', api : 'api/documents/api',
core : 'common/main/lib/core/application', core : 'common/main/lib/core/application',
notification : 'common/main/lib/core/NotificationCenter', notification : 'common/main/lib/core/NotificationCenter',
......
apps/documenteditor/main/app/controller/Main.js
View file @ 12b10efa
...@@ -141,7 +141,7 @@ define([ ...@@ -141,7 +141,7 @@ define([
/* /*
* TODO: Workaround bug #25004. Clipboard feature processing in sdk. * TODO: Workaround bug #25004. Clipboard feature processing in sdk.
*/ */
if (!(Common.Utils.isSafari && Common.Utils.isMac)) { if (!(Common.Utils.isSafari && Common.Utils.isMac) && !/area_id/.test(e.target.id)) {
me.api.asc_enableKeyEvents(true); me.api.asc_enableKeyEvents(true);
if (/msg-reply/.test(e.target.className)) if (/msg-reply/.test(e.target.className))
me.dontCloseDummyComment = false; me.dontCloseDummyComment = false;
......
apps/documenteditor/main/app/controller/RightMenu.js
View file @ 12b10efa
...@@ -72,7 +72,7 @@ define([ ...@@ -72,7 +72,7 @@ define([
this.rightmenu.fireEvent('editcomplete', this.rightmenu); this.rightmenu.fireEvent('editcomplete', this.rightmenu);
}, },
onFocusObject: function(SelectedObjects) { onFocusObject: function(SelectedObjects, open) {
if (!this.editMode) if (!this.editMode)
return; return;
...@@ -158,7 +158,7 @@ define([ ...@@ -158,7 +158,7 @@ define([
if (!this._settings[Common.Utils.documentSettingsType.MailMerge].hidden) if (!this._settings[Common.Utils.documentSettingsType.MailMerge].hidden)
this._settings[Common.Utils.documentSettingsType.MailMerge].panel.setLocked(this._settings[Common.Utils.documentSettingsType.MailMerge].locked); this._settings[Common.Utils.documentSettingsType.MailMerge].panel.setLocked(this._settings[Common.Utils.documentSettingsType.MailMerge].locked);
if (!this.rightmenu.minimizedMode) { if (!this.rightmenu.minimizedMode || open) {
var active; var active;
if (priorityactive>-1) active = priorityactive; if (priorityactive>-1) active = priorityactive;
...@@ -166,8 +166,11 @@ define([ ...@@ -166,8 +166,11 @@ define([
else if (currentactive>=0) active = currentactive; else if (currentactive>=0) active = currentactive;
else if (!this._settings[Common.Utils.documentSettingsType.MailMerge].hidden) active = Common.Utils.documentSettingsType.MailMerge; else if (!this._settings[Common.Utils.documentSettingsType.MailMerge].hidden) active = Common.Utils.documentSettingsType.MailMerge;
if (active == undefined && open && lastactive>=0)
active = lastactive;
if (active !== undefined) { if (active !== undefined) {
this.rightmenu.SetActivePane(active); this.rightmenu.SetActivePane(active, open);
if (active!=Common.Utils.documentSettingsType.MailMerge) if (active!=Common.Utils.documentSettingsType.MailMerge)
this._settings[active].panel.ChangeSettings.call(this._settings[active].panel, this._settings[active].props); this._settings[active].panel.ChangeSettings.call(this._settings[active].panel, this._settings[active].props);
else else
...@@ -237,8 +240,12 @@ define([ ...@@ -237,8 +240,12 @@ define([
if (this.editMode && this.api) { if (this.editMode && this.api) {
var selectedElements = this.api.getSelectedElements(); var selectedElements = this.api.getSelectedElements();
if (selectedElements.length>0) if (selectedElements.length>0) {
this.onFocusObject(selectedElements); var open = Common.localStorage.getItem("de-hide-right-settings");
open = (open===null || parseInt(open) == 0);
this.onFocusObject(selectedElements, open);
}
} }
}, },
......
apps/documenteditor/main/app/view/DocumentHolder.js
View file @ 12b10efa
...@@ -78,6 +78,9 @@ define([ ...@@ -78,6 +78,9 @@ define([
menu.alignPosition(); menu.alignPosition();
} }
_.delay(function() { _.delay(function() {
var value = Common.localStorage.getItem("de-settings-inputmode"); // only for hieroglyphs mode
if (value!==null && parseInt(value) == 1)
me.api.asc_enableKeyEvents(false);
menu.cmpEl.focus(); menu.cmpEl.focus();
}, 10); }, 10);
......
apps/documenteditor/main/app/view/RightMenu.js
View file @ 12b10efa
...@@ -194,7 +194,7 @@ define([ ...@@ -194,7 +194,7 @@ define([
$(this.el).width(MENU_SCALE_PART); $(this.el).width(MENU_SCALE_PART);
target_pane_parent.css("display", "inline-block" ); target_pane_parent.css("display", "inline-block" );
this.minimizedMode = false; this.minimizedMode = false;
Common.localStorage.setItem("de-hidden-right-settings", 0); Common.localStorage.setItem("de-hide-right-settings", 0);
} }
target_pane_parent.find('> .active').removeClass('active'); target_pane_parent.find('> .active').removeClass('active');
target_pane.addClass("active"); target_pane.addClass("active");
...@@ -206,7 +206,7 @@ define([ ...@@ -206,7 +206,7 @@ define([
target_pane_parent.css("display", "none" ); target_pane_parent.css("display", "none" );
$(this.el).width(SCALE_MIN); $(this.el).width(SCALE_MIN);
this.minimizedMode = true; this.minimizedMode = true;
Common.localStorage.setItem("de-hidden-right-settings", 1); Common.localStorage.setItem("de-hide-right-settings", 1);
} }
this.fireEvent('rightmenuclick', [this, btn.options.asctype, this.minimizedMode]); this.fireEvent('rightmenuclick', [this, btn.options.asctype, this.minimizedMode]);
...@@ -248,7 +248,6 @@ define([ ...@@ -248,7 +248,6 @@ define([
target_pane.css("display", "none" ); target_pane.css("display", "none" );
$(this.el).width(SCALE_MIN); $(this.el).width(SCALE_MIN);
this.minimizedMode = true; this.minimizedMode = true;
Common.localStorage.setItem("de-hidden-right-settings", 1);
Common.NotificationCenter.trigger('layout:changed', 'rightmenu'); Common.NotificationCenter.trigger('layout:changed', 'rightmenu');
}, },
......
apps/documenteditor/main/index.html
View file @ 12b10efa
...@@ -354,7 +354,7 @@ ...@@ -354,7 +354,7 @@
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/ArcTo.js"></script> <script type="text/javascript" src="../../../../sdkjs/word/Drawing/ArcTo.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/Hit.js"></script> <script type="text/javascript" src="../../../../sdkjs/word/Drawing/Hit.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/ColorArray.js"></script> <script type="text/javascript" src="../../../../sdkjs/word/Drawing/ColorArray.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/Overlay.js"></script> <script type="text/javascript" src="../../../../sdkjs/common/Overlay.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/ShapeDrawer.js"></script> <script type="text/javascript" src="../../../../sdkjs/word/Drawing/ShapeDrawer.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/DrawingDocument.js"></script> <script type="text/javascript" src="../../../../sdkjs/word/Drawing/DrawingDocument.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/GraphicsEvents.js"></script> <script type="text/javascript" src="../../../../sdkjs/word/Drawing/GraphicsEvents.js"></script>
......
apps/presentationeditor/main/app.js
View file @ 12b10efa
...@@ -24,8 +24,8 @@ require.config({ ...@@ -24,8 +24,8 @@ require.config({
sockjs : '../vendor/sockjs/sockjs.min', sockjs : '../vendor/sockjs/sockjs.min',
jsziputils : '../vendor/jszip-utils/jszip-utils.min', jsziputils : '../vendor/jszip-utils/jszip-utils.min',
jsrsasign : '../vendor/jsrsasign/jsrsasign-latest-all-min', jsrsasign : '../vendor/jsrsasign/jsrsasign-latest-all-min',
allfonts : '../sdkjs/common/AllFonts', allfonts : '../../sdkjs/common/AllFonts',
sdk : '../sdkjs/slide/sdk-all', sdk : '../../sdkjs/slide/sdk-all',
api : 'api/documents/api', api : 'api/documents/api',
core : 'common/main/lib/core/application', core : 'common/main/lib/core/application',
notification : 'common/main/lib/core/NotificationCenter', notification : 'common/main/lib/core/NotificationCenter',
......
apps/presentationeditor/main/app/controller/Main.js
View file @ 12b10efa
...@@ -124,7 +124,7 @@ define([ ...@@ -124,7 +124,7 @@ define([
/* /*
* TODO: Workaround bug #25004. Clipboard feature processing in sdk. * TODO: Workaround bug #25004. Clipboard feature processing in sdk.
*/ */
if (!(Common.Utils.isSafari && Common.Utils.isMac)) { if (!(Common.Utils.isSafari && Common.Utils.isMac) && !/area_id/.test(e.target.id)) {
me.api.asc_enableKeyEvents(true); me.api.asc_enableKeyEvents(true);
if (/msg-reply/.test(e.target.className)) if (/msg-reply/.test(e.target.className))
me.dontCloseDummyComment = false; me.dontCloseDummyComment = false;
......
apps/presentationeditor/main/app/controller/RightMenu.js
View file @ 12b10efa
...@@ -71,7 +71,7 @@ define([ ...@@ -71,7 +71,7 @@ define([
this.rightmenu.fireEvent('editcomplete', this.rightmenu); this.rightmenu.fireEvent('editcomplete', this.rightmenu);
}, },
onFocusObject: function(SelectedObjects) { onFocusObject: function(SelectedObjects, open) {
if (!this.editMode) if (!this.editMode)
return; return;
...@@ -147,7 +147,7 @@ define([ ...@@ -147,7 +147,7 @@ define([
} }
} }
if (!this.rightmenu.minimizedMode) { if (!this.rightmenu.minimizedMode || open) {
var active; var active;
if (priorityactive>-1) active = priorityactive; if (priorityactive>-1) active = priorityactive;
...@@ -156,7 +156,7 @@ define([ ...@@ -156,7 +156,7 @@ define([
else active = Common.Utils.documentSettingsType.Slide; else active = Common.Utils.documentSettingsType.Slide;
if (active !== undefined) { if (active !== undefined) {
this.rightmenu.SetActivePane(active); this.rightmenu.SetActivePane(active, open);
this._settings[active].panel.ChangeSettings.call(this._settings[active].panel, this._settings[active].props); this._settings[active].panel.ChangeSettings.call(this._settings[active].panel, this._settings[active].props);
} }
} }
...@@ -214,8 +214,12 @@ define([ ...@@ -214,8 +214,12 @@ define([
this.api.asc_registerCallback('asc_doubleClickOnObject', _.bind(this.onDoubleClickOnObject, this)); this.api.asc_registerCallback('asc_doubleClickOnObject', _.bind(this.onDoubleClickOnObject, this));
var selectedElements = this.api.getSelectedElements(); var selectedElements = this.api.getSelectedElements();
if (selectedElements.length>0) if (selectedElements.length>0) {
this.onFocusObject(selectedElements); var open = Common.localStorage.getItem("pe-hide-right-settings");
open = (open===null || parseInt(open) == 0);
this.onFocusObject(selectedElements, open);
}
} }
}, },
......
apps/presentationeditor/main/app/view/DocumentHolder.js
View file @ 12b10efa
...@@ -69,6 +69,9 @@ define([ ...@@ -69,6 +69,9 @@ define([
menu.alignPosition(); menu.alignPosition();
} }
_.delay(function() { _.delay(function() {
var value = Common.localStorage.getItem("pe-settings-inputmode"); // only for hieroglyphs mode
if (value!==null && parseInt(value) == 1)
me.api.asc_enableKeyEvents(false);
menu.cmpEl.focus(); menu.cmpEl.focus();
}, 10); }, 10);
......
apps/presentationeditor/main/app/view/RightMenu.js
View file @ 12b10efa
...@@ -176,7 +176,7 @@ define([ ...@@ -176,7 +176,7 @@ define([
$(this.el).width(MENU_SCALE_PART); $(this.el).width(MENU_SCALE_PART);
target_pane_parent.css("display", "inline-block" ); target_pane_parent.css("display", "inline-block" );
this.minimizedMode = false; this.minimizedMode = false;
Common.localStorage.setItem("pe-hidden-right-settings", 0); Common.localStorage.setItem("pe-hide-right-settings", 0);
} }
target_pane_parent.find('> .active').removeClass('active'); target_pane_parent.find('> .active').removeClass('active');
target_pane.addClass("active"); target_pane.addClass("active");
...@@ -189,7 +189,7 @@ define([ ...@@ -189,7 +189,7 @@ define([
target_pane_parent.css("display", "none" ); target_pane_parent.css("display", "none" );
$(this.el).width(SCALE_MIN); $(this.el).width(SCALE_MIN);
this.minimizedMode = true; this.minimizedMode = true;
Common.localStorage.setItem("pe-hidden-right-settings", 1); Common.localStorage.setItem("pe-hide-right-settings", 1);
} }
this.fireEvent('rightmenuclick', [this, btn.options.asctype, this.minimizedMode]); this.fireEvent('rightmenuclick', [this, btn.options.asctype, this.minimizedMode]);
...@@ -245,7 +245,6 @@ define([ ...@@ -245,7 +245,6 @@ define([
target_pane.css("display", "none" ); target_pane.css("display", "none" );
$(this.el).width(SCALE_MIN); $(this.el).width(SCALE_MIN);
this.minimizedMode = true; this.minimizedMode = true;
Common.localStorage.setItem("pe-hidden-right-settings", 1);
Common.NotificationCenter.trigger('layout:changed', 'rightmenu'); Common.NotificationCenter.trigger('layout:changed', 'rightmenu');
}, },
......
apps/presentationeditor/main/index.html
View file @ 12b10efa
...@@ -306,7 +306,7 @@ ...@@ -306,7 +306,7 @@
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/HatchPattern.js"></script> <script type="text/javascript" src="../../../../sdkjs/word/Drawing/HatchPattern.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/Graphics.js"></script> <script type="text/javascript" src="../../../../sdkjs/word/Drawing/Graphics.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/Overlay.js"></script> <script type="text/javascript" src="../../../../sdkjs/common/Overlay.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/ShapeDrawer.js"></script> <script type="text/javascript" src="../../../../sdkjs/word/Drawing/ShapeDrawer.js"></script>
<script type="text/javascript" src="../../../../sdkjs/slide/Drawing/Transitions.js"></script> <script type="text/javascript" src="../../../../sdkjs/slide/Drawing/Transitions.js"></script>
<script type="text/javascript" src="../../../../sdkjs/slide/Drawing/DrawingDocument.js"></script> <script type="text/javascript" src="../../../../sdkjs/slide/Drawing/DrawingDocument.js"></script>
......
apps/spreadsheeteditor/main/app.js
View file @ 12b10efa
...@@ -24,8 +24,8 @@ require.config({ ...@@ -24,8 +24,8 @@ require.config({
sockjs : '../vendor/sockjs/sockjs.min', sockjs : '../vendor/sockjs/sockjs.min',
jsziputils : '../vendor/jszip-utils/jszip-utils.min', jsziputils : '../vendor/jszip-utils/jszip-utils.min',
jsrsasign : '../vendor/jsrsasign/jsrsasign-latest-all-min', jsrsasign : '../vendor/jsrsasign/jsrsasign-latest-all-min',
allfonts : '../sdkjs/common/AllFonts', allfonts : '../../sdkjs/common/AllFonts',
sdk : '../sdkjs/cell/sdk-all', sdk : '../../sdkjs/cell/sdk-all',
api : 'api/documents/api', api : 'api/documents/api',
core : 'common/main/lib/core/application', core : 'common/main/lib/core/application',
notification : 'common/main/lib/core/NotificationCenter', notification : 'common/main/lib/core/NotificationCenter',
......
apps/spreadsheeteditor/main/app/controller/RightMenu.js
View file @ 12b10efa
...@@ -164,16 +164,20 @@ define([ ...@@ -164,16 +164,20 @@ define([
} }
} }
if (!this.rightmenu.minimizedMode) { if (!this.rightmenu.minimizedMode || this._openRightMenu) {
var active; var active;
if (priorityactive>-1) active = priorityactive; if (priorityactive>-1) active = priorityactive;
else if (lastactive>=0 && currentactive<0) active = lastactive; else if (lastactive>=0 && currentactive<0) active = lastactive;
else if (currentactive>=0) active = currentactive; else if (currentactive>=0) active = currentactive;
if (active == undefined && this._openRightMenu && lastactive>=0)
active = lastactive;
if (active !== undefined) { if (active !== undefined) {
this.rightmenu.SetActivePane(active); this.rightmenu.SetActivePane(active, this._openRightMenu);
this._settings[active].panel.ChangeSettings.call(this._settings[active].panel, this._settings[active].props); this._settings[active].panel.ChangeSettings.call(this._settings[active].panel, this._settings[active].props);
this._openRightMenu = false;
} }
} }
...@@ -221,6 +225,9 @@ define([ ...@@ -221,6 +225,9 @@ define([
createDelayedElements: function() { createDelayedElements: function() {
var me = this; var me = this;
if (this.api) { if (this.api) {
var open = Common.localStorage.getItem("sse-hide-right-settings");
this._openRightMenu = (open===null || parseInt(open) == 0);
this.api.asc_registerCallback('asc_onFocusObject', _.bind(this.onFocusObject, this)); this.api.asc_registerCallback('asc_onFocusObject', _.bind(this.onFocusObject, this));
this.api.asc_registerCallback('asc_onSelectionChanged', _.bind(this.onSelectionChanged, this)); this.api.asc_registerCallback('asc_onSelectionChanged', _.bind(this.onSelectionChanged, this));
this.api.asc_registerCallback('asc_doubleClickOnObject', _.bind(this.onDoubleClickOnObject, this)); this.api.asc_registerCallback('asc_doubleClickOnObject', _.bind(this.onDoubleClickOnObject, this));
......
apps/spreadsheeteditor/main/app/view/RightMenu.js
View file @ 12b10efa
...@@ -164,7 +164,7 @@ define([ ...@@ -164,7 +164,7 @@ define([
$(this.el).width(MENU_SCALE_PART); $(this.el).width(MENU_SCALE_PART);
target_pane_parent.css("display", "inline-block" ); target_pane_parent.css("display", "inline-block" );
this.minimizedMode = false; this.minimizedMode = false;
Common.localStorage.setItem("sse-hidden-right-settings", 0); Common.localStorage.setItem("sse-hide-right-settings", 0);
} }
target_pane_parent.find('> .active').removeClass('active'); target_pane_parent.find('> .active').removeClass('active');
target_pane.addClass("active"); target_pane.addClass("active");
...@@ -176,7 +176,7 @@ define([ ...@@ -176,7 +176,7 @@ define([
target_pane_parent.css("display", "none" ); target_pane_parent.css("display", "none" );
$(this.el).width(SCALE_MIN); $(this.el).width(SCALE_MIN);
this.minimizedMode = true; this.minimizedMode = true;
Common.localStorage.setItem("sse-hidden-right-settings", 1); Common.localStorage.setItem("sse-hide-right-settings", 1);
} }
this.fireEvent('rightmenuclick', [this, btn.options.asctype, this.minimizedMode]); this.fireEvent('rightmenuclick', [this, btn.options.asctype, this.minimizedMode]);
...@@ -231,7 +231,6 @@ define([ ...@@ -231,7 +231,6 @@ define([
target_pane.css("display", "none" ); target_pane.css("display", "none" );
$(this.el).width(SCALE_MIN); $(this.el).width(SCALE_MIN);
this.minimizedMode = true; this.minimizedMode = true;
Common.localStorage.setItem("sse-hidden-right-settings", 1);
Common.NotificationCenter.trigger('layout:changed', 'rightmenu'); Common.NotificationCenter.trigger('layout:changed', 'rightmenu');
}, },
......
apps/spreadsheeteditor/main/index.html
View file @ 12b10efa
...@@ -368,7 +368,7 @@ ...@@ -368,7 +368,7 @@
<script src="../../../../sdkjs/cell/view/DrawingObjectsController.js"></script> <script src="../../../../sdkjs/cell/view/DrawingObjectsController.js"></script>
<script src="../../../../sdkjs/cell/model/DrawingObjects/Graphics.js"></script> <script src="../../../../sdkjs/cell/model/DrawingObjects/Graphics.js"></script>
<script src="../../../../sdkjs/cell/model/DrawingObjects/Overlay.js"></script> <script src="../../../../sdkjs/common/Overlay.js"></script>
<script src="../../../../sdkjs/cell/model/DrawingObjects/ShapeDrawer.js"></script> <script src="../../../../sdkjs/cell/model/DrawingObjects/ShapeDrawer.js"></script>
<script src="../../../../sdkjs/cell/model/DrawingObjects/DrawingDocument.js"></script> <script src="../../../../sdkjs/cell/model/DrawingObjects/DrawingDocument.js"></script>
......
apps/spreadsheeteditor/main/index.html.deploy
View file @ 12b10efa
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<meta name="keywords" content="" /> <meta name="keywords" content="" />
<link rel="icon" href="resources/img/favicon.ico" type="image/x-icon" /> <link rel="icon" href="resources/img/favicon.ico" type="image/x-icon" />
<link rel="stylesheet" type="text/css" href="../../../sdkjs/cell/css/main.css"/> <link rel="stylesheet" type="text/css" href="../../../../sdkjs/cell/css/main.css"/>
<link rel="stylesheet" type="text/css" href="../../../apps/spreadsheeteditor/main/resources/css/app.css"> <link rel="stylesheet" type="text/css" href="../../../apps/spreadsheeteditor/main/resources/css/app.css">
<!-- splash --> <!-- splash -->
......
build/documenteditor.json
View file @ 12b10efa
{ {
"name": "documenteditor", "name": "documenteditor",
"version": "3.6.0", "version": "4.6.0",
"build": 1046, "build": 1054,
"homepage": "http://www.onlyoffice.com", "homepage": "http://www.onlyoffice.com",
"private": true, "private": true,
"sdk": { "sdk": {
"clean": [ "clean": [
"../deploy/sdk/Common", "../deploy/sdkjs/common",
"../deploy/sdk/Word" "../deploy/sdkjs/word"
], ],
"copy": { "copy": {
"script": { "script": {
"files": [ "files": [
{ {
"expand": true, "expand": true,
"cwd": "../sdk/Common/", "cwd": "../../sdkjs/common/",
"src": [ "src": [
"Images/**", "Images/*.cur",
"Native/**", "Native/*.js"
"AllFonts.js"
], ],
"dest": "../deploy/sdk/Common/" "dest": "../deploy/sdkjs/common/"
}, },
{ {
"expand": true, "src": "../../sdkjs/word/sdk-all.js",
"cwd": "../sdk/Fonts/", "dest": "../deploy/sdkjs/word/sdk-all.js"
"src": "**/**",
"dest": "../deploy/sdk/Fonts/"
},
{
"src": "../sdk/Word/sdk-all.js",
"dest": "../deploy/sdk/Word/sdk-all.js"
} }
] ]
} }
...@@ -38,26 +31,29 @@ ...@@ -38,26 +31,29 @@
}, },
"api": { "api": {
"clean": [ "clean": [
"../deploy/apps/api" "../deploy/web-apps/apps/api"
], ],
"copy": { "copy": {
"script": { "script": {
"expand": true, "expand": true,
"cwd": "../apps/api/", "cwd": "../apps/api/",
"src": "**", "src": [
"dest": "../deploy/apps/api/" "**",
"!**/*.desktop"
],
"dest": "../deploy/web-apps/apps/api/"
} }
} }
}, },
"main": { "main": {
"clean": [ "clean": [
"../deploy/apps/documenteditor/main" "../deploy/web-apps/apps/documenteditor/main"
], ],
"js": { "js": {
"requirejs": { "requirejs": {
"options": { "options": {
"name": "../apps/documenteditor/main/app.js", "name": "../apps/documenteditor/main/app.js",
"out": "../deploy/apps/documenteditor/main/app.js", "out": "../deploy/web-apps/apps/documenteditor/main/app.js",
"baseUrl": "../apps/", "baseUrl": "../apps/",
"inlineText": true, "inlineText": true,
"findNestedDependencies": true, "findNestedDependencies": true,
...@@ -152,7 +148,7 @@ ...@@ -152,7 +148,7 @@
"embedImages": true, "embedImages": true,
"files": { "files": {
"src": "../apps/documenteditor/main/resources/less/app.less", "src": "../apps/documenteditor/main/resources/less/app.less",
"dest": "../deploy/apps/documenteditor/main/resources/css/app.css" "dest": "../deploy/web-apps/apps/documenteditor/main/resources/css/app.css"
}, },
"replacements": [ "replacements": [
{ {
...@@ -173,7 +169,7 @@ ...@@ -173,7 +169,7 @@
"src": [ "src": [
"**/*.{png,jpg,gif}" "**/*.{png,jpg,gif}"
], ],
"dest": "../deploy/apps/documenteditor/main/resources/img/" "dest": "../deploy/web-apps/apps/documenteditor/main/resources/img/"
} }
], ],
"images-common": [ "images-common": [
...@@ -183,7 +179,7 @@ ...@@ -183,7 +179,7 @@
"src": [ "src": [
"**/*.{png,jpg,gif}" "**/*.{png,jpg,gif}"
], ],
"dest": "../deploy/apps/documenteditor/main/resources/img/" "dest": "../deploy/web-apps/apps/documenteditor/main/resources/img/"
} }
] ]
}, },
...@@ -193,7 +189,7 @@ ...@@ -193,7 +189,7 @@
"expand": true, "expand": true,
"cwd": "../apps/documenteditor/main/locale/", "cwd": "../apps/documenteditor/main/locale/",
"src": "*", "src": "*",
"dest": "../deploy/apps/documenteditor/main/locale/" "dest": "../deploy/web-apps/apps/documenteditor/main/locale/"
} }
], ],
"help": [ "help": [
...@@ -201,26 +197,26 @@ ...@@ -201,26 +197,26 @@
"expand": true, "expand": true,
"cwd": "../apps/documenteditor/main/resources/help/en/", "cwd": "../apps/documenteditor/main/resources/help/en/",
"src": "**", "src": "**",
"dest": "../deploy/apps/documenteditor/main/resources/help/en/" "dest": "../deploy/web-apps/apps/documenteditor/main/resources/help/en/"
}, },
{ {
"expand": true, "expand": true,
"cwd": "../apps/documenteditor/main/resources/help/ru/", "cwd": "../apps/documenteditor/main/resources/help/ru/",
"src": "**", "src": "**",
"dest": "../deploy/apps/documenteditor/main/resources/help/ru/" "dest": "../deploy/web-apps/apps/documenteditor/main/resources/help/ru/"
} }
], ],
"index-page": [ "index-page": [
{ {
"src": "../apps/documenteditor/main/index.html.deploy", "src": "../apps/documenteditor/main/index.html.deploy",
"dest": "../deploy/apps/documenteditor/main/index.html" "dest": "../deploy/web-apps/apps/documenteditor/main/index.html"
} }
] ]
} }
}, },
"mobile": { "mobile": {
"clean": [ "clean": [
"../deploy/apps/documenteditor/mobile" "../deploy/web-apps/apps/documenteditor/mobile"
], ],
"js": { "js": {
"src": [ "src": [
...@@ -270,32 +266,32 @@ ...@@ -270,32 +266,32 @@
"../apps/common/locale.js", "../apps/common/locale.js",
"../apps/documenteditor/mobile/app.js" "../apps/documenteditor/mobile/app.js"
], ],
"dist": "../deploy/apps/documenteditor/mobile/app-all.js" "dist": "../deploy/web-apps/apps/documenteditor/mobile/app-all.js"
}, },
"css": { "css": {
"normal": { "normal": {
"src": [ "src": [
"../apps/documenteditor/mobile/resources/css/application-normal.css" "../apps/documenteditor/mobile/resources/css/application-normal.css"
], ],
"dist": "../deploy/apps/documenteditor/mobile/resources/css/application-normal.css" "dist": "../deploy/web-apps/apps/documenteditor/mobile/resources/css/application-normal.css"
}, },
"retina": { "retina": {
"src": [ "src": [
"../apps/documenteditor/mobile/resources/css/application-retina.css" "../apps/documenteditor/mobile/resources/css/application-retina.css"
], ],
"dist": "../deploy/apps/documenteditor/mobile/resources/css/application-retina.css" "dist": "../deploy/web-apps/apps/documenteditor/mobile/resources/css/application-retina.css"
} }
}, },
"copy": { "copy": {
"index-page": { "index-page": {
"../deploy/apps/documenteditor/mobile/index.html": "../apps/documenteditor/mobile/index.html.deploy" "../deploy/web-apps/apps/documenteditor/mobile/index.html": "../apps/documenteditor/mobile/index.html.deploy"
}, },
"localization": [ "localization": [
{ {
"expand": true, "expand": true,
"cwd": "../apps/documenteditor/mobile/locale/", "cwd": "../apps/documenteditor/mobile/locale/",
"src": "*", "src": "*",
"dest": "../deploy/apps/documenteditor/mobile/locale/" "dest": "../deploy/web-apps/apps/documenteditor/mobile/locale/"
} }
], ],
"images-app": [ "images-app": [
...@@ -303,14 +299,14 @@ ...@@ -303,14 +299,14 @@
"expand": true, "expand": true,
"cwd": "../apps/documenteditor/mobile/resources/img/", "cwd": "../apps/documenteditor/mobile/resources/img/",
"src": "**", "src": "**",
"dest": "../deploy/apps/documenteditor/mobile/resources/img/" "dest": "../deploy/web-apps/apps/documenteditor/mobile/resources/img/"
} }
] ]
} }
}, },
"embed": { "embed": {
"clean": [ "clean": [
"../deploy/apps/documenteditor/embed" "../deploy/web-apps/apps/documenteditor/embed"
], ],
"js": { "js": {
"src": [ "src": [
...@@ -320,12 +316,12 @@ ...@@ -320,12 +316,12 @@
"../apps/documenteditor/embed/js/ApplicationController.js", "../apps/documenteditor/embed/js/ApplicationController.js",
"../apps/documenteditor/embed/js/application.js" "../apps/documenteditor/embed/js/application.js"
], ],
"dist": "../deploy/apps/documenteditor/embed/app-all.js" "dist": "../deploy/web-apps/apps/documenteditor/embed/app-all.js"
}, },
"less": { "less": {
"files": { "files": {
"src": "../apps/documenteditor/embed/resources/less/application.less", "src": "../apps/documenteditor/embed/resources/less/application.less",
"dist": "../deploy/apps/documenteditor/embed/resources/css/app-all.css" "dist": "../deploy/web-apps/apps/documenteditor/embed/resources/css/app-all.css"
}, },
"replacements": [ "replacements": [
{ {
...@@ -336,64 +332,64 @@ ...@@ -336,64 +332,64 @@
}, },
"copy": { "copy": {
"index-page": { "index-page": {
"../deploy/apps/documenteditor/embed/index.html": "../apps/documenteditor/embed/index.html.deploy" "../deploy/web-apps/apps/documenteditor/embed/index.html": "../apps/documenteditor/embed/index.html.deploy"
}, },
"images-app": [ "images-app": [
{ {
"expand": true, "expand": true,
"cwd": "../apps/common/embed/resources/img/", "cwd": "../apps/common/embed/resources/img/",
"src": "**", "src": "**",
"dest": "../deploy/apps/documenteditor/embed/resources/img/" "dest": "../deploy/web-apps/apps/documenteditor/embed/resources/img/"
} }
] ]
} }
}, },
"touch": { "touch": {
"clean": [ "clean": [
"../deploy/vendor/touch" "../deploy/web-apps/vendor/touch"
], ],
"copy": { "copy": {
"script": { "script": {
"src": "../vendor/touch/sencha-touch-all.js", "src": "../vendor/touch/sencha-touch-all.js",
"dest": "../deploy/vendor/touch/sencha-touch-all.js" "dest": "../deploy/web-apps/vendor/touch/sencha-touch-all.js"
} }
} }
}, },
"bootstrap": { "bootstrap": {
"clean": [ "clean": [
"../deploy/vendor/bootstrap" "../deploy/web-apps/vendor/bootstrap"
], ],
"copy": { "copy": {
"script": { "script": {
"src": "../vendor/bootstrap/dist/js/bootstrap.min.js", "src": "../vendor/bootstrap/dist/js/bootstrap.min.js",
"dest": "../deploy/vendor/bootstrap/dist/js/bootstrap.min.js" "dest": "../deploy/web-apps/vendor/bootstrap/dist/js/bootstrap.min.js"
}, },
"font": { "font": {
"expand": true, "expand": true,
"cwd": "../vendor/bootstrap/dist/fonts/", "cwd": "../vendor/bootstrap/dist/fonts/",
"src": "*", "src": "*",
"dest": "../deploy/vendor/bootstrap/dist/fonts/" "dest": "../deploy/web-apps/vendor/bootstrap/dist/fonts/"
}, },
"css": { "css": {
"src": "../vendor/bootstrap/dist/css/bootstrap.min.css", "src": "../vendor/bootstrap/dist/css/bootstrap.min.css",
"dest": "../deploy/vendor/bootstrap/dist/css/bootstrap.min.css" "dest": "../deploy/web-apps/vendor/bootstrap/dist/css/bootstrap.min.css"
} }
} }
}, },
"jquery": { "jquery": {
"clean": [ "clean": [
"../deploy/vendor/jquery" "../deploy/web-apps/vendor/jquery"
], ],
"copy": { "copy": {
"script": { "script": {
"files": [ "files": [
{ {
"src": "../vendor/jquery/jquery.min.js", "src": "../vendor/jquery/jquery.min.js",
"dest": "../deploy/vendor/jquery/jquery.min.js" "dest": "../deploy/web-apps/vendor/jquery/jquery.min.js"
}, },
{ {
"src": "../vendor/jquery.browser/dist/jquery.browser.min.js", "src": "../vendor/jquery.browser/dist/jquery.browser.min.js",
"dest": "../deploy/vendor/jquery/jquery.browser.min.js" "dest": "../deploy/web-apps/vendor/jquery/jquery.browser.min.js"
} }
] ]
} }
...@@ -401,93 +397,93 @@ ...@@ -401,93 +397,93 @@
}, },
"megapixel": { "megapixel": {
"clean": [ "clean": [
"../deploy/vendor/megapixel" "../deploy/web-apps/vendor/megapixel"
], ],
"copy": { "copy": {
"script": { "script": {
"src": "../vendor/megapixel/megapix-image-min.js", "src": "../vendor/megapixel/megapix-image-min.js",
"dest": "../deploy/vendor/megapixel/megapix-image-min.js" "dest": "../deploy/web-apps/vendor/megapixel/megapix-image-min.js"
} }
} }
}, },
"sockjs": { "sockjs": {
"clean": [ "clean": [
"../deploy/vendor/sockjs" "../deploy/web-apps/vendor/sockjs"
], ],
"copy": { "copy": {
"script": { "script": {
"src": "../vendor/sockjs/sockjs.min.js", "src": "../vendor/sockjs/sockjs.min.js",
"dest": "../deploy/vendor/sockjs/sockjs.min.js" "dest": "../deploy/web-apps/vendor/sockjs/sockjs.min.js"
} }
} }
}, },
"xregexp": { "xregexp": {
"clean": [ "clean": [
"../deploy/vendor/xregexp" "../deploy/web-apps/vendor/xregexp"
], ],
"copy": { "copy": {
"script": { "script": {
"src": "../vendor/xregexp/xregexp-all-min.js", "src": "../vendor/xregexp/xregexp-all-min.js",
"dest": "../deploy/vendor/xregexp/xregexp-all-min.js" "dest": "../deploy/web-apps/vendor/xregexp/xregexp-all-min.js"
} }
} }
}, },
"jszip": { "jszip": {
"clean": [ "clean": [
"../deploy/vendor/jszip" "../deploy/web-apps/vendor/jszip"
], ],
"copy": { "copy": {
"script": { "script": {
"src": "../vendor/jszip/jszip.min.js", "src": "../vendor/jszip/jszip.min.js",
"dest": "../deploy/vendor/jszip/jszip.min.js" "dest": "../deploy/web-apps/vendor/jszip/jszip.min.js"
} }
} }
}, },
"jsziputils": { "jsziputils": {
"clean": [ "clean": [
"../deploy/vendor/jszip-utils" "../deploy/web-apps/vendor/jszip-utils"
], ],
"copy": { "copy": {
"script": { "script": {
"src": "../vendor/jszip-utils/jszip-utils.min.js", "src": "../vendor/jszip-utils/jszip-utils.min.js",
"dest": "../deploy/vendor/jszip-utils/jszip-utils.min.js" "dest": "../deploy/web-apps/vendor/jszip-utils/jszip-utils.min.js"
} }
} }
}, },
"jsrsasign": { "jsrsasign": {
"clean": [ "clean": [
"../deploy/vendor/jsrsasign" "../deploy/web-apps/vendor/jsrsasign"
], ],
"copy": { "copy": {
"script": { "script": {
"src": "../vendor/jsrsasign/jsrsasign-latest-all-min.js", "src": "../vendor/jsrsasign/jsrsasign-latest-all-min.js",
"dest": "../deploy/vendor/jsrsasign/jsrsasign-latest-all-min.js" "dest": "../deploy/web-apps/vendor/jsrsasign/jsrsasign-latest-all-min.js"
} }
} }
}, },
"underscore": { "underscore": {
"clean": [ "clean": [
"../deploy/vendor/underscore" "../deploy/web-apps/vendor/underscore"
], ],
"copy": { "copy": {
"script": { "script": {
"src": "../vendor/underscore/underscore-min.js", "src": "../vendor/underscore/underscore-min.js",
"dest": "../deploy/vendor/underscore/underscore-min.js" "dest": "../deploy/web-apps/vendor/underscore/underscore-min.js"
} }
} }
}, },
"requirejs": { "requirejs": {
"clean": [ "clean": [
"../deploy/vendor/requirejs" "../deploy/web-apps/vendor/requirejs"
], ],
"min": { "min": {
"src": "../vendor/requirejs/require.js", "src": "../vendor/requirejs/require.js",
"dest": "../deploy/vendor/requirejs/require.js" "dest": "../deploy/web-apps/vendor/requirejs/require.js"
} }
}, },
"zeroclipboard": { "zeroclipboard": {
"clean": [ "clean": [
"../deploy/vendor/ZeroClipboard" "../deploy/web-apps/vendor/ZeroClipboard"
], ],
"copy": { "copy": {
"script": { "script": {
...@@ -496,33 +492,33 @@ ...@@ -496,33 +492,33 @@
"src": [ "src": [
"**" "**"
], ],
"dest": "../deploy/vendor/ZeroClipboard/" "dest": "../deploy/web-apps/vendor/ZeroClipboard/"
} }
} }
}, },
"obf_api": { "obf_api": {
"ccvars": "../sdk/Word/variable.map", "ccvars": "../../sdkjs/word/variable.map",
"ccprops": "../sdk/Word/property.map", "ccprops": "../../sdkjs/word/property.map",
"api": "../sdk/Word/apiExport.js", "api": "../../sdkjs/word/apiExport.js",
"clientjs": [ "clientjs": [
"../deploy/apps/documenteditor/main/app-edit.js", "../deploy/web-apps/apps/documenteditor/main/app-edit.js",
"../deploy/apps/documenteditor/main/app-view.js", "../deploy/web-apps/apps/documenteditor/main/app-view.js",
"../deploy/apps/documenteditor/mobile/app-all.js", "../deploy/web-apps/apps/documenteditor/mobile/app-all.js",
"../deploy/apps/documenteditor/embed/app-all.js", "../deploy/web-apps/apps/documenteditor/embed/app-all.js",
"../deploy/apps/api/documents/cache-scripts.html" "../deploy/web-apps/apps/api/documents/cache-scripts.html"
], ],
"ccres": "../deploy/sdk/Word/sdk-all.js" "ccres": "../deploy/sdkjs/word/sdk-all.js"
}, },
"obf": { "obf": {
"api": "../deploy/sdk/Word/sdk-all.js", "api": "../deploy/sdkjs/word/sdk-all.js",
"pat": "asc_\\w+", "pat": "asc_\\w+",
"keys": "-exp se -use-for-name", "keys": "-exp se -use-for-name",
"apply": [ "apply": [
"../deploy/sdk/Word/sdk-all.js", "../deploy/sdkjs/word/sdk-all.js",
"../deploy/apps/documenteditor/main/app-edit.js", "../deploy/web-apps/apps/documenteditor/main/app-edit.js",
"../deploy/apps/documenteditor/main/app-view.js", "../deploy/web-apps/apps/documenteditor/main/app-view.js",
"../deploy/apps/documenteditor/mobile/app-all.js", "../deploy/web-apps/apps/documenteditor/mobile/app-all.js",
"../deploy/apps/documenteditor/embed/app-all.js" "../deploy/web-apps/apps/documenteditor/embed/app-all.js"
] ]
}, },
"tasks": { "tasks": {
......
build/package.json
View file @ 12b10efa
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
"homepage": "http://www.onlyoffice.com", "homepage": "http://www.onlyoffice.com",
"private": true, "private": true,
"dependencies": { "dependencies": {
"lodash": "3.0.0", "lodash": "^4.0.0",
"grunt": "0.4.5", "grunt": "0.4.5",
"grunt-exec": "0.4.5", "grunt-exec": "0.4.5",
"grunt-replace": "0.7.3", "grunt-replace": "0.7.3",
......
build/presentationeditor.json
View file @ 12b10efa
{ {
"name": "presentationeditor", "name": "presentationeditor",
"version": "3.6.0", "version": "4.6.0",
"build": 759, "build": 762,
"homepage": "http://www.onlyoffice.com", "homepage": "http://www.onlyoffice.com",
"sdk": { "sdk": {
"clean": [ "clean": [
"../deploy/sdk/Common", "../deploy/sdkjs/common",
"../deploy/sdk/PowerPoint", "../deploy/sdkjs/slide"
"../deploy/sdk/Fonts"
], ],
"copy": { "copy": {
"script": { "script": {
"files": [ "files": [
{ {
"expand": true, "expand": true,
"cwd": "../sdk/Common/", "cwd": "../../sdkjs/common/",
"src": [ "src": [
"Images/**", "Images/*.cur",
"Native/**", "Native/*.js"
"AllFonts.js"
], ],
"dest": "../deploy/sdk/Common/" "dest": "../deploy/sdkjs/common/"
}, },
{ {
"expand": true, "expand": true,
"cwd": "../sdk/Fonts/", "cwd": "../../sdkjs/slide/themes/",
"src": "**/**", "src": "**/**",
"dest": "../deploy/sdk/Fonts/" "dest": "../deploy/sdkjs/slide/themes/"
}, },
{ {
"expand": true, "src": "../../sdkjs/slide/sdk-all.js",
"cwd": "../sdk/PowerPoint/themes/", "dest": "../deploy/sdkjs/slide/sdk-all.js"
"src": "**/**",
"dest": "../deploy/sdk/PowerPoint/themes/"
},
{
"src": "../sdk/PowerPoint/sdk-all.js",
"dest": "../deploy/sdk/PowerPoint/sdk-all.js"
} }
] ]
} }
...@@ -44,26 +36,29 @@ ...@@ -44,26 +36,29 @@
}, },
"api": { "api": {
"clean": [ "clean": [
"../deploy/apps/api" "../deploy/web-apps/apps/api"
], ],
"copy": { "copy": {
"script": { "script": {
"expand": true, "expand": true,
"cwd": "../apps/api/", "cwd": "../apps/api/",
"src": "**", "src": [
"dest": "../deploy/apps/api/" "**",
"!**/*.desktop"
],
"dest": "../deploy/web-apps/apps/api/"
} }
} }
}, },
"main": { "main": {
"clean": [ "clean": [
"../deploy/apps/presentationeditor/main" "../deploy/web-apps/apps/presentationeditor/main"
], ],
"js": { "js": {
"requirejs": { "requirejs": {
"options": { "options": {
"name": "../apps/presentationeditor/main/app.js", "name": "../apps/presentationeditor/main/app.js",
"out": "../deploy/apps/presentationeditor/main/app.js", "out": "../deploy/web-apps/apps/presentationeditor/main/app.js",
"baseUrl": "../apps/", "baseUrl": "../apps/",
"inlineText": true, "inlineText": true,
"findNestedDependencies": true, "findNestedDependencies": true,
...@@ -158,7 +153,7 @@ ...@@ -158,7 +153,7 @@
"embedImages": true, "embedImages": true,
"files": { "files": {
"src": "../apps/presentationeditor/main/resources/less/app.less", "src": "../apps/presentationeditor/main/resources/less/app.less",
"dest": "../deploy/apps/presentationeditor/main/resources/css/app.css" "dest": "../deploy/web-apps/apps/presentationeditor/main/resources/css/app.css"
}, },
"replacements": [ "replacements": [
{ {
...@@ -179,25 +174,17 @@ ...@@ -179,25 +174,17 @@
"src": [ "src": [
"**/*.{png,jpg,gif}" "**/*.{png,jpg,gif}"
], ],
"dest": "../deploy/apps/presentationeditor/main/resources/img/" "dest": "../deploy/web-apps/apps/presentationeditor/main/resources/img/"
} }
], ],
"images-common": [ "images-common": [
{
"expand": true,
"cwd": "../sdk/PowerPoint/Images/",
"src": [
"**/*.cur"
],
"dest": "../deploy/apps/presentationeditor/main/Images/"
},
{ {
"expand": true, "expand": true,
"cwd": "../apps/common/main/resources/img/", "cwd": "../apps/common/main/resources/img/",
"src": [ "src": [
"**/*.{png,jpg,gif}" "**/*.{png,jpg,gif}"
], ],
"dest": "../deploy/apps/presentationeditor/main/resources/img/" "dest": "../deploy/web-apps/apps/presentationeditor/main/resources/img/"
} }
] ]
}, },
...@@ -207,7 +194,7 @@ ...@@ -207,7 +194,7 @@
"expand": true, "expand": true,
"cwd": "../apps/presentationeditor/main/locale/", "cwd": "../apps/presentationeditor/main/locale/",
"src": "*", "src": "*",
"dest": "../deploy/apps/presentationeditor/main/locale/" "dest": "../deploy/web-apps/apps/presentationeditor/main/locale/"
} }
], ],
"help": [ "help": [
...@@ -215,26 +202,26 @@ ...@@ -215,26 +202,26 @@
"expand": true, "expand": true,
"cwd": "../apps/presentationeditor/main/resources/help/en/", "cwd": "../apps/presentationeditor/main/resources/help/en/",
"src": "**", "src": "**",
"dest": "../deploy/apps/presentationeditor/main/resources/help/en/" "dest": "../deploy/web-apps/apps/presentationeditor/main/resources/help/en/"
}, },
{ {
"expand": true, "expand": true,
"cwd": "../apps/presentationeditor/main/resources/help/ru/", "cwd": "../apps/presentationeditor/main/resources/help/ru/",
"src": "**", "src": "**",
"dest": "../deploy/apps/presentationeditor/main/resources/help/ru/" "dest": "../deploy/web-apps/apps/presentationeditor/main/resources/help/ru/"
} }
], ],
"index-page": [ "index-page": [
{ {
"src": "../apps/presentationeditor/main/index.html.deploy", "src": "../apps/presentationeditor/main/index.html.deploy",
"dest": "../deploy/apps/presentationeditor/main/index.html" "dest": "../deploy/web-apps/apps/presentationeditor/main/index.html"
} }
] ]
} }
}, },
"mobile": { "mobile": {
"clean": [ "clean": [
"../deploy/apps/presentationeditor/mobile" "../deploy/web-apps/apps/presentationeditor/mobile"
], ],
"js": { "js": {
"src": [ "src": [
...@@ -256,32 +243,32 @@ ...@@ -256,32 +243,32 @@
"../apps/common/locale.js", "../apps/common/locale.js",
"../apps/presentationeditor/mobile/app.js" "../apps/presentationeditor/mobile/app.js"
], ],
"dist": "../deploy/apps/presentationeditor/mobile/app-all.js" "dist": "../deploy/web-apps/apps/presentationeditor/mobile/app-all.js"
}, },
"css": { "css": {
"normal": { "normal": {
"src": [ "src": [
"../apps/presentationeditor/mobile/resources/css/application-normal.css" "../apps/presentationeditor/mobile/resources/css/application-normal.css"
], ],
"dist": "../deploy/apps/presentationeditor/mobile/resources/css/application-normal.css" "dist": "../deploy/web-apps/apps/presentationeditor/mobile/resources/css/application-normal.css"
}, },
"retina": { "retina": {
"src": [ "src": [
"../apps/presentationeditor/mobile/resources/css/application-retina.css" "../apps/presentationeditor/mobile/resources/css/application-retina.css"
], ],
"dist": "../deploy/apps/presentationeditor/mobile/resources/css/application-retina.css" "dist": "../deploy/web-apps/apps/presentationeditor/mobile/resources/css/application-retina.css"
} }
}, },
"copy": { "copy": {
"index-page": { "index-page": {
"../deploy/apps/presentationeditor/mobile/index.html": "../apps/presentationeditor/mobile/index.html.deploy" "../deploy/web-apps/apps/presentationeditor/mobile/index.html": "../apps/presentationeditor/mobile/index.html.deploy"
}, },
"localization": [ "localization": [
{ {
"expand": true, "expand": true,
"cwd": "../apps/presentationeditor/mobile/locale/", "cwd": "../apps/presentationeditor/mobile/locale/",
"src": "*", "src": "*",
"dest": "../deploy/apps/presentationeditor/mobile/locale/" "dest": "../deploy/web-apps/apps/presentationeditor/mobile/locale/"
} }
], ],
"images-app": [ "images-app": [
...@@ -289,14 +276,14 @@ ...@@ -289,14 +276,14 @@
"expand": true, "expand": true,
"cwd": "../apps/presentationeditor/mobile/resources/img/", "cwd": "../apps/presentationeditor/mobile/resources/img/",
"src": "**", "src": "**",
"dest": "../deploy/apps/presentationeditor/mobile/resources/img/" "dest": "../deploy/web-apps/apps/presentationeditor/mobile/resources/img/"
} }
] ]
} }
}, },
"embed": { "embed": {
"clean": [ "clean": [
"../deploy/apps/presentationeditor/embed" "../deploy/web-apps/apps/presentationeditor/embed"
], ],
"js": { "js": {
"src": [ "src": [
...@@ -306,12 +293,12 @@ ...@@ -306,12 +293,12 @@
"../apps/presentationeditor/embed/js/ApplicationController.js", "../apps/presentationeditor/embed/js/ApplicationController.js",
"../apps/presentationeditor/embed/js/application.js" "../apps/presentationeditor/embed/js/application.js"
], ],
"dist": "../deploy/apps/presentationeditor/embed/app-all.js" "dist": "../deploy/web-apps/apps/presentationeditor/embed/app-all.js"
}, },
"less": { "less": {
"files": { "files": {
"src": "../apps/presentationeditor/embed/resources/less/application.less", "src": "../apps/presentationeditor/embed/resources/less/application.less",
"dist": "../deploy/apps/presentationeditor/embed/resources/css/app-all.css" "dist": "../deploy/web-apps/apps/presentationeditor/embed/resources/css/app-all.css"
}, },
"replacements": [ "replacements": [
{ {
...@@ -322,64 +309,64 @@ ...@@ -322,64 +309,64 @@
}, },
"copy": { "copy": {
"index-page": { "index-page": {
"../deploy/apps/presentationeditor/embed/index.html": "../apps/presentationeditor/embed/index.html.deploy" "../deploy/web-apps/apps/presentationeditor/embed/index.html": "../apps/presentationeditor/embed/index.html.deploy"
}, },
"images-app": [ "images-app": [
{ {
"expand": true, "expand": true,
"cwd": "../apps/common/embed/resources/img/", "cwd": "../apps/common/embed/resources/img/",
"src": "**", "src": "**",
"dest": "../deploy/apps/presentationeditor/embed/resources/img/" "dest": "../deploy/web-apps/apps/presentationeditor/embed/resources/img/"
} }
] ]
} }
}, },
"touch": { "touch": {
"clean": [ "clean": [
"../deploy/vendor/touch" "../deploy/web-apps/vendor/touch"
], ],
"copy": { "copy": {
"script": { "script": {
"src": "../vendor/touch/sencha-touch-all.js", "src": "../vendor/touch/sencha-touch-all.js",
"dest": "../deploy/vendor/touch/sencha-touch-all.js" "dest": "../deploy/web-apps/vendor/touch/sencha-touch-all.js"
} }
} }
}, },
"bootstrap": { "bootstrap": {
"clean": [ "clean": [
"../deploy/vendor/bootstrap" "../deploy/web-apps/vendor/bootstrap"
], ],
"copy": { "copy": {
"script": { "script": {
"src": "../vendor/bootstrap/dist/js/bootstrap.min.js", "src": "../vendor/bootstrap/dist/js/bootstrap.min.js",
"dest": "../deploy/vendor/bootstrap/dist/js/bootstrap.min.js" "dest": "../deploy/web-apps/vendor/bootstrap/dist/js/bootstrap.min.js"
}, },
"font": { "font": {
"expand": true, "expand": true,
"cwd": "../vendor/bootstrap/dist/fonts/", "cwd": "../vendor/bootstrap/dist/fonts/",
"src": "*", "src": "*",
"dest": "../deploy/vendor/bootstrap/dist/fonts/" "dest": "../deploy/web-apps/vendor/bootstrap/dist/fonts/"
}, },
"css": { "css": {
"src": "../vendor/bootstrap/dist/css/bootstrap.min.css", "src": "../vendor/bootstrap/dist/css/bootstrap.min.css",
"dest": "../deploy/vendor/bootstrap/dist/css/bootstrap.min.css" "dest": "../deploy/web-apps/vendor/bootstrap/dist/css/bootstrap.min.css"
} }
} }
}, },
"jquery": { "jquery": {
"clean": [ "clean": [
"../deploy/vendor/jquery" "../deploy/web-apps/vendor/jquery"
], ],
"copy": { "copy": {
"script": { "script": {
"files": [ "files": [
{ {
"src": "../vendor/jquery/jquery.min.js", "src": "../vendor/jquery/jquery.min.js",
"dest": "../deploy/vendor/jquery/jquery.min.js" "dest": "../deploy/web-apps/vendor/jquery/jquery.min.js"
}, },
{ {
"src": "../vendor/jquery.browser/dist/jquery.browser.min.js", "src": "../vendor/jquery.browser/dist/jquery.browser.min.js",
"dest": "../deploy/vendor/jquery/jquery.browser.min.js" "dest": "../deploy/web-apps/vendor/jquery/jquery.browser.min.js"
} }
] ]
} }
...@@ -387,93 +374,93 @@ ...@@ -387,93 +374,93 @@
}, },
"megapixel": { "megapixel": {
"clean": [ "clean": [
"../deploy/vendor/megapixel" "../deploy/web-apps/vendor/megapixel"
], ],
"copy": { "copy": {
"script": { "script": {
"src": "../vendor/megapixel/megapix-image-min.js", "src": "../vendor/megapixel/megapix-image-min.js",
"dest": "../deploy/vendor/megapixel/megapix-image-min.js" "dest": "../deploy/web-apps/vendor/megapixel/megapix-image-min.js"
} }
} }
}, },
"sockjs": { "sockjs": {
"clean": [ "clean": [
"../deploy/vendor/sockjs" "../deploy/web-apps/vendor/sockjs"
], ],
"copy": { "copy": {
"script": { "script": {
"src": "../vendor/sockjs/sockjs.min.js", "src": "../vendor/sockjs/sockjs.min.js",
"dest": "../deploy/vendor/sockjs/sockjs.min.js" "dest": "../deploy/web-apps/vendor/sockjs/sockjs.min.js"
} }
} }
}, },
"xregexp": { "xregexp": {
"clean": [ "clean": [
"../deploy/vendor/xregexp" "../deploy/web-apps/vendor/xregexp"
], ],
"copy": { "copy": {
"script": { "script": {
"src": "../vendor/xregexp/xregexp-all-min.js", "src": "../vendor/xregexp/xregexp-all-min.js",
"dest": "../deploy/vendor/xregexp/xregexp-all-min.js" "dest": "../deploy/web-apps/vendor/xregexp/xregexp-all-min.js"
} }
} }
}, },
"jszip": { "jszip": {
"clean": [ "clean": [
"../deploy/vendor/jszip" "../deploy/web-apps/vendor/jszip"
], ],
"copy": { "copy": {
"script": { "script": {
"src": "../vendor/jszip/jszip.min.js", "src": "../vendor/jszip/jszip.min.js",
"dest": "../deploy/vendor/jszip/jszip.min.js" "dest": "../deploy/web-apps/vendor/jszip/jszip.min.js"
} }
} }
}, },
"jsziputils": { "jsziputils": {
"clean": [ "clean": [
"../deploy/vendor/jszip-utils" "../deploy/web-apps/vendor/jszip-utils"
], ],
"copy": { "copy": {
"script": { "script": {
"src": "../vendor/jszip-utils/jszip-utils.min.js", "src": "../vendor/jszip-utils/jszip-utils.min.js",
"dest": "../deploy/vendor/jszip-utils/jszip-utils.min.js" "dest": "../deploy/web-apps/vendor/jszip-utils/jszip-utils.min.js"
} }
} }
}, },
"jsrsasign": { "jsrsasign": {
"clean": [ "clean": [
"../deploy/vendor/jsrsasign" "../deploy/web-apps/vendor/jsrsasign"
], ],
"copy": { "copy": {
"script": { "script": {
"src": "../vendor/jsrsasign/jsrsasign-latest-all-min.js", "src": "../vendor/jsrsasign/jsrsasign-latest-all-min.js",
"dest": "../deploy/vendor/jsrsasign/jsrsasign-latest-all-min.js" "dest": "../deploy/web-apps/vendor/jsrsasign/jsrsasign-latest-all-min.js"
} }
} }
}, },
"underscore": { "underscore": {
"clean": [ "clean": [
"../deploy/vendor/underscore" "../deploy/web-apps/vendor/underscore"
], ],
"copy": { "copy": {
"script": { "script": {
"src": "../vendor/underscore/underscore-min.js", "src": "../vendor/underscore/underscore-min.js",
"dest": "../deploy/vendor/underscore/underscore-min.js" "dest": "../deploy/web-apps/vendor/underscore/underscore-min.js"
} }
} }
}, },
"requirejs": { "requirejs": {
"clean": [ "clean": [
"../deploy/vendor/requirejs" "../deploy/web-apps/vendor/requirejs"
], ],
"min": { "min": {
"src": "../vendor/requirejs/require.js", "src": "../vendor/requirejs/require.js",
"dest": "../deploy/vendor/requirejs/require.js" "dest": "../deploy/web-apps/vendor/requirejs/require.js"
} }
}, },
"zeroclipboard": { "zeroclipboard": {
"clean": [ "clean": [
"../deploy/vendor/ZeroClipboard" "../deploy/web-apps/vendor/ZeroClipboard"
], ],
"copy": { "copy": {
"script": { "script": {
...@@ -482,32 +469,32 @@ ...@@ -482,32 +469,32 @@
"src": [ "src": [
"**" "**"
], ],
"dest": "../deploy/vendor/ZeroClipboard/" "dest": "../deploy/web-apps/vendor/ZeroClipboard/"
} }
} }
}, },
"obf_api": { "obf_api": {
"ccvars": "../sdk/PowerPoint/variable.map", "ccvars": "../../sdkjs/slide/variable.map",
"ccprops": "../sdk/PowerPoint/property.map", "ccprops": "../../sdkjs/slide/property.map",
"api": "../sdk/PowerPoint/apiExport.js", "api": "../../sdkjs/slide/apiExport.js",
"clientjs": [ "clientjs": [
"../deploy/apps/presentationeditor/main/app-edit.js", "../deploy/web-apps/apps/presentationeditor/main/app-edit.js",
"../deploy/apps/presentationeditor/main/app-view.js", "../deploy/web-apps/apps/presentationeditor/main/app-view.js",
"../deploy/apps/presentationeditor/mobile/app-all.js", "../deploy/web-apps/apps/presentationeditor/mobile/app-all.js",
"../deploy/apps/presentationeditor/embed/app-all.js" "../deploy/web-apps/apps/presentationeditor/embed/app-all.js"
], ],
"ccres": "../deploy/sdk/PowerPoint/sdk-all.js" "ccres": "../deploy/sdkjs/slide/sdk-all.js"
}, },
"obf": { "obf": {
"api": "../deploy/sdk/PowerPoint/sdk-all.js", "api": "../deploy/sdkjs/slide/sdk-all.js",
"pat": "asc_\\w+", "pat": "asc_\\w+",
"keys": "-exp se -use-for-name", "keys": "-exp se -use-for-name",
"apply": [ "apply": [
"../deploy/sdk/PowerPoint/sdk-all.js", "../deploy/sdkjs/slide/sdk-all.js",
"../deploy/apps/presentationeditor/main/app-edit.js", "../deploy/web-apps/apps/presentationeditor/main/app-edit.js",
"../deploy/apps/presentationeditor/main/app-view.js", "../deploy/web-apps/apps/presentationeditor/main/app-view.js",
"../deploy/apps/presentationeditor/mobile/app-all.js", "../deploy/web-apps/apps/presentationeditor/mobile/app-all.js",
"../deploy/apps/presentationeditor/embed/app-all.js" "../deploy/web-apps/apps/presentationeditor/embed/app-all.js"
] ]
}, },
"tasks": { "tasks": {
......
build/spreadsheeteditor.json
View file @ 12b10efa
{ {
"name": "spreadsheeteditor", "name": "spreadsheeteditor",
"version": "3.6.0", "version": "4.6.0",
"build": 857, "build": 865,
"homepage": "http://www.onlyoffice.com", "homepage": "http://www.onlyoffice.com",
"private": true, "private": true,
"sdk": { "sdk": {
"clean": [ "clean": [
"../deploy/sdk/Common", "../deploy/sdkjs/common",
"../deploy/sdk/Excel", "../deploy/sdkjs/cell"
"../deploy/sdk/Fonts"
], ],
"copy": { "copy": {
"script": { "script": {
"files": [ "files": [
{ {
"expand": true, "expand": true,
"cwd": "../sdk/Common/", "cwd": "../../sdkjs/common/",
"src": [ "src": [
"Images/**", "Images/*.cur",
"Native/**", "Native/*.js"
"AllFonts.js"
], ],
"dest": "../deploy/sdk/Common/" "dest": "../deploy/sdkjs/common/"
}, },
{ {
"expand": true, "expand": true,
"cwd": "../sdk/Excel/css/", "cwd": "../../sdkjs/cell/css/",
"src": "*.css", "src": "*.css",
"dest": "../deploy/sdk/Excel/css/" "dest": "../deploy/sdkjs/cell/css/"
}, },
{ {
"expand": true, "expand": true,
"cwd": "../sdk/Word/Images/", "cwd": "../../sdkjs/word/Images/",
"src": "*.cur", "src": "*.cur",
"dest": "../deploy/sdk/Word/Images/" "dest": "../deploy/sdkjs/word/Images/"
}, },
{ {
"expand": true, "src": "../../sdkjs/cell/sdk-all.js",
"cwd": "../sdk/Fonts/", "dest": "../deploy/sdkjs/cell/sdk-all.js"
"src": "**/**",
"dest": "../deploy/sdk/Fonts/"
},
{
"src": "../sdk/Excel/sdk-all.js",
"dest": "../deploy/sdk/Excel/sdk-all.js"
} }
] ]
} }
...@@ -51,26 +43,29 @@ ...@@ -51,26 +43,29 @@
}, },
"api": { "api": {
"clean": [ "clean": [
"../deploy/apps/api" "../deploy/web-apps/apps/api"
], ],
"copy": { "copy": {
"script": { "script": {
"expand": true, "expand": true,
"cwd": "../apps/api/", "cwd": "../apps/api/",
"src": "**", "src": [
"dest": "../deploy/apps/api/" "**",
"!**/*.desktop"
],
"dest": "../deploy/web-apps/apps/api/"
} }
} }
}, },
"main": { "main": {
"clean": [ "clean": [
"../deploy/apps/spreadsheeteditor/main" "../deploy/web-apps/apps/spreadsheeteditor/main"
], ],
"js": { "js": {
"requirejs": { "requirejs": {
"options": { "options": {
"name": "../apps/spreadsheeteditor/main/app.js", "name": "../apps/spreadsheeteditor/main/app.js",
"out": "../deploy/apps/spreadsheeteditor/main/app.js", "out": "../deploy/web-apps/apps/spreadsheeteditor/main/app.js",
"baseUrl": "../apps/", "baseUrl": "../apps/",
"inlineText": true, "inlineText": true,
"findNestedDependencies": true, "findNestedDependencies": true,
...@@ -165,7 +160,7 @@ ...@@ -165,7 +160,7 @@
"embedImages": true, "embedImages": true,
"files": { "files": {
"src": "../apps/spreadsheeteditor/main/resources/less/app.less", "src": "../apps/spreadsheeteditor/main/resources/less/app.less",
"dest": "../deploy/apps/spreadsheeteditor/main/resources/css/app.css" "dest": "../deploy/web-apps/apps/spreadsheeteditor/main/resources/css/app.css"
}, },
"replacements": [ "replacements": [
{ {
...@@ -186,17 +181,17 @@ ...@@ -186,17 +181,17 @@
"src": [ "src": [
"**/*.{png,jpg,gif}" "**/*.{png,jpg,gif}"
], ],
"dest": "../deploy/apps/spreadsheeteditor/main/resources/img/" "dest": "../deploy/web-apps/apps/spreadsheeteditor/main/resources/img/"
} }
], ],
"images-common": [ "images-common": [
{ {
"expand": true, "expand": true,
"cwd": "../sdk/Word/Images/", "cwd": "../../sdkjs/word/Images/",
"src": [ "src": [
"**/*.cur" "**/*.cur"
], ],
"dest": "../deploy/apps/spreadsheeteditor/main/Images/" "dest": "../deploy/web-apps/apps/spreadsheeteditor/main/Images/"
}, },
{ {
"expand": true, "expand": true,
...@@ -204,7 +199,7 @@ ...@@ -204,7 +199,7 @@
"src": [ "src": [
"**/*.{png,jpg,gif}" "**/*.{png,jpg,gif}"
], ],
"dest": "../deploy/apps/spreadsheeteditor/main/resources/img/" "dest": "../deploy/web-apps/apps/spreadsheeteditor/main/resources/img/"
} }
] ]
}, },
...@@ -214,13 +209,13 @@ ...@@ -214,13 +209,13 @@
"expand": true, "expand": true,
"cwd": "../apps/spreadsheeteditor/main/locale/", "cwd": "../apps/spreadsheeteditor/main/locale/",
"src": "*", "src": "*",
"dest": "../deploy/apps/spreadsheeteditor/main/locale/" "dest": "../deploy/web-apps/apps/spreadsheeteditor/main/locale/"
}, },
{ {
"expand": true, "expand": true,
"cwd": "../apps/spreadsheeteditor/main/resources/formula-lang", "cwd": "../apps/spreadsheeteditor/main/resources/formula-lang",
"src": "*", "src": "*",
"dest": "../deploy/apps/spreadsheeteditor/main/resources/formula-lang" "dest": "../deploy/web-apps/apps/spreadsheeteditor/main/resources/formula-lang"
} }
], ],
"help": [ "help": [
...@@ -228,26 +223,26 @@ ...@@ -228,26 +223,26 @@
"expand": true, "expand": true,
"cwd": "../apps/spreadsheeteditor/main/resources/help/en/", "cwd": "../apps/spreadsheeteditor/main/resources/help/en/",
"src": "**", "src": "**",
"dest": "../deploy/apps/spreadsheeteditor/main/resources/help/en/" "dest": "../deploy/web-apps/apps/spreadsheeteditor/main/resources/help/en/"
}, },
{ {
"expand": true, "expand": true,
"cwd": "../apps/spreadsheeteditor/main/resources/help/ru/", "cwd": "../apps/spreadsheeteditor/main/resources/help/ru/",
"src": "**", "src": "**",
"dest": "../deploy/apps/spreadsheeteditor/main/resources/help/ru/" "dest": "../deploy/web-apps/apps/spreadsheeteditor/main/resources/help/ru/"
} }
], ],
"index-page": [ "index-page": [
{ {
"src": "../apps/spreadsheeteditor/main/index.html.deploy", "src": "../apps/spreadsheeteditor/main/index.html.deploy",
"dest": "../deploy/apps/spreadsheeteditor/main/index.html" "dest": "../deploy/web-apps/apps/spreadsheeteditor/main/index.html"
} }
] ]
} }
}, },
"mobile": { "mobile": {
"clean": [ "clean": [
"../deploy/apps/spreadsheeteditor/mobile" "../deploy/web-apps/apps/spreadsheeteditor/mobile"
], ],
"js": { "js": {
"src": [ "src": [
...@@ -278,32 +273,32 @@ ...@@ -278,32 +273,32 @@
"../apps/common/locale.js", "../apps/common/locale.js",
"../apps/spreadsheeteditor/mobile/app.js" "../apps/spreadsheeteditor/mobile/app.js"
], ],
"dist": "../deploy/apps/spreadsheeteditor/mobile/app-all.js" "dist": "../deploy/web-apps/apps/spreadsheeteditor/mobile/app-all.js"
}, },
"css": { "css": {
"normal": { "normal": {
"src": [ "src": [
"../apps/spreadsheeteditor/mobile/resources/css/application-normal.css" "../apps/spreadsheeteditor/mobile/resources/css/application-normal.css"
], ],
"dist": "../deploy/apps/spreadsheeteditor/mobile/resources/css/application-normal.css" "dist": "../deploy/web-apps/apps/spreadsheeteditor/mobile/resources/css/application-normal.css"
}, },
"retina": { "retina": {
"src": [ "src": [
"../apps/spreadsheeteditor/mobile/resources/css/application-retina.css" "../apps/spreadsheeteditor/mobile/resources/css/application-retina.css"
], ],
"dist": "../deploy/apps/spreadsheeteditor/mobile/resources/css/application-retina.css" "dist": "../deploy/web-apps/apps/spreadsheeteditor/mobile/resources/css/application-retina.css"
} }
}, },
"copy": { "copy": {
"index-page": { "index-page": {
"../deploy/apps/spreadsheeteditor/mobile/index.html": "../apps/spreadsheeteditor/mobile/index.html.deploy" "../deploy/web-apps/apps/spreadsheeteditor/mobile/index.html": "../apps/spreadsheeteditor/mobile/index.html.deploy"
}, },
"localization": [ "localization": [
{ {
"expand": true, "expand": true,
"cwd": "../apps/spreadsheeteditor/mobile/locale/", "cwd": "../apps/spreadsheeteditor/mobile/locale/",
"src": "*", "src": "*",
"dest": "../deploy/apps/spreadsheeteditor/mobile/locale/" "dest": "../deploy/web-apps/apps/spreadsheeteditor/mobile/locale/"
} }
], ],
"images-app": [ "images-app": [
...@@ -311,14 +306,14 @@ ...@@ -311,14 +306,14 @@
"expand": true, "expand": true,
"cwd": "../apps/spreadsheeteditor/mobile/resources/img/", "cwd": "../apps/spreadsheeteditor/mobile/resources/img/",
"src": "**", "src": "**",
"dest": "../deploy/apps/spreadsheeteditor/mobile/resources/img/" "dest": "../deploy/web-apps/apps/spreadsheeteditor/mobile/resources/img/"
} }
] ]
} }
}, },
"embed": { "embed": {
"clean": [ "clean": [
"../deploy/apps/spreadsheeteditor/embed" "../deploy/web-apps/apps/spreadsheeteditor/embed"
], ],
"js": { "js": {
"src": [ "src": [
...@@ -328,12 +323,12 @@ ...@@ -328,12 +323,12 @@
"../apps/spreadsheeteditor/embed/js/ApplicationController.js", "../apps/spreadsheeteditor/embed/js/ApplicationController.js",
"../apps/spreadsheeteditor/embed/js/application.js" "../apps/spreadsheeteditor/embed/js/application.js"
], ],
"dist": "../deploy/apps/spreadsheeteditor/embed/app-all.js" "dist": "../deploy/web-apps/apps/spreadsheeteditor/embed/app-all.js"
}, },
"less": { "less": {
"files": { "files": {
"src": "../apps/spreadsheeteditor/embed/resources/less/application.less", "src": "../apps/spreadsheeteditor/embed/resources/less/application.less",
"dist": "../deploy/apps/spreadsheeteditor/embed/resources/css/app-all.css" "dist": "../deploy/web-apps/apps/spreadsheeteditor/embed/resources/css/app-all.css"
}, },
"replacements": [ "replacements": [
{ {
...@@ -344,64 +339,64 @@ ...@@ -344,64 +339,64 @@
}, },
"copy": { "copy": {
"index-page": { "index-page": {
"../deploy/apps/spreadsheeteditor/embed/index.html": "../apps/spreadsheeteditor/embed/index.html.deploy" "../deploy/web-apps/apps/spreadsheeteditor/embed/index.html": "../apps/spreadsheeteditor/embed/index.html.deploy"
}, },
"images-app": [ "images-app": [
{ {
"expand": true, "expand": true,
"cwd": "../apps/common/embed/resources/img/", "cwd": "../apps/common/embed/resources/img/",
"src": "**", "src": "**",
"dest": "../deploy/apps/spreadsheeteditor/embed/resources/img/" "dest": "../deploy/web-apps/apps/spreadsheeteditor/embed/resources/img/"
} }
] ]
} }
}, },
"touch": { "touch": {
"clean": [ "clean": [
"../deploy/vendor/touch" "../deploy/web-apps/vendor/touch"
], ],
"copy": { "copy": {
"script": { "script": {
"src": "../vendor/touch/sencha-touch-all.js", "src": "../vendor/touch/sencha-touch-all.js",
"dest": "../deploy/vendor/touch/sencha-touch-all.js" "dest": "../deploy/web-apps/vendor/touch/sencha-touch-all.js"
} }
} }
}, },
"bootstrap": { "bootstrap": {
"clean": [ "clean": [
"../deploy/vendor/bootstrap" "../deploy/web-apps/vendor/bootstrap"
], ],
"copy": { "copy": {
"script": { "script": {
"src": "../vendor/bootstrap/dist/js/bootstrap.min.js", "src": "../vendor/bootstrap/dist/js/bootstrap.min.js",
"dest": "../deploy/vendor/bootstrap/dist/js/bootstrap.min.js" "dest": "../deploy/web-apps/vendor/bootstrap/dist/js/bootstrap.min.js"
}, },
"font": { "font": {
"expand": true, "expand": true,
"cwd": "../vendor/bootstrap/dist/fonts/", "cwd": "../vendor/bootstrap/dist/fonts/",
"src": "*", "src": "*",
"dest": "../deploy/vendor/bootstrap/dist/fonts/" "dest": "../deploy/web-apps/vendor/bootstrap/dist/fonts/"
}, },
"css": { "css": {
"src": "../vendor/bootstrap/dist/css/bootstrap.min.css", "src": "../vendor/bootstrap/dist/css/bootstrap.min.css",
"dest": "../deploy/vendor/bootstrap/dist/css/bootstrap.min.css" "dest": "../deploy/web-apps/vendor/bootstrap/dist/css/bootstrap.min.css"
} }
} }
}, },
"jquery": { "jquery": {
"clean": [ "clean": [
"../deploy/vendor/jquery" "../deploy/web-apps/vendor/jquery"
], ],
"copy": { "copy": {
"script": { "script": {
"files": [ "files": [
{ {
"src": "../vendor/jquery/jquery.min.js", "src": "../vendor/jquery/jquery.min.js",
"dest": "../deploy/vendor/jquery/jquery.min.js" "dest": "../deploy/web-apps/vendor/jquery/jquery.min.js"
}, },
{ {
"src": "../vendor/jquery.browser/dist/jquery.browser.min.js", "src": "../vendor/jquery.browser/dist/jquery.browser.min.js",
"dest": "../deploy/vendor/jquery/jquery.browser.min.js" "dest": "../deploy/web-apps/vendor/jquery/jquery.browser.min.js"
} }
] ]
} }
...@@ -409,93 +404,93 @@ ...@@ -409,93 +404,93 @@
}, },
"megapixel": { "megapixel": {
"clean": [ "clean": [
"../deploy/vendor/megapixel" "../deploy/web-apps/vendor/megapixel"
], ],
"copy": { "copy": {
"script": { "script": {
"src": "../vendor/megapixel/megapix-image-min.js", "src": "../vendor/megapixel/megapix-image-min.js",
"dest": "../deploy/vendor/megapixel/megapix-image-min.js" "dest": "../deploy/web-apps/vendor/megapixel/megapix-image-min.js"
} }
} }
}, },
"sockjs": { "sockjs": {
"clean": [ "clean": [
"../deploy/vendor/sockjs" "../deploy/web-apps/vendor/sockjs"
], ],
"copy": { "copy": {
"script": { "script": {
"src": "../vendor/sockjs/sockjs.min.js", "src": "../vendor/sockjs/sockjs.min.js",
"dest": "../deploy/vendor/sockjs/sockjs.min.js" "dest": "../deploy/web-apps/vendor/sockjs/sockjs.min.js"
} }
} }
}, },
"xregexp": { "xregexp": {
"clean": [ "clean": [
"../deploy/vendor/xregexp" "../deploy/web-apps/vendor/xregexp"
], ],
"copy": { "copy": {
"script": { "script": {
"src": "../vendor/xregexp/xregexp-all-min.js", "src": "../vendor/xregexp/xregexp-all-min.js",
"dest": "../deploy/vendor/xregexp/xregexp-all-min.js" "dest": "../deploy/web-apps/vendor/xregexp/xregexp-all-min.js"
} }
} }
}, },
"jszip": { "jszip": {
"clean": [ "clean": [
"../deploy/vendor/jszip" "../deploy/web-apps/vendor/jszip"
], ],
"copy": { "copy": {
"script": { "script": {
"src": "../vendor/jszip/jszip.min.js", "src": "../vendor/jszip/jszip.min.js",
"dest": "../deploy/vendor/jszip/jszip.min.js" "dest": "../deploy/web-apps/vendor/jszip/jszip.min.js"
} }
} }
}, },
"jsziputils": { "jsziputils": {
"clean": [ "clean": [
"../deploy/vendor/jszip-utils" "../deploy/web-apps/vendor/jszip-utils"
], ],
"copy": { "copy": {
"script": { "script": {
"src": "../vendor/jszip-utils/jszip-utils.min.js", "src": "../vendor/jszip-utils/jszip-utils.min.js",
"dest": "../deploy/vendor/jszip-utils/jszip-utils.min.js" "dest": "../deploy/web-apps/vendor/jszip-utils/jszip-utils.min.js"
} }
} }
}, },
"jsrsasign": { "jsrsasign": {
"clean": [ "clean": [
"../deploy/vendor/jsrsasign" "../deploy/web-apps/vendor/jsrsasign"
], ],
"copy": { "copy": {
"script": { "script": {
"src": "../vendor/jsrsasign/jsrsasign-latest-all-min.js", "src": "../vendor/jsrsasign/jsrsasign-latest-all-min.js",
"dest": "../deploy/vendor/jsrsasign/jsrsasign-latest-all-min.js" "dest": "../deploy/web-apps/vendor/jsrsasign/jsrsasign-latest-all-min.js"
} }
} }
}, },
"underscore": { "underscore": {
"clean": [ "clean": [
"../deploy/vendor/underscore" "../deploy/web-apps/vendor/underscore"
], ],
"copy": { "copy": {
"script": { "script": {
"src": "../vendor/underscore/underscore-min.js", "src": "../vendor/underscore/underscore-min.js",
"dest": "../deploy/vendor/underscore/underscore-min.js" "dest": "../deploy/web-apps/vendor/underscore/underscore-min.js"
} }
} }
}, },
"requirejs": { "requirejs": {
"clean": [ "clean": [
"../deploy/vendor/requirejs" "../deploy/web-apps/vendor/requirejs"
], ],
"min": { "min": {
"src": "../vendor/requirejs/require.js", "src": "../vendor/requirejs/require.js",
"dest": "../deploy/vendor/requirejs/require.js" "dest": "../deploy/web-apps/vendor/requirejs/require.js"
} }
}, },
"zeroclipboard": { "zeroclipboard": {
"clean": [ "clean": [
"../deploy/vendor/ZeroClipboard" "../deploy/web-apps/vendor/ZeroClipboard"
], ],
"copy": { "copy": {
"script": { "script": {
...@@ -504,20 +499,20 @@ ...@@ -504,20 +499,20 @@
"src": [ "src": [
"**" "**"
], ],
"dest": "../deploy/vendor/ZeroClipboard/" "dest": "../deploy/web-apps/vendor/ZeroClipboard/"
} }
} }
}, },
"obf": { "obf": {
"api": "../deploy/sdk/Excel/sdk-all.js", "api": "../deploy/sdkjs/cell/sdk-all.js",
"pat": "asc_\\w+", "pat": "asc_\\w+",
"keys": "-exp se -use-for-name", "keys": "-exp se -use-for-name",
"apply": [ "apply": [
"../deploy/sdk/Excel/sdk-all.js", "../deploy/sdkjs/cell/sdk-all.js",
"../deploy/apps/spreadsheeteditor/main/app-edit.js", "../deploy/web-apps/apps/spreadsheeteditor/main/app-edit.js",
"../deploy/apps/spreadsheeteditor/main/app-view.js", "../deploy/web-apps/apps/spreadsheeteditor/main/app-view.js",
"../deploy/apps/spreadsheeteditor/mobile/app-all.js", "../deploy/web-apps/apps/spreadsheeteditor/mobile/app-all.js",
"../deploy/apps/spreadsheeteditor/embed/app-all.js" "../deploy/web-apps/apps/spreadsheeteditor/embed/app-all.js"
] ]
}, },
"tasks": { "tasks": {
......
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