diff options
| author | Pierre Spring <pierre.spring@caillou.ch> | 2010-10-10 17:42:54 +0200 |
|---|---|---|
| committer | Pierre Spring <pierre.spring@caillou.ch> | 2010-10-10 17:42:54 +0200 |
| commit | c949039ddb6e824ea0449569499c8810165ee8c3 (patch) | |
| tree | 8998850aa6b1915fd0b445de6591a8c664742623 /lib | |
| parent | 10290c15207831fdf7863286ee6e11519e7bd873 (diff) | |
| parent | 9a5b2366bbd98dc1293220801ff2ea2b9b723eea (diff) | |
| download | rpg-c949039ddb6e824ea0449569499c8810165ee8c3.tar.gz rpg-c949039ddb6e824ea0449569499c8810165ee8c3.tar.bz2 | |
Merge remote branch 'origin/master'
Conflicts:
lib/scripts/media.js
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/scripts/media.js | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/scripts/media.js b/lib/scripts/media.js index ee387e42f..974b2864c 100644 --- a/lib/scripts/media.js +++ b/lib/scripts/media.js @@ -1,4 +1,4 @@ - lib/scripts/media.js/*jslint white: true, onevar: true, undef: true, nomen: true, eqeqeq: true, plusplus: true, bitwise: true, regexp: false, strict: true, newcap: true, immed: true */ +/*jslint white: true, onevar: true, undef: true, nomen: true, eqeqeq: true, plusplus: true, bitwise: true, regexp: false, strict: true, newcap: true, immed: true */ /*global jQuery, window, DOKU_BASE*/ "use strict"; @@ -141,7 +141,6 @@ popup.appendChild(btnp); btnp.setAttribute('class','btnlbl'); - var btn = document.createElement('input'); btn.type = 'button'; btn.id = 'media__sendbtn'; @@ -733,4 +732,4 @@ var media_manager = { media_manager.width = false; } } -}; +};
\ No newline at end of file |