From f2b66970981fcd175368d1276172250723d2b8fd Mon Sep 17 00:00:00 2001 From: Jonathan Frederic Date: Fri, 14 Nov 2014 10:01:07 -0800 Subject: [PATCH] Use a property instead of a setter method --- IPython/html/static/notebook/js/cell.js | 26 ++++++++++----------- IPython/html/static/notebook/js/notebook.js | 6 ++--- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/IPython/html/static/notebook/js/cell.js b/IPython/html/static/notebook/js/cell.js index 6ba15e42c..9e2aac1d1 100644 --- a/IPython/html/static/notebook/js/cell.js +++ b/IPython/html/static/notebook/js/cell.js @@ -45,7 +45,18 @@ define([ this.selected = false; this.rendered = false; this.mode = 'command'; - this.metadata = {}; + + // Metadata property + var that = this; + this._metadata = {}; + Object.defineProperty(this, 'metadata', { + get: function() { return that._metadata; }, + set: function(value) { + that._metadata = value; + that.celltoolbar.rebuild(); + } + }); + // load this from metadata later ? this.user_highlight = 'auto'; this.cm_config = config.cm_config; @@ -392,16 +403,6 @@ define([ */ Cell.prototype.set_text = function (text) { }; - - /** - * Set the metadata of the cell and triggers the celltoolbars to update. - * @method set_metadata - * @param {dictionary} metadata - */ - Cell.prototype.set_metadata = function (metadata) { - this.metadata = metadata; - this.celltoolbar.rebuild(); - }; /** * should be overritten by subclass @@ -422,9 +423,8 @@ define([ **/ Cell.prototype.fromJSON = function (data) { if (data.metadata !== undefined) { - this.set_metadata(data.metadata); + this.metadata = data.metadata; } - this.celltoolbar.rebuild(); }; diff --git a/IPython/html/static/notebook/js/notebook.js b/IPython/html/static/notebook/js/notebook.js index 2cef98b72..33c000de7 100644 --- a/IPython/html/static/notebook/js/notebook.js +++ b/IPython/html/static/notebook/js/notebook.js @@ -995,7 +995,7 @@ define([ text = ''; } //metadata - target_cell.set_metadata(source_cell.metadata); + target_cell.metadata = source_cell.metadata; target_cell.set_text(text); // make this value the starting point, so that we can only undo @@ -1029,7 +1029,7 @@ define([ text = ''; } // metadata - target_cell.set_metadata(source_cell.metadata); + target_cell.metadata = source_cell.metadata; // We must show the editor before setting its contents target_cell.unrender(); target_cell.set_text(text); @@ -1067,7 +1067,7 @@ define([ text = ''; } //metadata - target_cell.set_metadata(source_cell.metadata); + target_cell.metadata = source_cell.metadata; // We must show the editor before setting its contents target_cell.unrender(); target_cell.set_text(text);