diff options
| author | Kate Arzamastseva <pshns@ukr.net> | 2011-04-18 17:00:40 +0300 |
|---|---|---|
| committer | Kate Arzamastseva <pshns@ukr.net> | 2011-04-18 17:00:40 +0300 |
| commit | f493983cbddc6c8c387a76bf3f6631853485162b (patch) | |
| tree | 38cc53f0b287fde2a1b4426faa8a6fff1e56d769 /lib/scripts/media.js | |
| parent | 058f1c3e98b1437a691cc77a36002dee1c41f007 (diff) | |
| parent | 342e58c8c048bfd5f57f10bd88cee95aa2732e96 (diff) | |
| download | rpg-f493983cbddc6c8c387a76bf3f6631853485162b.tar.gz rpg-f493983cbddc6c8c387a76bf3f6631853485162b.tar.bz2 | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'lib/scripts/media.js')
| -rw-r--r-- | lib/scripts/media.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/scripts/media.js b/lib/scripts/media.js index 57f599163..530e93055 100644 --- a/lib/scripts/media.js +++ b/lib/scripts/media.js @@ -774,6 +774,6 @@ addInitEvent(function(){ media_manager.selectorattach($('media__content')); media_manager.confirmattach($('media__content')); media_manager.attachoptions($('media__opts')); - media_manager.initpopup(); + //media_manager.initpopup(); media_manager.initFlashUpload(); }); |