From 21cb938ab3eaa638232460b9f74dc6de56185d1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?T=C3=A9o=20Vasseur?= <teo.vasseur@univ-lille1.fr>
Date: Thu, 6 Apr 2017 17:47:09 +0200
Subject: [PATCH 1/5] list.js : replace custom name with clone code, remove
 ending newlines

The 'title' attribute is changed, so as to display the original name of the clone when hovered over
---
 browser/js/list.js | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/browser/js/list.js b/browser/js/list.js
index 73d23dc60..f20671a0b 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.getCode();
                 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);
-
-
-
-
-
-
-
-
-- 
GitLab


From a850ba5e7d43dd40b587a98c5dcad2b459069d08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?T=C3=A9o=20Vasseur?= <teo.vasseur@univ-lille1.fr>
Date: Fri, 7 Apr 2017 12:58:48 +0200
Subject: [PATCH 2/5] clone.js : add getNameAndCode()

See #903
---
 browser/js/clone.js | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/browser/js/clone.js b/browser/js/clone.js
index 21467697b..1426b10eb 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 "<c_name> ( <seg name> )" <br>
+     * 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
-- 
GitLab


From 91a5a68592b30f97eb01aaac863db4fcecfc450e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?T=C3=A9o=20Vasseur?= <teo.vasseur@univ-lille1.fr>
Date: Fri, 7 Apr 2017 12:59:34 +0200
Subject: [PATCH 3/5] list.js : getNameAndCode() usage

See #903
Both custom and segmentation names now displayed in list
---
 browser/js/list.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/browser/js/list.js b/browser/js/list.js
index f20671a0b..d04079cb6 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.getCode();
+                span_name.title = clone.getNameAndCode();
                 span_name.style.color = clone.getColor();
 
                 //update star color
-- 
GitLab


From 6320e631eb91e4bdb0bc0ef8d6028855d4863944 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?T=C3=A9o=20Vasseur?= <teo.vasseur@univ-lille1.fr>
Date: Fri, 7 Apr 2017 13:01:20 +0200
Subject: [PATCH 4/5] model.js : getNameAndCode() usage

See #903
Both custom name and segmentation name now displayed in 'state' bar
---
 browser/js/model.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/browser/js/model.js b/browser/js/model.js
index db1e236e6..930dd1f2e 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())
 
     },
 
-- 
GitLab


From 4f26751983b8184956ed487297ac76dda2b057cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?T=C3=A9o=20Vasseur?= <teo.vasseur@univ-lille1.fr>
Date: Fri, 7 Apr 2017 14:34:15 +0200
Subject: [PATCH 5/5] browser/test/../clone_test.js : add tests for
 getNameAndCode()

---
 browser/test/QUnit/testFiles/clone_test.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/browser/test/QUnit/testFiles/clone_test.js b/browser/test/QUnit/testFiles/clone_test.js
index cd95767ec..239390ede 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()
-- 
GitLab