From e38f3066cedb80722b3488e7ab3b2809b6db5363 Mon Sep 17 00:00:00 2001
From: Kazutaka Miyasaka <kazmiya@gmail.com>
Date: Tue, 22 Jan 2013 21:41:41 +0100
Subject: fixed sample handling in toolbar FS#2691

---
 lib/scripts/toolbar.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/scripts')

diff --git a/lib/scripts/toolbar.js b/lib/scripts/toolbar.js
index 04d30c1a6..059a4ba5c 100644
--- a/lib/scripts/toolbar.js
+++ b/lib/scripts/toolbar.js
@@ -94,7 +94,7 @@ function tb_format(btn, props, edid) {
  * @author Andreas Gohr <andi@splitbrain.org>
  */
 function tb_formatln(btn, props, edid) {
-    var sample = props.title || props.sample,
+    var sample = props.sample || props.title,
         opts,
         selection = getSelection(jQuery('#'+edid)[0]);
 
-- 
cgit v1.2.3


From e287e142b9b7e9a16117f14ff9488c85ef67f33a Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Thu, 24 Jan 2013 23:47:15 +0000
Subject: fixed files being unselectable after upload (FS#2591)

---
 lib/scripts/fileuploaderextended.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/scripts')

diff --git a/lib/scripts/fileuploaderextended.js b/lib/scripts/fileuploaderextended.js
index 4abd63bef..0ba7a0525 100644
--- a/lib/scripts/fileuploaderextended.js
+++ b/lib/scripts/fileuploaderextended.js
@@ -173,7 +173,7 @@ qq.extend(qq.FileUploaderExtended.prototype, {
 
         if (result.success){
             qq.addClass(item, this._classes.success);
-            $link = '<a href="' + result.link + '" name="h_:' + result.id + '" class="select">' + nameInput.value + '</a>';
+            $link = '<a href="' + result.link + '" id="h_:' + result.id + '" class="select">' + nameInput.value + '</a>';
             jQuery(fileElement).html($link);
 
         } else {
-- 
cgit v1.2.3