diff --git a/browser/js/clone.js b/browser/js/clone.js index 21467697b281f236ee52c05e9a5dca18bd67bdf9..1426b10ebd887df007ef0bc34f1684e1f980a474 100644 --- a/browser/js/clone.js +++ b/browser/js/clone.js @@ -357,6 +357,19 @@ Clone.prototype = { } }, //end getCode + /** + * return custom name and segmentation name " ( )"
+ * return segmentation name only if there is no custom name + * @return {string} custom name and segmentation name + * */ + getNameAndCode: function () { + if (this.c_name) { + return this.c_name + " (" + this.getCode() + ")"; + } else { + return this.getCode(); + } + }, //end getNameAndCode + /** * change/add custom name * @param {string} name diff --git a/browser/js/list.js b/browser/js/list.js index 73d23dc60ee8d98a86a3804fd29834804e3d65c4..d04079cb69d184afe3db3e31129aee07f8241097 100644 --- a/browser/js/list.js +++ b/browser/js/list.js @@ -469,7 +469,7 @@ List.prototype = { if (typeof span_name == "undefined") return false; if (typeof span_name == "undefined") console.log(cloneID); span_name.innerHTML = clone.getShortName(); - span_name.title = clone.getName(); + span_name.title = clone.getNameAndCode(); span_name.style.color = clone.getColor(); //update star color @@ -844,11 +844,3 @@ List.prototype = { } //fin prototype List.prototype = $.extend(Object.create(View.prototype), List.prototype); - - - - - - - - diff --git a/browser/js/model.js b/browser/js/model.js index db1e236e69d32706037403c8ed4351498e5de7f3..930dd1f2ec95048d610d9f2976dca60e36f66614 100644 --- a/browser/js/model.js +++ b/browser/js/model.js @@ -737,7 +737,7 @@ changeCloneNotation: function(cloneNotationType) { } $(".focus") - .text(this.clone(cloneID).getName()) + .text(this.clone(cloneID).getNameAndCode()) }, diff --git a/browser/test/QUnit/testFiles/clone_test.js b/browser/test/QUnit/testFiles/clone_test.js index cd95767ecf2468ee757041cbf9aa6a7fe4913bc1..239390edeff93fdff7c99d9495a5eeccfac926e1 100644 --- a/browser/test/QUnit/testFiles/clone_test.js +++ b/browser/test/QUnit/testFiles/clone_test.js @@ -116,6 +116,9 @@ QUnit.test("name, informations, getHtmlInfo", function(assert) { assert.equal(c3.getSequenceName(), "plop", "changename clone3 : plop"); assert.equal(c1.getNumberNonZeroSamples(), 3, "clone c1, getNumberNonZeroSamples"); + assert.equal(c2.getNameAndCode(), some_name, "clone2, .getNameAndCode()"); + assert.equal(c3.getNameAndCode(), "plop (id3)", "clone3, .getNameAndCode()"); + m.select(0) m.select(1) m.merge()