public-offering
/
pad.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix timeslider export dropdown

pull/2120/head
Marcel Klehr 2014-03-30 12:30:18 +02:00
parent 54bf17bfea
commit 867e40533a
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/static/js/pad_editbar.js
View File

@ -206,7 +206,7 @@ var padeditbar = (function()
if(module.css('display') != "none") if(module.css('display') != "none")
{ {
$("#" + module[i] + "link").removeClass("selected"); $("#" + self.dropdowns[i] + "link").removeClass("selected");
module.slideUp("fast", cb); module.slideUp("fast", cb);
returned = true; returned = true;
} }
@ -297,7 +297,7 @@ var padeditbar = (function()
ace.ace_doUndoRedo(cmd); ace.ace_doUndoRedo(cmd);
}); });
toolbar.registerAceCommand("redo", function (cmd, ace) { toolbar.registerAceCommand("redo", function (cmd) {
ace.ace_doUndoRedo(cmd); ace.ace_doUndoRedo(cmd);
}); });

4
src/templates/timeslider.html
View File

@ -80,7 +80,7 @@
<div class="editbarright toolbar" id="editbar"> <div class="editbarright toolbar" id="editbar">
<% e.begin_block("timesliderEditbarRight"); %> <% e.begin_block("timesliderEditbarRight"); %>
<ul> <ul>
<li onClick="window.padeditbar.toolbarClick('import_export');return false;"> <li onClick="window.padeditbar.triggerCommand('import_export');return false;">
<a id="exportlink" data-l10n-id="timeslider.toolbar.exportlink.title"> <a id="exportlink" data-l10n-id="timeslider.toolbar.exportlink.title">
<div class="buttonicon buttonicon-import_export"></div> <div class="buttonicon buttonicon-import_export"></div>
</a> </a>
@ -241,6 +241,8 @@
/* TODO: These globals shouldn't exist. */ /* TODO: These globals shouldn't exist. */
padeditbar = require('ep_etherpad-lite/static/js/pad_editbar').padeditbar; padeditbar = require('ep_etherpad-lite/static/js/pad_editbar').padeditbar;
padimpexp = require('ep_etherpad-lite/static/js/pad_impexp').padimpexp; padimpexp = require('ep_etherpad-lite/static/js/pad_impexp').padimpexp;
padeditbar.init()
}); });
})(); })();
</script> </script>