From 24dd9d67d72b59c36e4d3d984131730251e04ccb Mon Sep 17 00:00:00 2001 From: "Mokkapati, Praneet(ES)" Date: Sat, 7 Jul 2018 17:58:56 +0530 Subject: [PATCH 1/2] Disabling Adding or Removing Tags, when a cell is not editable --- .../notebook/js/celltoolbarpresets/tags.js | 30 +++++++++++-------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/notebook/static/notebook/js/celltoolbarpresets/tags.js b/notebook/static/notebook/js/celltoolbarpresets/tags.js index 4ec2761ec1..ff531cfe62 100644 --- a/notebook/static/notebook/js/celltoolbarpresets/tags.js +++ b/notebook/static/notebook/js/celltoolbarpresets/tags.js @@ -62,7 +62,7 @@ define([ if (changed) { // Make tag UI - var tag = make_tag(name, on_remove); + var tag = make_tag(name, on_remove, cell.is_editable()); tag_container.append(tag); var tag_map = jQuery.data(tag_container, "tag_map") || {}; tag_map[name] = tag; @@ -84,7 +84,7 @@ define([ }; }; - var init_tag_container = function(cell, tag_container, on_remove) { + var init_tag_container = function(cell, tag_container, on_remove) { var tag_list = cell.metadata.tags || []; if (!Array.isArray(tag_list)) { // We cannot make tags UI for this cell! @@ -99,7 +99,7 @@ define([ // Unexpected type, disable toolbar for safety return false; } - var tag = make_tag(tag_name, on_remove); + var tag = make_tag(tag_name, on_remove, cell.is_editable()); tag_container.append(tag); tag_map[tag_name] = tag; } @@ -107,19 +107,21 @@ define([ return true; }; - var make_tag = function(name, on_remove) { + var make_tag = function(name, on_remove, is_editable) { var tag_UI = $('') .addClass('cell-tag') .text(name); - var remove_button = $('') - .addClass('remove-tag-btn') - .addClass('fa fa-times') - .click(function () { - on_remove(name); - return false; - }); - tag_UI.append(remove_button); + if(is_editable){ + var remove_button = $('') + .addClass('remove-tag-btn') + .addClass('fa fa-times') + .click(function () { + on_remove(name); + return false; + }); + tag_UI.append(remove_button); + } return tag_UI; }; @@ -234,7 +236,9 @@ define([ button_container.append(tag_container); var on_add = add_tag(cell, tag_container, on_remove); - add_tag_edit(div, cell, on_add, on_remove); + if(cell.is_editable()){ + add_tag_edit(div, cell, on_add, on_remove); + } }; var register = function(notebook) { From b3457a068e4bdba067b6b13da73ecc131406f865 Mon Sep 17 00:00:00 2001 From: "Mokkapati, Praneet(ES)" Date: Sat, 7 Jul 2018 17:59:57 +0530 Subject: [PATCH 2/2] Disabling Slide Type changes, when a cell is not editable --- notebook/static/notebook/js/celltoolbar.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/notebook/static/notebook/js/celltoolbar.js b/notebook/static/notebook/js/celltoolbar.js index 3a954706b9..235f62458b 100644 --- a/notebook/static/notebook/js/celltoolbar.js +++ b/notebook/static/notebook/js/celltoolbar.js @@ -446,6 +446,9 @@ define([ var button_container = $(div); var lbl = $("