diff --git a/apps/spreadsheeteditor/mobile/app-dev.js b/apps/spreadsheeteditor/mobile/app-dev.js index 99bf35d3a..467728d01 100644 --- a/apps/spreadsheeteditor/mobile/app-dev.js +++ b/apps/spreadsheeteditor/mobile/app-dev.js @@ -121,7 +121,7 @@ require([ 'DocumentHolder' , 'CellEditor' , 'Statusbar' - // ,'Settings' + ,'Settings' // ,'EditContainer' // ,'EditText' // ,'EditParagraph' @@ -191,7 +191,7 @@ require([ 'spreadsheeteditor/mobile/app/controller/DocumentHolder' , 'spreadsheeteditor/mobile/app/controller/CellEditor' , 'spreadsheeteditor/mobile/app/controller/Statusbar' - // ,'documenteditor/mobile/app/controller/Settings' + , 'spreadsheeteditor/mobile/app/controller/Settings' // ,'documenteditor/mobile/app/controller/edit/EditContainer' // ,'documenteditor/mobile/app/controller/edit/EditText' // ,'documenteditor/mobile/app/controller/edit/EditParagraph' diff --git a/apps/spreadsheeteditor/mobile/app/controller/Settings.js b/apps/spreadsheeteditor/mobile/app/controller/Settings.js index 3d4baa225..98dac8334 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/Settings.js +++ b/apps/spreadsheeteditor/mobile/app/controller/Settings.js @@ -35,7 +35,7 @@ * Settings.js * Document Editor * - * Created by Alexander Yuzhin on 10/7/16 + * Created by Maxim Kadushkin on 12/05/2016 * Copyright (c) 2016 Ascensio System SIA. All rights reserved. * */ @@ -43,11 +43,11 @@ define([ 'core', - 'documenteditor/mobile/app/view/Settings' + 'spreadsheeteditor/mobile/app/view/Settings' ], function (core) { 'use strict'; - DE.Controllers.Settings = Backbone.Controller.extend((function() { + SSE.Controllers.Settings = Backbone.Controller.extend((function() { // private var rootView, inProgress, @@ -62,26 +62,23 @@ define([ ], initialize: function () { - Common.SharedSettings.set('readerMode', false); Common.NotificationCenter.on('settingscontainer:show', _.bind(this.initEvents, this)); this.addListeners({ 'Settings': { 'page:show' : this.onPageShow + , 'settings:showhelp': function(e) { + window.open('http://support.onlyoffice.com/', "_blank"); + this.hideModal(); + } } }); }, - setApi: function (api) { - var me = this; - me.api = api; - - me.api.asc_registerCallback('asc_onGetDocInfoStart', _.bind(me._onApiGetDocInfoStart, me)); - me.api.asc_registerCallback('asc_onGetDocInfoStop', _.bind(me._onApiGetDocInfoEnd, me)); - me.api.asc_registerCallback('asc_onDocInfo', _.bind(me._onApiDocInfo, me)); - me.api.asc_registerCallback('asc_onGetDocInfoEnd', _.bind(me._onApiGetDocInfoEnd, me)); - me.api.asc_registerCallback('asc_onDocumentName', _.bind(me._onApiDocumentName, me)); - }, + // setApi: function (api) { + // var me = this; + // me.api = api; + // }, onLaunch: function () { this.createView('Settings').render(); @@ -92,12 +89,6 @@ define([ }, initEvents: function () { - - - // $('#font-bold').single('click', _.bind(me.onBold, me)); - // $('#font-italic').single('click', _.bind(me.onItalic, me)); - // $('#font-underline').single('click', _.bind(me.onUnderline, me)); - // $('#font-strikethrough').single('click', _.bind(me.onStrikethrough, me)); }, rootView : function() { @@ -107,7 +98,7 @@ define([ showModal: function() { if (Common.SharedSettings.get('phone')) { modalView = uiApp.popup( - '
' + + '
' + '
' + '
' + this.getView('Settings').rootLayout() + @@ -117,7 +108,7 @@ define([ ); } else { modalView = uiApp.popover( - '
' + + '
' + '
' + '
' + '
' + @@ -153,72 +144,19 @@ define([ onPageShow: function(view) { var me = this; $('#settings-search').single('click', _.bind(me._onSearch, me)); - $('#settings-readermode input:checkbox').single('change', _.bind(me._onReaderMode, me)); - $('#settings-edit-document').single('click', _.bind(me._onEditDocumet, me)); + $('#settings-edit-document').single('click', _.bind(me._onEditDocument, me)); $(modalView).find('.formats a').single('click', _.bind(me._onSaveFormat, me)); }, // API handlers - _onApiGetDocInfoStart: function () { - var me = this; - inProgress = true; - infoObj = { - PageCount : 0, - WordsCount : 0, - ParagraphCount : 0, - SymbolsCount : 0, - SymbolsWSCount : 0 - }; - - _.defer(function(){ - if (!inProgress) - return; - - $('#statistic-pages').html(me.txtLoading); - $('#statistic-words').html(me.txtLoading); - $('#statistic-paragraphs').html(me.txtLoading); - $('#statistic-symbols').html(me.txtLoading); - $('#statistic-spaces').html(me.txtLoading); - }, 2000); - }, - - _onApiGetDocInfoEnd: function() { - inProgress = false; - - $('#statistic-pages').html(infoObj.PageCount); - $('#statistic-words').html(infoObj.WordsCount); - $('#statistic-paragraphs').html(infoObj.ParagraphCount); - $('#statistic-symbols').html(infoObj.SymbolsCount); - $('#statistic-spaces').html(infoObj.SymbolsWSCount); - }, - - _onApiDocInfo: function(obj) { - if (obj) { - if (obj.get_PageCount() > -1) - infoObj.PageCount = obj.get_PageCount(); - if (obj.get_WordsCount() > -1) - infoObj.WordsCount = obj.get_WordsCount(); - if (obj.get_ParagraphCount() > -1) - infoObj.ParagraphCount = obj.get_ParagraphCount(); - if (obj.get_SymbolsCount() > -1) - infoObj.SymbolsCount = obj.get_SymbolsCount(); - if (obj.get_SymbolsWSCount() > -1) - infoObj.SymbolsWSCount = obj.get_SymbolsWSCount(); - } - }, - - _onApiDocumentName: function(name) { - $('#settings-document-title').html(name ? name : '-'); - }, - - _onEditDocumet: function() { + _onEditDocument: function() { Common.Gateway.requestEditRights(); }, _onSearch: function (e) { - var toolbarView = DE.getController('Toolbar').getView('Toolbar'); + var toolbarView = SSE.getController('Toolbar').getView('Toolbar'); if (toolbarView) { toolbarView.showSearch(); @@ -227,22 +165,6 @@ define([ this.hideModal(); }, - _onReaderMode: function (e) { - var me = this; - - Common.SharedSettings.set('readerMode', !Common.SharedSettings.get('readerMode')); - - me.api && me.api.ChangeReaderMode(); - - if (Common.SharedSettings.get('phone')) { - _.defer(function () { - me.hideModal(); - }, 1000); - } - - Common.NotificationCenter.trigger('readermode:change', Common.SharedSettings.get('readerMode')); - }, - _onSaveFormat: function(e) { var me = this, format = $(e.currentTarget).data('format'); diff --git a/apps/spreadsheeteditor/mobile/app/template/Settings.template b/apps/spreadsheeteditor/mobile/app/template/Settings.template index 7a099074e..867ca95cb 100644 --- a/apps/spreadsheeteditor/mobile/app/template/Settings.template +++ b/apps/spreadsheeteditor/mobile/app/template/Settings.template @@ -2,8 +2,8 @@
-
Settings
-
<% if (phone) { %>Done<% } %>
+
<%= scope.textSettings %>
+
<% if (phone) { %><%= scope.textDone %><% } %>
@@ -11,18 +11,20 @@
-
  • -
    -
    - -
    -
    -
    Reader Mode
    -
    - -
    -
    -
    -
  • @@ -58,7 +44,7 @@
    -
    Download
    +
    <%= scope.textDownload %>
    • @@ -70,7 +56,7 @@
    -
    Document Info
    +
    <%= scope.textDocInfo %>
    @@ -94,7 +80,7 @@
    -
    Help
    +
    <%= scope.textHelp %>
    @@ -106,7 +92,7 @@
    -
    About
    +
    <%= scope.textAbout %>
    @@ -124,79 +110,41 @@
    - - <% if (!android) { %> - Back - <% } %> + <% if (!android) { %><%= scope.textBack %><% } %>
    -
    Document Info
    +
    <%= scope.textDocInfo %>
    -
    Document title
    +
    <%= scope.textDocTitle %>
    • -
      Loading...
      +
      <%= scope.textLoading %>
    -
    Author
    +
    <%= scope.textAuthor %>
    • -
      Loading...
      +
      <%= scope.textLoading %>
    -
    Create date
    +
    <%= scope.textCreateDate %>
    • -
      Loading...
      -
      -
      • -
    -
    -
    Statistic
    -
    -
      -
    • -
      -
      Pages
      -
      0
      -
      -
      • -
    • -
      -
      Paragraphs
      -
      0
      -
      -
      • -
    • -
      -
      Words
      -
      0
      -
      -
      • -
    • -
      -
      Symbols
      -
      0
      -
      -
      • -
    • -
      -
      Spaces
      -
      0
      +
      <%= scope.textLoading %>
    @@ -212,35 +160,35 @@
    - <% if (!android) { %>Back<% } %> + <% if (!android) { %><%= scope.textBack %><% } %>
    -
    Download
    +
    <%= scope.textDownload %>
    -
    Download As...
    +
    <%= scope.textDownloadAs %>
    diff --git a/apps/spreadsheeteditor/mobile/app/view/Settings.js b/apps/spreadsheeteditor/mobile/app/view/Settings.js new file mode 100644 index 000000000..d08613c2f --- /dev/null +++ b/apps/spreadsheeteditor/mobile/app/view/Settings.js @@ -0,0 +1,212 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2016 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ + +/** + * Settings.js + * Document Editor + * + * Created by Maxim Kadushkin on 12/05/2016 + * Copyright (c) 2016 Ascensio System SIA. All rights reserved. + * + */ + +define([ + 'text!spreadsheeteditor/mobile/app/template/Settings.template', + 'jquery', + 'underscore', + 'backbone' +], function (settingsTemplate, $, _, Backbone) { + 'use strict'; + + SSE.Views.Settings = Backbone.View.extend(_.extend((function() { + // private + var isEdit; + + return { + // el: '.view-main', + + template: _.template(settingsTemplate), + + events: { + // + }, + + initialize: function() { + Common.NotificationCenter.on('settingscontainer:show', _.bind(this.initEvents, this)); + + Common.Gateway.on('opendocument', _.bind(this.loadDocument, this)); + }, + + initEvents: function () { + var me = this; + + $('#settings-document-info').single('click', _.bind(me.showDocumentInfo, me)); + $('#settings-download').single('click', _.bind(me.showDownload, me)); + $('#settings-history').single('click', _.bind(me.showHistory, me)); + $('#settings-help').single('click', _.bind(me.showHelp, me)); + $('#settings-about').single('click', _.bind(me.showAbout, me)); + + me.initControls(); + }, + + // Render layout + render: function() { + this.layout = $('
    ').append(this.template({ + android : Common.SharedSettings.get('android'), + phone : Common.SharedSettings.get('phone'), + scope : this + , saveas: { + xlsx: Asc.c_oAscFileType.XLSX, + pdf: Asc.c_oAscFileType.PDF, + ods: Asc.c_oAscFileType.ODS, + csv: Asc.c_oAscFileType.CSV + } + })); + + return this; + }, + + setMode: function (mode) { + isEdit = (mode === 'edit') + }, + + rootLayout: function () { + if (this.layout) { + var $layout = this.layout.find('#settings-root-view'), + isPhone = Common.SharedSettings.get('phone'); + + if (isEdit) { + $layout.find('#settings-edit-document').hide(); + $layout.find('#settings-search .item-title').text(this.textFindAndReplace) + } else { + } + + return $layout.html(); + } + + return ''; + }, + + initControls: function() { + // + }, + + showPage: function(templateId) { + var rootView = SSE.getController('Settings').rootView(); + + if (rootView && this.layout) { + var $content = this.layout.find(templateId); + + // Android fix for navigation + if (Framework7.prototype.device.android) { + $content.find('.page').append($content.find('.navbar')); + } + + rootView.router.load({ + content: $content.html() + }); + + this.fireEvent('page:show', this); + } + }, + + showDocumentInfo: function() { + this.showPage('#settings-info-view'); + + var document = Common.SharedSettings.get('document') || {}, + info = document.info || {}; + + $('#settings-document-title').html(document.title ? document.title : this.unknownText); + $('#settings-document-autor').html(info.author ? info.author : this.unknownText); + $('#settings-document-date').html(info.created ? info.created : this.unknownText); + }, + + showDownload: function () { + this.showPage('#settings-download-view'); + }, + + showHistory: function () { + this.showPage('#settings-history-view'); + }, + + showHelp: function () { + this.fireEvent('settings:showhelp'); + }, + + showAbout: function () { + this.showPage('#settings-about-view'); + }, + + loadDocument: function(data) { + var permissions = {}; + + if (data.doc) { + permissions = _.extend(permissions, data.doc.permissions); + + if (permissions.edit === false) { + $('#settings-edit-document').hide(); + } + } + }, + + unknownText: 'Unknown', + textFindAndReplace: 'Find and Replace', + textSettings: 'Settings', + textDone: 'Done', + textFind: 'Find', + textEditDoc: 'Edit Document', + textReader: 'Reader Mode', + textDownload: 'Download', + textDocInfo: 'Document Info', + textHelp: 'Help', + textAbout: 'About', + textBack: 'Back', + textDocTitle: 'Document title', + textLoading: 'Loading...', + textAuthor: 'Author', + textCreateDate: 'Create date', + textStatistic: 'Statistic', + textPages: 'Pages', + textParagraphs: 'Paragraphs', + textWords: 'Words', + textSymbols: 'Symbols', + textSpaces: 'Spaces', + textDownloadAs: 'Download As...', + textVersion: 'Version', + textAddress: 'address', + textEmail: 'email', + textTel: 'tel' + + } + })(), SSE.Views.Settings || {})) +}); \ No newline at end of file diff --git a/apps/spreadsheeteditor/mobile/app/view/Toolbar.js b/apps/spreadsheeteditor/mobile/app/view/Toolbar.js index a2522f1b5..7ee9e2293 100644 --- a/apps/spreadsheeteditor/mobile/app/view/Toolbar.js +++ b/apps/spreadsheeteditor/mobile/app/view/Toolbar.js @@ -68,15 +68,6 @@ define([ // Set innerHTML and get the references to the DOM elements initialize: function() { var me = this; - - Common.NotificationCenter.on('readermode:change', function (reader) { - if (reader) { - me.hideSearch(); - $('#toolbar-search').addClass('disabled'); - } else { - $('#toolbar-search').removeClass('disabled'); - } - }); }, // Render layout @@ -144,7 +135,7 @@ define([ // Settings showSettings: function () { - // SSE.getController('Settings').showModal(); + SSE.getController('Settings').showModal(); } } })(), SSE.Views.Toolbar || {}))