diff options
| author | Klap-in <klapinklapin@gmail.com> | 2013-01-26 21:03:14 +0100 |
|---|---|---|
| committer | Klap-in <klapinklapin@gmail.com> | 2013-01-26 21:03:14 +0100 |
| commit | 3a2c510523e4ea91ab270c3075349f319e4bc95e (patch) | |
| tree | 7fe2d24e5f4450cf78e9291e8a2899665274c636 /lib/scripts | |
| parent | 5fd9b829e7d9947de0eeead685e0a0cf707eff88 (diff) | |
| parent | 1a40fc9935bd06a440a844e081e4bfce5fce2932 (diff) | |
| download | rpg-3a2c510523e4ea91ab270c3075349f319e4bc95e.tar.gz rpg-3a2c510523e4ea91ab270c3075349f319e4bc95e.tar.bz2 | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'lib/scripts')
| -rw-r--r-- | lib/scripts/fileuploaderextended.js | 2 | ||||
| -rw-r--r-- | lib/scripts/toolbar.js | 2 |
2 files changed, 2 insertions, 2 deletions
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 { 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]); |