Skip to content

W
web-apps
Commit c377fb54 authored by Sergey Luzyanin's avatar Sergey Luzyanin
Browse files
Options

Merge branch 'develop' of https://github.com/ONLYOFFICE/web-apps into develop

parents 45ed0809 5f631382
Hide whitespace changes
Inline Side-by-side
Showing with 280 additions and 287 deletions
apps/documenteditor/main/app.js
View file @ c377fb54
......@@ -25,8 +25,8 @@ require.config({
jszip : '../vendor/jszip/jszip.min',
jsziputils : '../vendor/jszip-utils/jszip-utils.min',
jsrsasign : '../vendor/jsrsasign/jsrsasign-latest-all-min',
allfonts : '../sdkjs/common/AllFonts',
sdk : '../sdkjs/word/sdk-all',
allfonts : '../../sdkjs/common/AllFonts',
sdk : '../../sdkjs/word/sdk-all',
api : 'api/documents/api',
core : 'common/main/lib/core/application',
notification : 'common/main/lib/core/NotificationCenter',
......
apps/documenteditor/main/app/controller/RightMenu.js
View file @ c377fb54
......@@ -72,7 +72,7 @@ define([
this.rightmenu.fireEvent('editcomplete', this.rightmenu);
},
onFocusObject: function(SelectedObjects) {
onFocusObject: function(SelectedObjects, open) {
if (!this.editMode)
return;
......@@ -158,7 +158,7 @@ define([
if (!this._settings[Common.Utils.documentSettingsType.MailMerge].hidden)
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;
if (priorityactive>-1) active = priorityactive;
......@@ -166,8 +166,11 @@ define([
else if (currentactive>=0) active = currentactive;
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) {
this.rightmenu.SetActivePane(active);
this.rightmenu.SetActivePane(active, open);
if (active!=Common.Utils.documentSettingsType.MailMerge)
this._settings[active].panel.ChangeSettings.call(this._settings[active].panel, this._settings[active].props);
else
......@@ -237,8 +240,12 @@ define([
if (this.editMode && this.api) {
var selectedElements = this.api.getSelectedElements();
if (selectedElements.length>0)
this.onFocusObject(selectedElements);
if (selectedElements.length>0) {
var open = Common.localStorage.getItem("de-hide-right-settings");
open = (open===null || parseInt(open) == 0);
this.onFocusObject(selectedElements, open);
}
}
},
......
apps/documenteditor/main/app/view/RightMenu.js
View file @ c377fb54
......@@ -194,7 +194,7 @@ define([
$(this.el).width(MENU_SCALE_PART);
target_pane_parent.css("display", "inline-block" );
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.addClass("active");
......@@ -206,7 +206,7 @@ define([
target_pane_parent.css("display", "none" );
$(this.el).width(SCALE_MIN);
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]);
......@@ -248,7 +248,6 @@ define([
target_pane.css("display", "none" );
$(this.el).width(SCALE_MIN);
this.minimizedMode = true;
Common.localStorage.setItem("de-hidden-right-settings", 1);
Common.NotificationCenter.trigger('layout:changed', 'rightmenu');
},
......
apps/presentationeditor/main/app.js
View file @ c377fb54
......@@ -24,8 +24,8 @@ require.config({
sockjs : '../vendor/sockjs/sockjs.min',
jsziputils : '../vendor/jszip-utils/jszip-utils.min',
jsrsasign : '../vendor/jsrsasign/jsrsasign-latest-all-min',
allfonts : '../sdkjs/common/AllFonts',
sdk : '../sdkjs/slide/sdk-all',
allfonts : '../../sdkjs/common/AllFonts',
sdk : '../../sdkjs/slide/sdk-all',
api : 'api/documents/api',
core : 'common/main/lib/core/application',
notification : 'common/main/lib/core/NotificationCenter',
......
apps/presentationeditor/main/app/controller/RightMenu.js
View file @ c377fb54
......@@ -71,7 +71,7 @@ define([
this.rightmenu.fireEvent('editcomplete', this.rightmenu);
},
onFocusObject: function(SelectedObjects) {
onFocusObject: function(SelectedObjects, open) {
if (!this.editMode)
return;
......@@ -147,7 +147,7 @@ define([
}
}
if (!this.rightmenu.minimizedMode) {
if (!this.rightmenu.minimizedMode || open) {
var active;
if (priorityactive>-1) active = priorityactive;
......@@ -156,7 +156,7 @@ define([
else active = Common.Utils.documentSettingsType.Slide;
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);
}
}
......@@ -214,8 +214,12 @@ define([
this.api.asc_registerCallback('asc_doubleClickOnObject', _.bind(this.onDoubleClickOnObject, this));
var selectedElements = this.api.getSelectedElements();
if (selectedElements.length>0)
this.onFocusObject(selectedElements);
if (selectedElements.length>0) {
var open = Common.localStorage.getItem("pe-hide-right-settings");
open = (open===null || parseInt(open) == 0);
this.onFocusObject(selectedElements, open);
}
}
},
......
apps/presentationeditor/main/app/view/RightMenu.js
View file @ c377fb54
......@@ -176,7 +176,7 @@ define([
$(this.el).width(MENU_SCALE_PART);
target_pane_parent.css("display", "inline-block" );
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.addClass("active");
......@@ -189,7 +189,7 @@ define([
target_pane_parent.css("display", "none" );
$(this.el).width(SCALE_MIN);
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]);
......@@ -245,7 +245,6 @@ define([
target_pane.css("display", "none" );
$(this.el).width(SCALE_MIN);
this.minimizedMode = true;
Common.localStorage.setItem("pe-hidden-right-settings", 1);
Common.NotificationCenter.trigger('layout:changed', 'rightmenu');
},
......
apps/spreadsheeteditor/main/app.js
View file @ c377fb54
......@@ -24,8 +24,8 @@ require.config({
sockjs : '../vendor/sockjs/sockjs.min',
jsziputils : '../vendor/jszip-utils/jszip-utils.min',
jsrsasign : '../vendor/jsrsasign/jsrsasign-latest-all-min',
allfonts : '../sdkjs/common/AllFonts',
sdk : '../sdkjs/cell/sdk-all',
allfonts : '../../sdkjs/common/AllFonts',
sdk : '../../sdkjs/cell/sdk-all',
api : 'api/documents/api',
core : 'common/main/lib/core/application',
notification : 'common/main/lib/core/NotificationCenter',
......
apps/spreadsheeteditor/main/app/controller/RightMenu.js
View file @ c377fb54
......@@ -156,16 +156,20 @@ define([
}
}
if (!this.rightmenu.minimizedMode) {
if (!this.rightmenu.minimizedMode || this._openRightMenu) {
var active;
if (priorityactive>-1) active = priorityactive;
else if (lastactive>=0 && currentactive<0) active = lastactive;
else if (currentactive>=0) active = currentactive;
if (active == undefined && this._openRightMenu && lastactive>=0)
active = lastactive;
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._openRightMenu = false;
}
}
......@@ -213,6 +217,9 @@ define([
createDelayedElements: function() {
var me = this;
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_onSelectionChanged', _.bind(this.onSelectionChanged, this));
this.api.asc_registerCallback('asc_doubleClickOnObject', _.bind(this.onDoubleClickOnObject, this));
......
apps/spreadsheeteditor/main/app/view/RightMenu.js
View file @ c377fb54
......@@ -150,7 +150,7 @@ define([
$(this.el).width(MENU_SCALE_PART);
target_pane_parent.css("display", "inline-block" );
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.addClass("active");
......@@ -162,7 +162,7 @@ define([
target_pane_parent.css("display", "none" );
$(this.el).width(SCALE_MIN);
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]);
......@@ -216,7 +216,6 @@ define([
target_pane.css("display", "none" );
$(this.el).width(SCALE_MIN);
this.minimizedMode = true;
Common.localStorage.setItem("sse-hidden-right-settings", 1);
Common.NotificationCenter.trigger('layout:changed', 'rightmenu');
},
......
apps/spreadsheeteditor/main/index.html.deploy
View file @ c377fb54
......@@ -8,7 +8,7 @@
<meta name="keywords" content="" />
<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">
<!-- splash -->
......
build/documenteditor.json
View file @ c377fb54
{
"name": "documenteditor",
"version": "3.6.0",
"build": 1046,
"version": "4.6.0",
"build": 1054,
"homepage": "http://www.onlyoffice.com",
"private": true,
"sdk": {
"clean": [
"../deploy/sdk/Common",
"../deploy/sdk/Word"
"../deploy/sdkjs/common",
"../deploy/sdkjs/word"
],
"copy": {
"script": {
"files": [
{
"expand": true,
"cwd": "../sdk/Common/",
"cwd": "../../sdkjs/common/",
"src": [
"Images/**",
"Native/**",
"AllFonts.js"
"Images/*.cur",
"Native/*.js"
],
"dest": "../deploy/sdk/Common/"
"dest": "../deploy/sdkjs/common/"
},
{
"expand": true,
"cwd": "../sdk/Fonts/",
"src": "**/**",
"dest": "../deploy/sdk/Fonts/"
},
{
"src": "../sdk/Word/sdk-all.js",
"dest": "../deploy/sdk/Word/sdk-all.js"
"src": "../../sdkjs/word/sdk-all.js",
"dest": "../deploy/sdkjs/word/sdk-all.js"
}
]
}
......@@ -38,26 +31,29 @@
},
"api": {
"clean": [
"../deploy/apps/api"
"../deploy/web-apps/apps/api"
],
"copy": {
"script": {
"expand": true,
"cwd": "../apps/api/",
"src": "**",
"dest": "../deploy/apps/api/"
"src": [
"**",
"!**/*.desktop"
],
"dest": "../deploy/web-apps/apps/api/"
}
}
},
"main": {
"clean": [
"../deploy/apps/documenteditor/main"
"../deploy/web-apps/apps/documenteditor/main"
],
"js": {
"requirejs": {
"options": {
"name": "../apps/documenteditor/main/app.js",
"out": "../deploy/apps/documenteditor/main/app.js",
"out": "../deploy/web-apps/apps/documenteditor/main/app.js",
"baseUrl": "../apps/",
"inlineText": true,
"findNestedDependencies": true,
......@@ -152,7 +148,7 @@
"embedImages": true,
"files": {
"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": [
{
......@@ -173,7 +169,7 @@
"src": [
"**/*.{png,jpg,gif}"
],
"dest": "../deploy/apps/documenteditor/main/resources/img/"
"dest": "../deploy/web-apps/apps/documenteditor/main/resources/img/"
}
],
"images-common": [
......@@ -183,7 +179,7 @@
"src": [
"**/*.{png,jpg,gif}"
],
"dest": "../deploy/apps/documenteditor/main/resources/img/"
"dest": "../deploy/web-apps/apps/documenteditor/main/resources/img/"
}
]
},
......@@ -193,7 +189,7 @@
"expand": true,
"cwd": "../apps/documenteditor/main/locale/",
"src": "*",
"dest": "../deploy/apps/documenteditor/main/locale/"
"dest": "../deploy/web-apps/apps/documenteditor/main/locale/"
}
],
"help": [
......@@ -201,26 +197,26 @@
"expand": true,
"cwd": "../apps/documenteditor/main/resources/help/en/",
"src": "**",
"dest": "../deploy/apps/documenteditor/main/resources/help/en/"
"dest": "../deploy/web-apps/apps/documenteditor/main/resources/help/en/"
},
{
"expand": true,
"cwd": "../apps/documenteditor/main/resources/help/ru/",
"src": "**",
"dest": "../deploy/apps/documenteditor/main/resources/help/ru/"
"dest": "../deploy/web-apps/apps/documenteditor/main/resources/help/ru/"
}
],
"index-page": [
{
"src": "../apps/documenteditor/main/index.html.deploy",
"dest": "../deploy/apps/documenteditor/main/index.html"
"dest": "../deploy/web-apps/apps/documenteditor/main/index.html"
}
]
}
},
"mobile": {
"clean": [
"../deploy/apps/documenteditor/mobile"
"../deploy/web-apps/apps/documenteditor/mobile"
],
"js": {
"src": [
......@@ -270,32 +266,32 @@
"../apps/common/locale.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": {
"normal": {
"src": [
"../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": {
"src": [
"../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": {
"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": [
{
"expand": true,
"cwd": "../apps/documenteditor/mobile/locale/",
"src": "*",
"dest": "../deploy/apps/documenteditor/mobile/locale/"
"dest": "../deploy/web-apps/apps/documenteditor/mobile/locale/"
}
],
"images-app": [
......@@ -303,14 +299,14 @@
"expand": true,
"cwd": "../apps/documenteditor/mobile/resources/img/",
"src": "**",
"dest": "../deploy/apps/documenteditor/mobile/resources/img/"
"dest": "../deploy/web-apps/apps/documenteditor/mobile/resources/img/"
}
]
}
},
"embed": {
"clean": [
"../deploy/apps/documenteditor/embed"
"../deploy/web-apps/apps/documenteditor/embed"
],
"js": {
"src": [
......@@ -320,12 +316,12 @@
"../apps/documenteditor/embed/js/ApplicationController.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": {
"files": {
"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": [
{
......@@ -336,64 +332,64 @@
},
"copy": {
"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": [
{
"expand": true,
"cwd": "../apps/common/embed/resources/img/",
"src": "**",
"dest": "../deploy/apps/documenteditor/embed/resources/img/"
"dest": "../deploy/web-apps/apps/documenteditor/embed/resources/img/"
}
]
}
},
"touch": {
"clean": [
"../deploy/vendor/touch"
"../deploy/web-apps/vendor/touch"
],
"copy": {
"script": {
"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": {
"clean": [
"../deploy/vendor/bootstrap"
"../deploy/web-apps/vendor/bootstrap"
],
"copy": {
"script": {
"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": {
"expand": true,
"cwd": "../vendor/bootstrap/dist/fonts/",
"src": "*",
"dest": "../deploy/vendor/bootstrap/dist/fonts/"
"dest": "../deploy/web-apps/vendor/bootstrap/dist/fonts/"
},
"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": {
"clean": [
"../deploy/vendor/jquery"
"../deploy/web-apps/vendor/jquery"
],
"copy": {
"script": {
"files": [
{
"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",
"dest": "../deploy/vendor/jquery/jquery.browser.min.js"
"dest": "../deploy/web-apps/vendor/jquery/jquery.browser.min.js"
}
]
}
......@@ -401,93 +397,93 @@
},
"megapixel": {
"clean": [
"../deploy/vendor/megapixel"
"../deploy/web-apps/vendor/megapixel"
],
"copy": {
"script": {
"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": {
"clean": [
"../deploy/vendor/sockjs"
"../deploy/web-apps/vendor/sockjs"
],
"copy": {
"script": {
"src": "../vendor/sockjs/sockjs.min.js",
"dest": "../deploy/vendor/sockjs/sockjs.min.js"
"dest": "../deploy/web-apps/vendor/sockjs/sockjs.min.js"
}
}
},
"xregexp": {
"clean": [
"../deploy/vendor/xregexp"
"../deploy/web-apps/vendor/xregexp"
],
"copy": {
"script": {
"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": {
"clean": [
"../deploy/vendor/jszip"
"../deploy/web-apps/vendor/jszip"
],
"copy": {
"script": {
"src": "../vendor/jszip/jszip.min.js",
"dest": "../deploy/vendor/jszip/jszip.min.js"
"dest": "../deploy/web-apps/vendor/jszip/jszip.min.js"
}
}
},
"jsziputils": {
"clean": [
"../deploy/vendor/jszip-utils"
"../deploy/web-apps/vendor/jszip-utils"
],
"copy": {
"script": {
"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": {
"clean": [
"../deploy/vendor/jsrsasign"
"../deploy/web-apps/vendor/jsrsasign"
],
"copy": {
"script": {
"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": {
"clean": [
"../deploy/vendor/underscore"
"../deploy/web-apps/vendor/underscore"
],
"copy": {
"script": {
"src": "../vendor/underscore/underscore-min.js",
"dest": "../deploy/vendor/underscore/underscore-min.js"
"dest": "../deploy/web-apps/vendor/underscore/underscore-min.js"
}
}
},
"requirejs": {
"clean": [
"../deploy/vendor/requirejs"
"../deploy/web-apps/vendor/requirejs"
],
"min": {
"src": "../vendor/requirejs/require.js",
"dest": "../deploy/vendor/requirejs/require.js"
"dest": "../deploy/web-apps/vendor/requirejs/require.js"
}
},
"zeroclipboard": {
"clean": [
"../deploy/vendor/ZeroClipboard"
"../deploy/web-apps/vendor/ZeroClipboard"
],
"copy": {
"script": {
......@@ -496,33 +492,33 @@
"src": [
"**"
],
"dest": "../deploy/vendor/ZeroClipboard/"
"dest": "../deploy/web-apps/vendor/ZeroClipboard/"
}
}
},
"obf_api": {
"ccvars": "../sdk/Word/variable.map",
"ccprops": "../sdk/Word/property.map",
"api": "../sdk/Word/apiExport.js",
"ccvars": "../../sdkjs/word/variable.map",
"ccprops": "../../sdkjs/word/property.map",
"api": "../../sdkjs/word/apiExport.js",
"clientjs": [
"../deploy/apps/documenteditor/main/app-edit.js",
"../deploy/apps/documenteditor/main/app-view.js",
"../deploy/apps/documenteditor/mobile/app-all.js",
"../deploy/apps/documenteditor/embed/app-all.js",
"../deploy/apps/api/documents/cache-scripts.html"
"../deploy/web-apps/apps/documenteditor/main/app-edit.js",
"../deploy/web-apps/apps/documenteditor/main/app-view.js",
"../deploy/web-apps/apps/documenteditor/mobile/app-all.js",
"../deploy/web-apps/apps/documenteditor/embed/app-all.js",
"../deploy/web-apps/apps/api/documents/cache-scripts.html"
],
"ccres": "../deploy/sdk/Word/sdk-all.js"
"ccres": "../deploy/sdkjs/word/sdk-all.js"
},
"obf": {
"api": "../deploy/sdk/Word/sdk-all.js",
"api": "../deploy/sdkjs/word/sdk-all.js",
"pat": "asc_\\w+",
"keys": "-exp se -use-for-name",
"apply": [
"../deploy/sdk/Word/sdk-all.js",
"../deploy/apps/documenteditor/main/app-edit.js",
"../deploy/apps/documenteditor/main/app-view.js",
"../deploy/apps/documenteditor/mobile/app-all.js",
"../deploy/apps/documenteditor/embed/app-all.js"
"../deploy/sdkjs/word/sdk-all.js",
"../deploy/web-apps/apps/documenteditor/main/app-edit.js",
"../deploy/web-apps/apps/documenteditor/main/app-view.js",
"../deploy/web-apps/apps/documenteditor/mobile/app-all.js",
"../deploy/web-apps/apps/documenteditor/embed/app-all.js"
]
},
"tasks": {
......
build/package.json
View file @ c377fb54
......@@ -4,7 +4,7 @@
"homepage": "http://www.onlyoffice.com",
"private": true,
"dependencies": {
"lodash": "3.0.0",
"lodash": "^4.0.0",
"grunt": "0.4.5",
"grunt-exec": "0.4.5",
"grunt-replace": "0.7.3",
......
build/presentationeditor.json
View file @ c377fb54
{
"name": "presentationeditor",
"version": "3.6.0",
"build": 759,
"version": "4.6.0",
"build": 762,
"homepage": "http://www.onlyoffice.com",
"sdk": {
"clean": [
"../deploy/sdk/Common",
"../deploy/sdk/PowerPoint",
"../deploy/sdk/Fonts"
"../deploy/sdkjs/common",
"../deploy/sdkjs/slide"
],
"copy": {
"script": {
"files": [
{
"expand": true,
"cwd": "../sdk/Common/",
"cwd": "../../sdkjs/common/",
"src": [
"Images/**",
"Native/**",
"AllFonts.js"
"Images/*.cur",
"Native/*.js"
],
"dest": "../deploy/sdk/Common/"
"dest": "../deploy/sdkjs/common/"
},
{
"expand": true,
"cwd": "../sdk/Fonts/",
"cwd": "../../sdkjs/slide/themes/",
"src": "**/**",
"dest": "../deploy/sdk/Fonts/"
"dest": "../deploy/sdkjs/slide/themes/"
},
{
"expand": true,
"cwd": "../sdk/PowerPoint/themes/",
"src": "**/**",
"dest": "../deploy/sdk/PowerPoint/themes/"
},
{
"src": "../sdk/PowerPoint/sdk-all.js",
"dest": "../deploy/sdk/PowerPoint/sdk-all.js"
"src": "../../sdkjs/slide/sdk-all.js",
"dest": "../deploy/sdkjs/slide/sdk-all.js"
}
]
}
......@@ -44,26 +36,29 @@
},
"api": {
"clean": [
"../deploy/apps/api"
"../deploy/web-apps/apps/api"
],
"copy": {
"script": {
"expand": true,
"cwd": "../apps/api/",
"src": "**",
"dest": "../deploy/apps/api/"
"src": [
"**",
"!**/*.desktop"
],
"dest": "../deploy/web-apps/apps/api/"
}
}
},
"main": {
"clean": [
"../deploy/apps/presentationeditor/main"
"../deploy/web-apps/apps/presentationeditor/main"
],
"js": {
"requirejs": {
"options": {
"name": "../apps/presentationeditor/main/app.js",
"out": "../deploy/apps/presentationeditor/main/app.js",
"out": "../deploy/web-apps/apps/presentationeditor/main/app.js",
"baseUrl": "../apps/",
"inlineText": true,
"findNestedDependencies": true,
......@@ -158,7 +153,7 @@
"embedImages": true,
"files": {
"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": [
{
......@@ -179,25 +174,17 @@
"src": [
"**/*.{png,jpg,gif}"
],
"dest": "../deploy/apps/presentationeditor/main/resources/img/"
"dest": "../deploy/web-apps/apps/presentationeditor/main/resources/img/"
}
],
"images-common": [
{
"expand": true,
"cwd": "../sdk/PowerPoint/Images/",
"src": [
"**/*.cur"
],
"dest": "../deploy/apps/presentationeditor/main/Images/"
},
{
"expand": true,
"cwd": "../apps/common/main/resources/img/",
"src": [
"**/*.{png,jpg,gif}"
],
"dest": "../deploy/apps/presentationeditor/main/resources/img/"
"dest": "../deploy/web-apps/apps/presentationeditor/main/resources/img/"
}
]
},
......@@ -207,7 +194,7 @@
"expand": true,
"cwd": "../apps/presentationeditor/main/locale/",
"src": "*",
"dest": "../deploy/apps/presentationeditor/main/locale/"
"dest": "../deploy/web-apps/apps/presentationeditor/main/locale/"
}
],
"help": [
......@@ -215,26 +202,26 @@
"expand": true,
"cwd": "../apps/presentationeditor/main/resources/help/en/",
"src": "**",
"dest": "../deploy/apps/presentationeditor/main/resources/help/en/"
"dest": "../deploy/web-apps/apps/presentationeditor/main/resources/help/en/"
},
{
"expand": true,
"cwd": "../apps/presentationeditor/main/resources/help/ru/",
"src": "**",
"dest": "../deploy/apps/presentationeditor/main/resources/help/ru/"
"dest": "../deploy/web-apps/apps/presentationeditor/main/resources/help/ru/"
}
],
"index-page": [
{
"src": "../apps/presentationeditor/main/index.html.deploy",
"dest": "../deploy/apps/presentationeditor/main/index.html"
"dest": "../deploy/web-apps/apps/presentationeditor/main/index.html"
}
]
}
},
"mobile": {
"clean": [
"../deploy/apps/presentationeditor/mobile"
"../deploy/web-apps/apps/presentationeditor/mobile"
],
"js": {
"src": [
......@@ -256,32 +243,32 @@
"../apps/common/locale.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": {
"normal": {
"src": [
"../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": {
"src": [
"../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": {
"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": [
{
"expand": true,
"cwd": "../apps/presentationeditor/mobile/locale/",
"src": "*",
"dest": "../deploy/apps/presentationeditor/mobile/locale/"
"dest": "../deploy/web-apps/apps/presentationeditor/mobile/locale/"
}
],
"images-app": [
......@@ -289,14 +276,14 @@
"expand": true,
"cwd": "../apps/presentationeditor/mobile/resources/img/",
"src": "**",
"dest": "../deploy/apps/presentationeditor/mobile/resources/img/"
"dest": "../deploy/web-apps/apps/presentationeditor/mobile/resources/img/"
}
]
}
},
"embed": {
"clean": [
"../deploy/apps/presentationeditor/embed"
"../deploy/web-apps/apps/presentationeditor/embed"
],
"js": {
"src": [
......@@ -306,12 +293,12 @@
"../apps/presentationeditor/embed/js/ApplicationController.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": {
"files": {
"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": [
{
......@@ -322,64 +309,64 @@
},
"copy": {
"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": [
{
"expand": true,
"cwd": "../apps/common/embed/resources/img/",
"src": "**",
"dest": "../deploy/apps/presentationeditor/embed/resources/img/"
"dest": "../deploy/web-apps/apps/presentationeditor/embed/resources/img/"
}
]
}
},
"touch": {
"clean": [
"../deploy/vendor/touch"
"../deploy/web-apps/vendor/touch"
],
"copy": {
"script": {
"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": {
"clean": [
"../deploy/vendor/bootstrap"
"../deploy/web-apps/vendor/bootstrap"
],
"copy": {
"script": {
"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": {
"expand": true,
"cwd": "../vendor/bootstrap/dist/fonts/",
"src": "*",
"dest": "../deploy/vendor/bootstrap/dist/fonts/"
"dest": "../deploy/web-apps/vendor/bootstrap/dist/fonts/"
},
"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": {
"clean": [
"../deploy/vendor/jquery"
"../deploy/web-apps/vendor/jquery"
],
"copy": {
"script": {
"files": [
{
"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",
"dest": "../deploy/vendor/jquery/jquery.browser.min.js"
"dest": "../deploy/web-apps/vendor/jquery/jquery.browser.min.js"
}
]
}
......@@ -387,93 +374,93 @@
},
"megapixel": {
"clean": [
"../deploy/vendor/megapixel"
"../deploy/web-apps/vendor/megapixel"
],
"copy": {
"script": {
"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": {
"clean": [
"../deploy/vendor/sockjs"
"../deploy/web-apps/vendor/sockjs"
],
"copy": {
"script": {
"src": "../vendor/sockjs/sockjs.min.js",
"dest": "../deploy/vendor/sockjs/sockjs.min.js"
"dest": "../deploy/web-apps/vendor/sockjs/sockjs.min.js"
}
}
},
"xregexp": {
"clean": [
"../deploy/vendor/xregexp"
"../deploy/web-apps/vendor/xregexp"
],
"copy": {
"script": {
"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": {
"clean": [
"../deploy/vendor/jszip"
"../deploy/web-apps/vendor/jszip"
],
"copy": {
"script": {
"src": "../vendor/jszip/jszip.min.js",
"dest": "../deploy/vendor/jszip/jszip.min.js"
"dest": "../deploy/web-apps/vendor/jszip/jszip.min.js"
}
}
},
"jsziputils": {
"clean": [
"../deploy/vendor/jszip-utils"
"../deploy/web-apps/vendor/jszip-utils"
],
"copy": {
"script": {
"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": {
"clean": [
"../deploy/vendor/jsrsasign"
"../deploy/web-apps/vendor/jsrsasign"
],
"copy": {
"script": {
"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": {
"clean": [
"../deploy/vendor/underscore"
"../deploy/web-apps/vendor/underscore"
],
"copy": {
"script": {
"src": "../vendor/underscore/underscore-min.js",
"dest": "../deploy/vendor/underscore/underscore-min.js"
"dest": "../deploy/web-apps/vendor/underscore/underscore-min.js"
}
}
},
"requirejs": {
"clean": [
"../deploy/vendor/requirejs"
"../deploy/web-apps/vendor/requirejs"
],
"min": {
"src": "../vendor/requirejs/require.js",
"dest": "../deploy/vendor/requirejs/require.js"
"dest": "../deploy/web-apps/vendor/requirejs/require.js"
}
},
"zeroclipboard": {
"clean": [
"../deploy/vendor/ZeroClipboard"
"../deploy/web-apps/vendor/ZeroClipboard"
],
"copy": {
"script": {
......@@ -482,32 +469,32 @@
"src": [
"**"
],
"dest": "../deploy/vendor/ZeroClipboard/"
"dest": "../deploy/web-apps/vendor/ZeroClipboard/"
}
}
},
"obf_api": {
"ccvars": "../sdk/PowerPoint/variable.map",
"ccprops": "../sdk/PowerPoint/property.map",
"api": "../sdk/PowerPoint/apiExport.js",
"ccvars": "../../sdkjs/slide/variable.map",
"ccprops": "../../sdkjs/slide/property.map",
"api": "../../sdkjs/slide/apiExport.js",
"clientjs": [
"../deploy/apps/presentationeditor/main/app-edit.js",
"../deploy/apps/presentationeditor/main/app-view.js",
"../deploy/apps/presentationeditor/mobile/app-all.js",
"../deploy/apps/presentationeditor/embed/app-all.js"
"../deploy/web-apps/apps/presentationeditor/main/app-edit.js",
"../deploy/web-apps/apps/presentationeditor/main/app-view.js",
"../deploy/web-apps/apps/presentationeditor/mobile/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": {
"api": "../deploy/sdk/PowerPoint/sdk-all.js",
"api": "../deploy/sdkjs/slide/sdk-all.js",
"pat": "asc_\\w+",
"keys": "-exp se -use-for-name",
"apply": [
"../deploy/sdk/PowerPoint/sdk-all.js",
"../deploy/apps/presentationeditor/main/app-edit.js",
"../deploy/apps/presentationeditor/main/app-view.js",
"../deploy/apps/presentationeditor/mobile/app-all.js",
"../deploy/apps/presentationeditor/embed/app-all.js"
"../deploy/sdkjs/slide/sdk-all.js",
"../deploy/web-apps/apps/presentationeditor/main/app-edit.js",
"../deploy/web-apps/apps/presentationeditor/main/app-view.js",
"../deploy/web-apps/apps/presentationeditor/mobile/app-all.js",
"../deploy/web-apps/apps/presentationeditor/embed/app-all.js"
]
},
"tasks": {
......
build/spreadsheeteditor.json
View file @ c377fb54
{
"name": "spreadsheeteditor",
"version": "3.6.0",
"build": 857,
"version": "4.6.0",
"build": 865,
"homepage": "http://www.onlyoffice.com",
"private": true,
"sdk": {
"clean": [
"../deploy/sdk/Common",
"../deploy/sdk/Excel",
"../deploy/sdk/Fonts"
"../deploy/sdkjs/common",
"../deploy/sdkjs/cell"
],
"copy": {
"script": {
"files": [
{
"expand": true,
"cwd": "../sdk/Common/",
"cwd": "../../sdkjs/common/",
"src": [
"Images/**",
"Native/**",
"AllFonts.js"
"Images/*.cur",
"Native/*.js"
],
"dest": "../deploy/sdk/Common/"
"dest": "../deploy/sdkjs/common/"
},
{
"expand": true,
"cwd": "../sdk/Excel/css/",
"cwd": "../../sdkjs/cell/css/",
"src": "*.css",
"dest": "../deploy/sdk/Excel/css/"
"dest": "../deploy/sdkjs/cell/css/"
},
{
"expand": true,
"cwd": "../sdk/Word/Images/",
"cwd": "../../sdkjs/word/Images/",
"src": "*.cur",
"dest": "../deploy/sdk/Word/Images/"
"dest": "../deploy/sdkjs/word/Images/"
},
{
"expand": true,
"cwd": "../sdk/Fonts/",
"src": "**/**",
"dest": "../deploy/sdk/Fonts/"
},
{
"src": "../sdk/Excel/sdk-all.js",
"dest": "../deploy/sdk/Excel/sdk-all.js"
"src": "../../sdkjs/cell/sdk-all.js",
"dest": "../deploy/sdkjs/cell/sdk-all.js"
}
]
}
......@@ -51,26 +43,29 @@
},
"api": {
"clean": [
"../deploy/apps/api"
"../deploy/web-apps/apps/api"
],
"copy": {
"script": {
"expand": true,
"cwd": "../apps/api/",
"src": "**",
"dest": "../deploy/apps/api/"
"src": [
"**",
"!**/*.desktop"
],
"dest": "../deploy/web-apps/apps/api/"
}
}
},
"main": {
"clean": [
"../deploy/apps/spreadsheeteditor/main"
"../deploy/web-apps/apps/spreadsheeteditor/main"
],
"js": {
"requirejs": {
"options": {
"name": "../apps/spreadsheeteditor/main/app.js",
"out": "../deploy/apps/spreadsheeteditor/main/app.js",
"out": "../deploy/web-apps/apps/spreadsheeteditor/main/app.js",
"baseUrl": "../apps/",
"inlineText": true,
"findNestedDependencies": true,
......@@ -165,7 +160,7 @@
"embedImages": true,
"files": {
"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": [
{
......@@ -186,17 +181,17 @@
"src": [
"**/*.{png,jpg,gif}"
],
"dest": "../deploy/apps/spreadsheeteditor/main/resources/img/"
"dest": "../deploy/web-apps/apps/spreadsheeteditor/main/resources/img/"
}
],
"images-common": [
{
"expand": true,
"cwd": "../sdk/Word/Images/",
"cwd": "../../sdkjs/word/Images/",
"src": [
"**/*.cur"
],
"dest": "../deploy/apps/spreadsheeteditor/main/Images/"
"dest": "../deploy/web-apps/apps/spreadsheeteditor/main/Images/"
},
{
"expand": true,
......@@ -204,7 +199,7 @@
"src": [
"**/*.{png,jpg,gif}"
],
"dest": "../deploy/apps/spreadsheeteditor/main/resources/img/"
"dest": "../deploy/web-apps/apps/spreadsheeteditor/main/resources/img/"
}
]
},
......@@ -214,13 +209,13 @@
"expand": true,
"cwd": "../apps/spreadsheeteditor/main/locale/",
"src": "*",
"dest": "../deploy/apps/spreadsheeteditor/main/locale/"
"dest": "../deploy/web-apps/apps/spreadsheeteditor/main/locale/"
},
{
"expand": true,
"cwd": "../apps/spreadsheeteditor/main/resources/formula-lang",
"src": "*",
"dest": "../deploy/apps/spreadsheeteditor/main/resources/formula-lang"
"dest": "../deploy/web-apps/apps/spreadsheeteditor/main/resources/formula-lang"
}
],
"help": [
......@@ -228,26 +223,26 @@
"expand": true,
"cwd": "../apps/spreadsheeteditor/main/resources/help/en/",
"src": "**",
"dest": "../deploy/apps/spreadsheeteditor/main/resources/help/en/"
"dest": "../deploy/web-apps/apps/spreadsheeteditor/main/resources/help/en/"
},
{
"expand": true,
"cwd": "../apps/spreadsheeteditor/main/resources/help/ru/",
"src": "**",
"dest": "../deploy/apps/spreadsheeteditor/main/resources/help/ru/"
"dest": "../deploy/web-apps/apps/spreadsheeteditor/main/resources/help/ru/"
}
],
"index-page": [
{
"src": "../apps/spreadsheeteditor/main/index.html.deploy",
"dest": "../deploy/apps/spreadsheeteditor/main/index.html"
"dest": "../deploy/web-apps/apps/spreadsheeteditor/main/index.html"
}
]
}
},
"mobile": {
"clean": [
"../deploy/apps/spreadsheeteditor/mobile"
"../deploy/web-apps/apps/spreadsheeteditor/mobile"
],
"js": {
"src": [
......@@ -278,32 +273,32 @@
"../apps/common/locale.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": {
"normal": {
"src": [
"../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": {
"src": [
"../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": {
"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": [
{
"expand": true,
"cwd": "../apps/spreadsheeteditor/mobile/locale/",
"src": "*",
"dest": "../deploy/apps/spreadsheeteditor/mobile/locale/"
"dest": "../deploy/web-apps/apps/spreadsheeteditor/mobile/locale/"
}
],
"images-app": [
......@@ -311,14 +306,14 @@
"expand": true,
"cwd": "../apps/spreadsheeteditor/mobile/resources/img/",
"src": "**",
"dest": "../deploy/apps/spreadsheeteditor/mobile/resources/img/"
"dest": "../deploy/web-apps/apps/spreadsheeteditor/mobile/resources/img/"
}
]
}
},
"embed": {
"clean": [
"../deploy/apps/spreadsheeteditor/embed"
"../deploy/web-apps/apps/spreadsheeteditor/embed"
],
"js": {
"src": [
......@@ -328,12 +323,12 @@
"../apps/spreadsheeteditor/embed/js/ApplicationController.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": {
"files": {
"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": [
{
......@@ -344,64 +339,64 @@
},
"copy": {
"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": [
{
"expand": true,
"cwd": "../apps/common/embed/resources/img/",
"src": "**",
"dest": "../deploy/apps/spreadsheeteditor/embed/resources/img/"
"dest": "../deploy/web-apps/apps/spreadsheeteditor/embed/resources/img/"
}
]
}
},
"touch": {
"clean": [
"../deploy/vendor/touch"
"../deploy/web-apps/vendor/touch"
],
"copy": {
"script": {
"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": {
"clean": [
"../deploy/vendor/bootstrap"
"../deploy/web-apps/vendor/bootstrap"
],
"copy": {
"script": {
"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": {
"expand": true,
"cwd": "../vendor/bootstrap/dist/fonts/",
"src": "*",
"dest": "../deploy/vendor/bootstrap/dist/fonts/"
"dest": "../deploy/web-apps/vendor/bootstrap/dist/fonts/"
},
"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": {
"clean": [
"../deploy/vendor/jquery"
"../deploy/web-apps/vendor/jquery"
],
"copy": {
"script": {
"files": [
{
"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",
"dest": "../deploy/vendor/jquery/jquery.browser.min.js"
"dest": "../deploy/web-apps/vendor/jquery/jquery.browser.min.js"
}
]
}
......@@ -409,93 +404,93 @@
},
"megapixel": {
"clean": [
"../deploy/vendor/megapixel"
"../deploy/web-apps/vendor/megapixel"
],
"copy": {
"script": {
"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": {
"clean": [
"../deploy/vendor/sockjs"
"../deploy/web-apps/vendor/sockjs"
],
"copy": {
"script": {
"src": "../vendor/sockjs/sockjs.min.js",
"dest": "../deploy/vendor/sockjs/sockjs.min.js"
"dest": "../deploy/web-apps/vendor/sockjs/sockjs.min.js"
}
}
},
"xregexp": {
"clean": [
"../deploy/vendor/xregexp"
"../deploy/web-apps/vendor/xregexp"
],
"copy": {
"script": {
"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": {
"clean": [
"../deploy/vendor/jszip"
"../deploy/web-apps/vendor/jszip"
],
"copy": {
"script": {
"src": "../vendor/jszip/jszip.min.js",
"dest": "../deploy/vendor/jszip/jszip.min.js"
"dest": "../deploy/web-apps/vendor/jszip/jszip.min.js"
}
}
},
"jsziputils": {
"clean": [
"../deploy/vendor/jszip-utils"
"../deploy/web-apps/vendor/jszip-utils"
],
"copy": {
"script": {
"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": {
"clean": [
"../deploy/vendor/jsrsasign"
"../deploy/web-apps/vendor/jsrsasign"
],
"copy": {
"script": {
"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": {
"clean": [
"../deploy/vendor/underscore"
"../deploy/web-apps/vendor/underscore"
],
"copy": {
"script": {
"src": "../vendor/underscore/underscore-min.js",
"dest": "../deploy/vendor/underscore/underscore-min.js"
"dest": "../deploy/web-apps/vendor/underscore/underscore-min.js"
}
}
},
"requirejs": {
"clean": [
"../deploy/vendor/requirejs"
"../deploy/web-apps/vendor/requirejs"
],
"min": {
"src": "../vendor/requirejs/require.js",
"dest": "../deploy/vendor/requirejs/require.js"
"dest": "../deploy/web-apps/vendor/requirejs/require.js"
}
},
"zeroclipboard": {
"clean": [
"../deploy/vendor/ZeroClipboard"
"../deploy/web-apps/vendor/ZeroClipboard"
],
"copy": {
"script": {
......@@ -504,20 +499,20 @@
"src": [
"**"
],
"dest": "../deploy/vendor/ZeroClipboard/"
"dest": "../deploy/web-apps/vendor/ZeroClipboard/"
}
}
},
"obf": {
"api": "../deploy/sdk/Excel/sdk-all.js",
"api": "../deploy/sdkjs/cell/sdk-all.js",
"pat": "asc_\\w+",
"keys": "-exp se -use-for-name",
"apply": [
"../deploy/sdk/Excel/sdk-all.js",
"../deploy/apps/spreadsheeteditor/main/app-edit.js",
"../deploy/apps/spreadsheeteditor/main/app-view.js",
"../deploy/apps/spreadsheeteditor/mobile/app-all.js",
"../deploy/apps/spreadsheeteditor/embed/app-all.js"
"../deploy/sdkjs/cell/sdk-all.js",
"../deploy/web-apps/apps/spreadsheeteditor/main/app-edit.js",
"../deploy/web-apps/apps/spreadsheeteditor/main/app-view.js",
"../deploy/web-apps/apps/spreadsheeteditor/mobile/app-all.js",
"../deploy/web-apps/apps/spreadsheeteditor/embed/app-all.js"
]
},
"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