mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-24 01:16:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

Normalizing how select and button commands are triggered.

Browse source
This commit is contained in:
cohitre 2013-04-15 11:32:59 -07:00
parent e1961d4353
commit 0c52fb5e30
2 changed files with 124 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/node/utils/toolbar.js
View file

@ -93,15 +93,12 @@ Button.load = function (btnName) {
_.extend(Button.prototype, {
grouping: "",
li: function (attributes, contents) {
attributes = _.extend({
"data-key": this.attributes.key,
}, attributes);
return tag("li", attributes, contents);
},
render: function () {
return this.li({},
var liAttributes = {
"data-type": "button",
"data-key": this.attributes.key,
};
return tag("li", liAttributes,
tag("a", { "class": this.grouping, "data-l10n-id": this.attributes.localizationId },
tag("span", { "class": "buttonicon " + this.attributes.icon })
)
@ -137,8 +134,14 @@ _.extend(SelectButton.prototype, Button.prototype, {
});
return tag("select", attributes, options.join(""));
},
render: function () {
return this.li({ id: this.attributes.id },
var attributes = {
id: this.attributes.id,
"data-key": "",
"data-type": "select"
};
return this.li(attributes,
this.select({ id: this.attributes.selectId })
);
}