From ca8751175fd20bc80775222edc41d27c40264681 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Mon, 12 Dec 2016 12:05:41 +0300 Subject: [PATCH] [SSE mobile] added menu "Insert Other" --- apps/spreadsheeteditor/mobile/app-dev.js | 6 +- .../mobile/app/controller/add/AddContainer.js | 5 +- .../mobile/app/controller/add/AddOther.js | 166 +++++++++++++ .../mobile/app/template/AddOther.template | 218 ++++++------------ .../mobile/app/view/add/AddOther.js | 193 ++++++++++++++++ .../mobile/resources/less/ios/_icons.less | 36 ++- .../resources/less/material/_icons.less | 36 ++- 7 files changed, 467 insertions(+), 193 deletions(-) create mode 100644 apps/spreadsheeteditor/mobile/app/controller/add/AddOther.js create mode 100644 apps/spreadsheeteditor/mobile/app/view/add/AddOther.js diff --git a/apps/spreadsheeteditor/mobile/app-dev.js b/apps/spreadsheeteditor/mobile/app-dev.js index 54891f3a8..fcd3d718d 100644 --- a/apps/spreadsheeteditor/mobile/app-dev.js +++ b/apps/spreadsheeteditor/mobile/app-dev.js @@ -108,7 +108,7 @@ require([ Backbone.history.start(); /** - * Application instance with DE namespace defined + * Application instance with SSE namespace defined */ var app = new Backbone.Application({ nameSpace: 'SSE', @@ -134,7 +134,7 @@ require([ // ,'AddTable' ,'AddShape' // ,'AddImage' - // ,'AddOther' + ,'AddOther' ] }); @@ -204,7 +204,7 @@ require([ // ,'spreadsheeteditor/mobile/app/controller/add/AddTable' ,'spreadsheeteditor/mobile/app/controller/add/AddShape' // ,'spreadsheeteditor/mobile/app/controller/add/AddImage' - // ,'spreadsheeteditor/mobile/app/controller/add/AddOther' + ,'spreadsheeteditor/mobile/app/controller/add/AddOther' ], function() { app.start(); }); diff --git a/apps/spreadsheeteditor/mobile/app/controller/add/AddContainer.js b/apps/spreadsheeteditor/mobile/app/controller/add/AddContainer.js index f9d61dd40..c0828c650 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/add/AddContainer.js +++ b/apps/spreadsheeteditor/mobile/app/controller/add/AddContainer.js @@ -127,7 +127,7 @@ define([ addViews.push({ caption: me.textOther, id: 'add-other', - layout: me._dummyEditController().getLayout() + layout: SSE.getController('AddOther').getView('AddOther').rootLayout() }); return addViews; @@ -256,7 +256,8 @@ define([ } me.rootView = uiApp.addView('.add-root-view', { - dynamicNavbar: true + dynamicNavbar: true, + domCache: true }); Common.NotificationCenter.trigger('addcontainer:show'); diff --git a/apps/spreadsheeteditor/mobile/app/controller/add/AddOther.js b/apps/spreadsheeteditor/mobile/app/controller/add/AddOther.js new file mode 100644 index 000000000..868036729 --- /dev/null +++ b/apps/spreadsheeteditor/mobile/app/controller/add/AddOther.js @@ -0,0 +1,166 @@ +/* + * + * (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 + * + */ +/** + * AddOther.js + * Document Editor + * + * Created by Kadushkin Maxim on 12/07/2016 + * Copyright (c) 2016 Ascensio System SIA. All rights reserved. + * + */ + +define([ + 'core', + 'spreadsheeteditor/mobile/app/view/add/AddOther' +], function (core) { + 'use strict'; + + SSE.Controllers.AddOther = Backbone.Controller.extend(_.extend((function() { + var c_pageNumPosition = { + PAGE_NUM_POSITION_TOP: 0x01, + PAGE_NUM_POSITION_BOTTOM: 0x02, + PAGE_NUM_POSITION_RIGHT: 0, + PAGE_NUM_POSITION_LEFT: 1, + PAGE_NUM_POSITION_CENTER: 2 + }; + + return { + models: [], + collections: [], + views: [ + 'AddOther' + ], + + initialize: function () { + Common.NotificationCenter.on('addcontainer:show', _.bind(this.initEvents, this)); + + this.addListeners({ + 'AddOther': { + 'page:show' : this.onPageShow + , 'insert:link': this.onInsertLink + , 'insert:image': this.onInsertImage + } + }); + }, + + setApi: function (api) { + var me = this; + me.api = api; + + // me.api.asc_registerCallback('asc_onInitEditorFonts', _.bind(onApiLoadFonts, me)); + + }, + + onLaunch: function () { + this.createView('AddOther').render(); + }, + + initEvents: function () { + }, + + onPageShow: function (view, pageId) { + var me = this; + + if (pageId == '#addother-link') { + if ($('#addother-link-view')) { + _.defer(function () { + var props = me.api.asc_getCellInfo().asc_getHyperlink(); + + // var text = props.asc_getText(); + // $('#add-link-display input').val(_.isString(text) ? text : ''); + }); + } + } + }, + + // Handlers + + onInsertLink: function (args) { + return; + + var me = this, + url = args.url, + urltype = me.api.asc_getUrlType($.trim(url)), + isEmail = (urltype == 2); + + if (urltype < 1) { + uiApp.alert(me.txtNotUrl); + return; + } + + url = url.replace(/^\s+|\s+$/g,''); + + if (! /(((^https?)|(^ftp)):\/\/)|(^mailto:)/i.test(url) ) + url = (isEmail ? 'mailto:' : 'http://' ) + url; + + url = url.replace(new RegExp("%20",'g')," "); + + var props = new Asc.CHyperlink(); + props.asc_setHyperlinkUrl(url); + props.asc_setText(_.isEmpty(args.text) ? url : args.text); + props.asc_setTooltip(args.tooltip); + + me.api.asc_insertHyperlink(props); + + SSE.getController('AddContainer').hideModal(); + }, + + onInsertImage: function (args) { + SSE.getController('AddContainer').hideModal(); + + if ( !args.islocal ) { + var me = this; + var url = args.url; + if (!_.isEmpty(url)) { + if ((/((^https?)|(^ftp)):\/\/.+/i.test(url))) { + SSE.getController('AddContainer').hideModal(); + + _.defer(function () { + me.api.asc_addImageDrawingObject(url); + }); + } else { + uiApp.alert(me.txtNotUrl); + } + } else { + uiApp.alert(me.textEmptyImgUrl); + } + } else { + this.api.asc_addImage(); + } + }, + + textEmptyImgUrl : 'You need to specify image URL.', + txtNotUrl: 'This field should be a URL in the format \"http://www.example.com\"' + } + })(), SSE.Controllers.AddOther || {})) +}); \ No newline at end of file diff --git a/apps/spreadsheeteditor/mobile/app/template/AddOther.template b/apps/spreadsheeteditor/mobile/app/template/AddOther.template index a4c835231..3b1afdb83 100644 --- a/apps/spreadsheeteditor/mobile/app/template/AddOther.template +++ b/apps/spreadsheeteditor/mobile/app/template/AddOther.template @@ -3,37 +3,25 @@
-
Link
-
- - - -
  • - -
    -
    - -
    -
    -
    Page Number
    +
    <%= scope.textLink %>
     @@ -66,66 +42,12 @@ - - -
  • -
    Link
    +
    <%= scope.textLink %>
    - +
    @@ -145,9 +67,9 @@
  • -
    Display
    +
    <%= scope.textDisplay %>
    - +
    @@ -155,9 +77,9 @@
  • -
    Screen Tip
    +
    <%= scope.textTip %>
    - +
    @@ -166,11 +88,11 @@ - -
    + +
    -
    <% if (!android) { %>Back<% } %>
    -
    Position
    +
    <% if (!android) { %><%= scope.textBack %><% } %>
    +
    <%= scope.textInsertImage %>
    -
    +
    +
    + + +
    +
    +
    +
    <% if (!android) { %><%= scope.textBack %><% } %>
    +
    <%= scope.textLinkSettings %>
    +
    +
    +
    +
    +
    <%= scope.textAddress %>
    +
    +
      +
    • +
      +
      +
      + +
      +
      +
      +
      • +
    +
    +
    + <% if (android) { %> + <%= scope.textInsertImage %> + <% } else { %> + + <% } %> +
    +
    +
    \ No newline at end of file diff --git a/apps/spreadsheeteditor/mobile/app/view/add/AddOther.js b/apps/spreadsheeteditor/mobile/app/view/add/AddOther.js new file mode 100644 index 000000000..e7afbf77f --- /dev/null +++ b/apps/spreadsheeteditor/mobile/app/view/add/AddOther.js @@ -0,0 +1,193 @@ +/* + * + * (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 + * + */ + +/** + * AddOther.js + * Document Editor + * + * Created by Kadushkin Maxim on 12/07/2016 + * Copyright (c) 2016 Ascensio System SIA. All rights reserved. + * + */ + +define([ + 'text!spreadsheeteditor/mobile/app/template/AddOther.template', + 'backbone' +], function (addTemplate, Backbone) { + 'use strict'; + + SSE.Views.AddOther = Backbone.View.extend(_.extend((function() { + // private + + return { + // el: '.view-main', + + template: _.template(addTemplate), + + events: {}, + + initialize: function () { + Common.NotificationCenter.on('addcontainer:show', _.bind(this.initEvents, this)); + }, + + initEvents: function () { + var me = this; + + $('#add-other-insimage').single('click', _.bind(me.showInsertImage, me)); + $('#add-other-link').single('click', _.bind(me.showLink, me)); + + me.initControls(); + }, + + // Render layout + render: function () { + this.layout = $('
    ').append(this.template({ + android : Common.SharedSettings.get('android'), + phone : Common.SharedSettings.get('phone'), + scope : this + })); + + return this; + }, + + rootLayout: function () { + if (this.layout) { + return this.layout + .find('#addother-root-view') + .html(); + } + + return ''; + }, + + initControls: function () { + // + }, + + showPage: function (templateId) { + var rootView = SSE.getController('AddContainer').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, templateId]); + } + }, + + showInsertImage: function () { + this.showPage('#addother-insimage'); + + $('#addimage-url').single('click', this.showImageFromUrl.bind(this)); + $('#addimage-file').single('click', function () { + this.fireEvent('insert:image',[{islocal:true}]); + }.bind(this)); + }, + + showLink: function () { + this.showPage('#addother-link'); + + $('.page[data-page=addother-link] input[type=url]').single('input', _.bind(function(e) { + $('#add-link-insert').toggleClass('disabled', _.isEmpty($('#add-link-url input').val())); + }, this)); + + _.delay(function () { + $('.page[data-page=addother-link] input[type=url]').focus(); + }, 1000); + + $('#add-link-insert').single('click', _.buffered(this.clickInsertLink, 100, this)); + }, + + clickInsertLink: function (e) { + var url = $('#add-link-url input').val(), + display = $('#add-link-display input').val(), + tip = $('#add-link-tip input').val(); + + this.fireEvent('insert:link', [{url:url, text:display, tooltip:tip}]); + }, + + showImageFromUrl: function () { + this.showPage('#addother-imagefromurl'); + + var me = this; + var $input = $('#addimage-link-url input[type=url]'); + + $('#addimage-insert a').single('click', _.buffered(function () { + var value = ($input.val()).replace(/ /g, ''); + me.fireEvent('insert:image', [{islocal:false, url:value}]); + }, 100, me)); + + var $btnInsert = $('#addimage-insert'); + $('#addimage-url input[type=url]').single('input', function (e) { + $btnInsert.toggleClass('disabled', _.isEmpty($(e.currentTarget).val())); + }); + + _.delay(function () { $input.focus(); }, 1000); + }, + + textInsertImage: 'Insert Image', + textSort: 'Sort and Filter', + textLink: 'Link', + textBack: 'Back', + textAddLink: 'Add Link', + textDisplay: 'Display', + textTip: 'Screen Tip', + textInsert: 'Insert', + textPosition: 'Position', + textLeftTop: 'Left Top', + textCenterTop: 'Center Top', + textRightTop: 'Right Top', + textLeftBottom: 'Left Bottom', + textCenterBottom: 'Center Bottom', + textRightBottom: 'Right Bottom', + textCurrentPos: 'Current Position', + textNextPage: 'Next Page', + textContPage: 'Continuous Page', + textEvenPage: 'Even Page', + textOddPage: 'Odd Page' + , textFromLibrary: 'Picture from Library' + , textFromURL: 'Picture from URL' + , textLinkSettings: 'Link Settings' + , textAddress: 'Address' + , textImageURL: 'Image URL' + } + })(), SSE.Views.AddOther || {})) +}); \ No newline at end of file diff --git a/apps/spreadsheeteditor/mobile/resources/less/ios/_icons.less b/apps/spreadsheeteditor/mobile/resources/less/ios/_icons.less index dafadb1eb..0de053bd6 100644 --- a/apps/spreadsheeteditor/mobile/resources/less/ios/_icons.less +++ b/apps/spreadsheeteditor/mobile/resources/less/ios/_icons.less @@ -170,29 +170,25 @@ i.icon { height: 22px; .encoded-svg-background(''); } - &.icon-pagebreak { - width: 22px; - height: 22px; - .encoded-svg-background(''); - } - &.icon-sectionbreak { - width: 22px; - height: 22px; - .encoded-svg-background(''); - } - &.icon-stringbreak { - width: 22px; - height: 22px; - .encoded-svg-background(''); - } - &.icon-pagenumber { - width: 22px; - height: 22px; - .encoded-svg-background(''); - } &.icon-link { width: 22px; height: 22px; .encoded-svg-background(''); } + + &.icon-insimage { + width: 22px; + height: 22px; + .encoded-svg-background(''); + } + &.icon-sort { + width: 22px; + height: 22px; + .encoded-svg-background(''); + } + &.icon-image-library { + width: 22px; + height: 22px; + .encoded-svg-background('icons_for_svg'); + } } \ No newline at end of file diff --git a/apps/spreadsheeteditor/mobile/resources/less/material/_icons.less b/apps/spreadsheeteditor/mobile/resources/less/material/_icons.less index 321b5376d..5f8877a5a 100644 --- a/apps/spreadsheeteditor/mobile/resources/less/material/_icons.less +++ b/apps/spreadsheeteditor/mobile/resources/less/material/_icons.less @@ -140,31 +140,27 @@ i.icon { height: 22px; .encoded-svg-background(''); } - &.icon-pagebreak { - width: 22px; - height: 22px; - .encoded-svg-background(''); - } - &.icon-sectionbreak { - width: 22px; - height: 22px; - .encoded-svg-background(''); - } - &.icon-stringbreak { - width: 22px; - height: 22px; - .encoded-svg-background(''); - } - &.icon-pagenumber { - width: 22px; - height: 22px; - .encoded-svg-background(''); - } &.icon-link { width: 22px; height: 22px; .encoded-svg-background(''); } + + &.icon-insimage { + width: 22px; + height: 22px; + .encoded-svg-background(''); + } + &.icon-sort { + width: 22px; + height: 22px; + .encoded-svg-background(''); + } + &.icon-image-library { + width: 22px; + height: 22px; + .encoded-svg-background('icons_for_svg'); + } } // Overwrite color for toolbar