diff --git a/apps/pdfeditor/main/app.js b/apps/pdfeditor/main/app.js index 7559106ce3..b58d01c506 100644 --- a/apps/pdfeditor/main/app.js +++ b/apps/pdfeditor/main/app.js @@ -152,11 +152,11 @@ require([ 'ViewTab', 'Search', 'Print', - 'Common.Controllers.Fonts' - ,'Common.Controllers.Chat' - ,'Common.Controllers.Comments' - ,'Common.Controllers.Draw' - ,'Common.Controllers.Plugins' + 'Common.Controllers.Fonts', + 'Common.Controllers.Chat', + 'Common.Controllers.Comments', + 'Common.Controllers.Draw', + 'Common.Controllers.Plugins' ] }); @@ -181,11 +181,11 @@ require([ 'pdfeditor/main/app/view/FileMenuPanels', 'common/main/lib/util/utils', 'common/main/lib/controller/Fonts', - ,'common/main/lib/controller/Comments' - ,'common/main/lib/controller/Chat' + 'common/main/lib/controller/Comments', + 'common/main/lib/controller/Chat', /** coauthoring end **/ - ,'common/main/lib/controller/Plugins' - ,'common/main/lib/controller/Draw' + 'common/main/lib/controller/Plugins', + 'common/main/lib/controller/Draw' ], function() { app.start(); }); diff --git a/apps/pdfeditor/main/app_dev.js b/apps/pdfeditor/main/app_dev.js index 32822f86d3..430c77293b 100644 --- a/apps/pdfeditor/main/app_dev.js +++ b/apps/pdfeditor/main/app_dev.js @@ -172,7 +172,7 @@ require([ 'pdfeditor/main/app/view/FileMenuPanels', 'common/main/lib/util/utils', 'common/main/lib/controller/Fonts', - ,'common/main/lib/controller/Comments' + 'common/main/lib/controller/Comments' ,'common/main/lib/controller/Chat' ,'common/main/lib/controller/Plugins' ,'common/main/lib/controller/Draw' diff --git a/apps/pdfeditor/main/index.html b/apps/pdfeditor/main/index.html index e927291c00..236cad6b97 100644 --- a/apps/pdfeditor/main/index.html +++ b/apps/pdfeditor/main/index.html @@ -1,7 +1,7 @@ - ONLYOFFICE PDF + ONLYOFFICE PDF Editor @@ -148,7 +148,7 @@ background: #fff; background: var(--skeleton-canvas-content-background, #fff); width: 794px; - margin: 46px auto; + margin: 19px auto 46px; height: 100%; border: 1px solid #bbbec2; border: var(--scaled-one-px-value, 1px) solid var(--skeleton-canvas-page-border, #bbbec2); diff --git a/apps/pdfeditor/main/index.html.deploy b/apps/pdfeditor/main/index.html.deploy index e69de29bb2..b7b49782a4 100644 --- a/apps/pdfeditor/main/index.html.deploy +++ b/apps/pdfeditor/main/index.html.deploy @@ -0,0 +1,327 @@ + + + + ONLYOFFICE PDF Editor + + + + + + + + + + + + + + + + + + + +
+
+ + + + + + +
+ + + + + \ No newline at end of file diff --git a/apps/pdfeditor/main/index_loader.html b/apps/pdfeditor/main/index_loader.html new file mode 100644 index 0000000000..530c40b4ab --- /dev/null +++ b/apps/pdfeditor/main/index_loader.html @@ -0,0 +1,306 @@ + + + + ONLYOFFICE PDF Editor + + + + + + + + + + + + + + + + + + +
+ + + +
+ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/apps/pdfeditor/main/index_loader.html.deploy b/apps/pdfeditor/main/index_loader.html.deploy new file mode 100644 index 0000000000..b9d48ed8fa --- /dev/null +++ b/apps/pdfeditor/main/index_loader.html.deploy @@ -0,0 +1,327 @@ + + + + ONLYOFFICE PDF Editor + + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + \ No newline at end of file diff --git a/build/Gruntfile.js b/build/Gruntfile.js index b4e71d1c4c..0aebba2744 100644 --- a/build/Gruntfile.js +++ b/build/Gruntfile.js @@ -788,6 +788,7 @@ module.exports = function(grunt) { doRegisterInitializeAppTask('documenteditor', 'DocumentEditor', 'documenteditor.json'); doRegisterInitializeAppTask('spreadsheeteditor', 'SpreadsheetEditor', 'spreadsheeteditor.json'); doRegisterInitializeAppTask('presentationeditor', 'PresentationEditor', 'presentationeditor.json'); + doRegisterInitializeAppTask('pdfeditor', 'PDFEditor', 'pdfeditor.json'); doRegisterInitializeAppTask('testdocumenteditor', 'TestDocumentEditor', 'testdocumenteditor.json'); doRegisterInitializeAppTask('testpresentationeditor', 'TestPresentationEditor', 'testpresentationeditor.json'); @@ -808,12 +809,14 @@ module.exports = function(grunt) { grunt.registerTask('deploy-documenteditor-component', ['init-build-documenteditor', 'deploy-app']); grunt.registerTask('deploy-spreadsheeteditor-component', ['init-build-spreadsheeteditor', 'deploy-app']); grunt.registerTask('deploy-presentationeditor-component', ['init-build-presentationeditor', 'deploy-app']); + grunt.registerTask('deploy-pdfeditor-component', ['init-build-pdfeditor', 'deploy-app']); // This task is called from the Makefile, don't delete it. grunt.registerTask('deploy-documents-component', ['deploy-common-component']); grunt.registerTask('deploy-documenteditor', ['deploy-common-component', 'deploy-documenteditor-component']); grunt.registerTask('deploy-spreadsheeteditor', ['deploy-common-component', 'deploy-spreadsheeteditor-component']); grunt.registerTask('deploy-presentationeditor', ['deploy-common-component', 'deploy-presentationeditor-component']); + grunt.registerTask('deploy-pdfeditor', ['deploy-common-component', 'deploy-pdfeditor-component']); grunt.registerTask('deploy-testdocumenteditor', ['init-build-testdocumenteditor', 'deploy-app']); grunt.registerTask('deploy-testpresentationeditor', ['init-build-testpresentationeditor', 'deploy-app']); @@ -822,5 +825,6 @@ module.exports = function(grunt) { grunt.registerTask('default', ['deploy-common-component', 'deploy-documenteditor-component', 'deploy-spreadsheeteditor-component', - 'deploy-presentationeditor-component']); + 'deploy-presentationeditor-component', + 'deploy-pdfeditor-component']); }; diff --git a/build/pdfeditor.json b/build/pdfeditor.json new file mode 100644 index 0000000000..70c4bf15cc --- /dev/null +++ b/build/pdfeditor.json @@ -0,0 +1,196 @@ +{ + "name": "pdfeditor", + "version": "4.3.0", + "build": 1152, + "homepage": "http://www.onlyoffice.com", + "private": true, + "main": { + "clean": { + "prebuild": [ + "../deploy/web-apps/apps/pdfeditor/main" + ], + "postbuild": [] + }, + "js": { + "requirejs": { + "options": { + "name": "../apps/pdfeditor/main/app.js", + "out": "../deploy/web-apps/apps/pdfeditor/main/app.js", + "baseUrl": "../apps/", + "inlineText": true, + "findNestedDependencies": true, + "preserveLicenseComments": false, + "optimizeAllPluginResources": true, + "paths": { + "jquery": "../vendor/jquery/jquery", + "underscore": "../vendor/underscore/underscore", + "backbone": "../vendor/backbone/backbone", + "text": "../vendor/requirejs-text/text", + "bootstrap": "../vendor/bootstrap/dist/js/bootstrap", + "perfectscrollbar": "common/main/lib/mods/perfect-scrollbar", + "jmousewheel": "../vendor/perfect-scrollbar/src/jquery.mousewheel", + "xregexp": "empty:", + "socketio": "empty:", + "coapisettings": "empty:", + "allfonts": "empty:", + "sdk": "empty:", + "api": "empty:", + "core": "common/main/lib/core/application", + "notification": "common/main/lib/core/NotificationCenter", + "keymaster": "common/main/lib/core/keymaster", + "tip": "common/main/lib/util/Tip", + "analytics": "common/Analytics", + "gateway": "common/Gateway", + "locale": "common/locale", + "irregularstack": "common/IrregularStack" + }, + "shim": { + "underscore": { + "exports": "_" + }, + "backbone": { + "deps": [ + "underscore", + "jquery" + ], + "exports": "Backbone" + }, + "bootstrap": { + "deps": [ + "jquery" + ] + }, + "perfectscrollbar": { + "deps": [ + "jmousewheel" + ] + }, + "notification": { + "deps": [ + "backbone" + ] + }, + "core": { + "deps": [ + "backbone", + "notification" + ] + }, + "sdk": { + "deps": [ + "jquery", + "underscore", + "coapisettings", + "allfonts", + "xregexp", + "socketio" + ] + }, + "gateway": { + "deps": [ + "jquery" + ] + }, + "analytics": { + "deps": [ + "jquery" + ] + } + } + } + } + }, + "less": { + "files": { + "src": "../apps/pdfeditor/main/resources/less/app.less", + "dest": "../deploy/web-apps/apps/pdfeditor/main/resources/css/app.css" + }, + "vars": { + "app-image-const-path": "'../img'", + "common-image-const-path": "'../../../../common/main/resources/img'", + "app-image-path": "'../../../../../deploy/web-apps/apps/pdfeditor/main/resources/img'", + "common-image-path": "'../../../../../deploy/web-apps/apps/pdfeditor/main/resources/img'" + } + }, + "imagemin": { + "images-app": [ + { + "expand": true, + "cwd": "../apps/pdfeditor/main/resources/img/", + "src": [ + "**/*.{png,jpg,gif,ico}", + "!toolbar/*x/**/*" + ], + "dest": "../deploy/web-apps/apps/pdfeditor/main/resources/img/" + } + ], + "images-common": [ + { + "expand": true, + "cwd": "../apps/common/main/resources/img/", + "src": [ + "**/*.{png,jpg,gif}", + "!toolbar/*x/**/*" + ], + "dest": "../deploy/web-apps/apps/pdfeditor/main/resources/img/" + } + ] + }, + "jsonmin": { + "files": "../deploy/web-apps/apps/pdfeditor/main/**/*.json" + }, + "copy": { + "localization": [ + { + "expand": true, + "cwd": "../apps/pdfeditor/main/locale/", + "src": "*", + "dest": "../deploy/web-apps/apps/pdfeditor/main/locale/" + } + ], + "help": [ + { + "expand": true, + "cwd": "../apps/pdfeditor/main/resources/help/", + "src": [ + "**", + "!*_/**", + "!**/src/**" + ], + "dest": "../deploy/web-apps/apps/pdfeditor/main/resources/help/" + } + ], + "indexhtml": [ + { + "expand": true, + "cwd": "../apps/pdfeditor/main", + "src": [ + "*.html.deploy" + ], + "ext": ".html", + "dest": "../deploy/web-apps/apps/pdfeditor/main" + } + ] + }, + "svgicons": { + "common": [ + { + "expand": true, + "cwd": "../apps/pdfeditor/main/resources/img", + "src": "**/*.svg", + "dest": "../deploy/web-apps/apps/pdfeditor/main/resources/img" + } + ], + "clean": [ + "../deploy/web-apps/apps/pdfeditor/main/resources/img/**/*.svg", + "!../deploy/web-apps/apps/pdfeditor/main/resources/img/**/*_s.svg" + ] + } + }, + "tasks": { + "deploy": [ + "increment-build", + "deploy-app-main" + ] + } +} \ No newline at end of file