From 42667a48bf9661b2682851ef1245bebf03b306f9 Mon Sep 17 00:00:00 2001 From: Julia Svinareva Date: Tue, 16 Apr 2019 20:33:47 +0300 Subject: [PATCH] [de mobile] transfer color schemes to document settings and transfer spellcheck to application settings --- .../mobile/app/controller/Settings.js | 8 +-- .../mobile/app/template/Settings.template | 58 ++++++++++--------- 2 files changed, 34 insertions(+), 32 deletions(-) diff --git a/apps/documenteditor/mobile/app/controller/Settings.js b/apps/documenteditor/mobile/app/controller/Settings.js index 29f878b17..44b8717da 100644 --- a/apps/documenteditor/mobile/app/controller/Settings.js +++ b/apps/documenteditor/mobile/app/controller/Settings.js @@ -225,18 +225,18 @@ define([ Common.Utils.addScrollIfNeed('.page[data-page=settings-about-view]', '.page[data-page=settings-about-view] .page-content'); } else if ('#settings-advanced-view' == pageId) { me.initPageAdvancedSettings(); + $('#settings-spellcheck input:checkbox').attr('checked', Common.localStorage.getBool("de-mobile-spellcheck", false)); + $('#settings-spellcheck input:checkbox').single('change', _.bind(me.onSpellcheck, me)); + $('#settings-orthography').single('click', _.bind(me.onOrthographyCheck, me)); Common.Utils.addScrollIfNeed('.page[data-page=settings-advanced-view]', '.page[data-page=settings-advanced-view] .page-content'); } else if ('#color-schemes-view' == pageId) { me.initPageColorSchemes(); Common.Utils.addScrollIfNeed('.page[data-page=color-schemes-view]', '.page[data-page=color-schemes-view] .page-content'); } else { $('#settings-readermode input:checkbox').attr('checked', Common.SharedSettings.get('readerMode')); - $('#settings-spellcheck input:checkbox').attr('checked', Common.localStorage.getBool("de-mobile-spellcheck", false)); $('#settings-review input:checkbox').attr('checked', _isReviewOnly || Common.localStorage.getBool("de-mobile-track-changes-" + (_fileKey || ''))); $('#settings-search').single('click', _.bind(me.onSearch, me)); $('#settings-readermode input:checkbox').single('change', _.bind(me.onReaderMode, me)); - $('#settings-spellcheck input:checkbox').single('change', _.bind(me.onSpellcheck, me)); - $('#settings-orthography').single('click', _.bind(me.onOrthographyCheck, me)); $('#settings-review input:checkbox').single('change', _.bind(me.onTrackChanges, me)); $('#settings-help').single('click', _.bind(me.onShowHelp, me)); $('#settings-download').single('click', _.bind(me.onDownloadOrigin, me)); @@ -253,7 +253,7 @@ define([ templateInsert = ""; _.each(schemas, function (schema, index) { var colors = schema.get_colors();//schema.colors; - templateInsert = templateInsert + "
"; + templateInsert = templateInsert + "
"; for (var j = 2; j < 7; j++) { var clr = '#' + Common.Utils.ThemeColor.getHexColor(colors[j].get_r(), colors[j].get_g(), colors[j].get_b()); templateInsert = templateInsert + "" diff --git a/apps/documenteditor/mobile/app/template/Settings.template b/apps/documenteditor/mobile/app/template/Settings.template index b29f3b986..4c6420d8d 100644 --- a/apps/documenteditor/mobile/app/template/Settings.template +++ b/apps/documenteditor/mobile/app/template/Settings.template @@ -41,22 +41,6 @@
-
  • -
    -
    - -
    -
    -
    <%= scope.textSpellcheck %>
    -
    - -
    -
    -
    -
    • <% if (orthography) { %>
  • @@ -111,18 +95,6 @@
    • -
  • - -
    -
    - -
    -
    -
    <%= scope.textColorSchemes %>
    -
    -
    -     -
  • @@ -328,6 +300,19 @@
    • +
    + +
    @@ -637,6 +622,7 @@
    +
    <%= scope.textUnitOfMeasurement %>
      @@ -670,6 +656,22 @@
    +
    +
      +
      +
      +
      <%= scope.textSpellcheck %>
      +
      + +
      +
      +
      +
    +
    +