From 39149a052b877b32f1cb701af6e0c9887331b317 Mon Sep 17 00:00:00 2001 From: ansuz Date: Thu, 29 Jun 2017 14:12:54 +0200 Subject: [PATCH] add new feedback keys --- www/common/common-codemirror.js | 4 +++- www/common/cryptpad-common.js | 4 +++- www/common/toolbar2.js | 11 ++++++++--- www/drive/main.js | 5 ++++- 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/www/common/common-codemirror.js b/www/common/common-codemirror.js index 75da658b8..6202a9ce3 100644 --- a/www/common/common-codemirror.js +++ b/www/common/common-codemirror.js @@ -150,6 +150,7 @@ define([ options: options, // Entries displayed in the menu left: true, // Open to the left of the button isSelect: true, + feedback: 'CODE_LANGUAGE', }; var $block = exp.$language = Cryptpad.createDropdown(dropdownConfig); $block.find('button').attr('title', Messages.languageButtonTitle); @@ -183,7 +184,8 @@ define([ options: options, // Entries displayed in the menu left: true, // Open to the left of the button isSelect: true, - initialValue: lastTheme + initialValue: lastTheme, + feedback: 'CODE_THEME', }; var $block = exp.$theme = Cryptpad.createDropdown(dropdownConfig); $block.find('button').attr('title', Messages.themeButtonTitle); diff --git a/www/common/cryptpad-common.js b/www/common/cryptpad-common.js index 8f32d25a6..66fccba1c 100644 --- a/www/common/cryptpad-common.js +++ b/www/common/cryptpad-common.js @@ -1205,6 +1205,7 @@ define([ setActive($val); $innerblock.scrollTop($val.position().top + $innerblock.scrollTop()); } + if (config.feedback) { Cryptpad.feedback(config.feedback); } }; $container.click(function (e) { @@ -1403,7 +1404,8 @@ define([ text: $userButton.html(), // Button initial text options: options, // Entries displayed in the menu left: true, // Open to the left of the button - container: config.$initBlock // optional + container: config.$initBlock, // optional + feedback: "USER_ADMIN", }; var $userAdmin = createDropdown(dropdownConfigUser); diff --git a/www/common/toolbar2.js b/www/common/toolbar2.js index 3b5fd0ea2..5c531c38f 100644 --- a/www/common/toolbar2.js +++ b/www/common/toolbar2.js @@ -265,7 +265,9 @@ define([ $button.click(function () { $content.toggle(); - Cryptpad.setAttribute('userlist-drawer', $content.is(':visible')); + var visible = $content.is(':visible'); + Cryptpad.setAttribute('userlist-drawer', visible); + Cryptpad.feedback(visible?'USERLIST_SHOW': 'USERLIST_HIDE'); }); Cryptpad.getAttribute('userlist-drawer', function (err, val) { @@ -343,7 +345,8 @@ define([ } var dropdownConfigShare = { text: $('
').append($shareIcon).html(), - options: options + options: options, + feedback: 'SHARE', }; var $shareBlock = Cryptpad.createDropdown(dropdownConfigShare); //$shareBlock.find('button').attr('id', 'shareButton'); @@ -676,7 +679,9 @@ define([ var dropdownConfig = { text: '', // Button initial text options: pads_options, // Entries displayed in the menu - container: $newPad + container: $newPad, + feedback: /drive/.test(window.location.pathname)? + 'DRIVE_NEWPAD': 'NEWPAD', }; var $newPadBlock = Cryptpad.createDropdown(dropdownConfig); $newPadBlock.find('button').attr('title', Messages.newButtonTitle); diff --git a/www/drive/main.js b/www/drive/main.js index 6b8f6ff32..7b5c5db3d 100644 --- a/www/drive/main.js +++ b/www/drive/main.js @@ -1353,6 +1353,7 @@ define([ setViewMode('list'); $iframe.find('#' + FOLDER_CONTENT_ID).removeClass('grid'); $iframe.find('#' + FOLDER_CONTENT_ID).addClass('list'); + Cryptpad.feedback('DRIVE_LIST_MODE'); }); $gridButton.click(function () { $listButton.removeClass('active'); @@ -1360,6 +1361,7 @@ define([ setViewMode('grid'); $iframe.find('#' + FOLDER_CONTENT_ID).addClass('grid'); $iframe.find('#' + FOLDER_CONTENT_ID).removeClass('list'); + Cryptpad.feedback('DRIVE_GRID_MODE'); }); if (getViewMode() === 'list') { @@ -1413,7 +1415,8 @@ define([ var dropdownConfig = { text: $plusIcon.html() + Messages.fm_newButton, - options: options + options: options, + feedback: 'DRIVE_NEWPAD_LOCALFOLDER', }; var $block = Cryptpad.createDropdown(dropdownConfig);