From fe308947ab9825e684985d0c3853ab26403d334b Mon Sep 17 00:00:00 2001 From: agrt56 Date: Sun, 31 May 2015 19:44:05 +0200 Subject: [PATCH] Task #16020: Hide scrolling elements for student role. --- src/main/webapp/app/view/FreetextAnswerPanel.js | 2 +- src/main/webapp/app/view/FreetextDetailAnswer.js | 2 +- src/main/webapp/app/view/feedbackQuestions/DetailsPanel.js | 1 - src/main/webapp/app/view/feedbackQuestions/QuestionsPanel.js | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/webapp/app/view/FreetextAnswerPanel.js b/src/main/webapp/app/view/FreetextAnswerPanel.js index cf8ace72..f3c17795 100644 --- a/src/main/webapp/app/view/FreetextAnswerPanel.js +++ b/src/main/webapp/app/view/FreetextAnswerPanel.js @@ -318,7 +318,7 @@ Ext.define('ARSnova.view.FreetextAnswerPanel', { var screenWidth = (window.innerWidth > 0) ? window.innerWidth : screen.width; ARSnova.app.innerScrollPanel = this; - if (screenWidth > 700) { + if (screenWidth > 700 && ARSnova.app.userRole === ARSnova.app.USER_ROLE_SPEAKER) { this.zoomButton.show(); this.initializeZoomComponents(); } diff --git a/src/main/webapp/app/view/FreetextDetailAnswer.js b/src/main/webapp/app/view/FreetextDetailAnswer.js index a6ed22f1..e7ed8949 100644 --- a/src/main/webapp/app/view/FreetextDetailAnswer.js +++ b/src/main/webapp/app/view/FreetextDetailAnswer.js @@ -234,7 +234,7 @@ Ext.define('ARSnova.view.FreetextDetailAnswer', { ARSnova.app.innerScrollPanel = this; var screenWidth = (window.innerWidth > 0) ? window.innerWidth : screen.width; - if (screenWidth > 700) { + if (screenWidth > 700 && ARSnova.app.userRole === ARSnova.app.USER_ROLE_SPEAKER) { this.zoomButton.show(); this.initializeZoomComponents(); } diff --git a/src/main/webapp/app/view/feedbackQuestions/DetailsPanel.js b/src/main/webapp/app/view/feedbackQuestions/DetailsPanel.js index 21d8164a..193beff1 100644 --- a/src/main/webapp/app/view/feedbackQuestions/DetailsPanel.js +++ b/src/main/webapp/app/view/feedbackQuestions/DetailsPanel.js @@ -138,7 +138,6 @@ Ext.define('ARSnova.view.feedbackQuestions.DetailsPanel', { scope: this, handler: function () { var panel = ARSnova.app.mainTabPanel.tabPanel.feedbackQuestionsPanel; - ARSnova.app.questionModel.deleteInterposed(this.questionObj, { success: function () { me.questionObj.destroy(); diff --git a/src/main/webapp/app/view/feedbackQuestions/QuestionsPanel.js b/src/main/webapp/app/view/feedbackQuestions/QuestionsPanel.js index 57c31384..e51f200c 100644 --- a/src/main/webapp/app/view/feedbackQuestions/QuestionsPanel.js +++ b/src/main/webapp/app/view/feedbackQuestions/QuestionsPanel.js @@ -67,7 +67,7 @@ Ext.define('ARSnova.view.feedbackQuestions.QuestionsPanel', { ARSnova.app.mainTabPanel.tabPanel.feedbackQuestionsPanel.questionsPanel.updateTime(); }, interval: 1000 // 1 second - }, + } }, toolbar: null, -- GitLab