IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: call onSelect plugin callbacks for noop rows (#6682)

Browse Source
This commit is contained in:
Joffrey JAFFEUX 2018-11-29 15:56:19 +01:00 committed by GitHub
parent 6b433b66f5
commit 8da8f5d0f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 64 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/select-kit/components/multi-select.js.es6
View File

@ -265,6 +265,12 @@ export default SelectKitComponent.extend({
}
if (computedContentItem.__sk_row_type === "noopRow") {
applyOnSelectPluginApiCallbacks(
this.get("pluginApiIdentifiers"),
computedContentItem.value,
this
);
this._boundaryActionHandler("onSelect", computedContentItem.value);
return;
}

6
app/assets/javascripts/select-kit/components/single-select.js.es6
View File

@ -211,6 +211,12 @@ export default SelectKitComponent.extend({
select(computedContentItem) {
if (computedContentItem.__sk_row_type === "noopRow") {
applyOnSelectPluginApiCallbacks(
this.get("pluginApiIdentifiers"),
computedContentItem.value,
this
);
this._boundaryActionHandler("onSelect", computedContentItem.value);
return;
}

39
test/javascripts/components/multi-select-test.js.es6
View File

@ -1,4 +1,7 @@
import componentTest from "helpers/component-test";
import { withPluginApi } from "discourse/lib/plugin-api";
import { clearCallbacks } from "select-kit/mixins/plugin-api";
moduleForComponent("multi-select", {
integration: true,
beforeEach: function() {
@ -317,3 +320,39 @@ componentTest("with forceEscape", {
);
}
});
componentTest("support modifying on select behavior through plugin api", {
template:
'<span class="on-select-test"></span>{{multi-select content=content}}',
beforeEach() {
withPluginApi("0.8.13", api => {
api.modifySelectKit("select-kit").onSelect((context, value) => {
find(".on-select-test").html(value);
});
});
this.set("content", [
{ id: "1", name: "robin" },
{ id: "2", name: "arpit", __sk_row_type: "noopRow" }
]);
},
async test(assert) {
await this.get("subject").expand();
await this.get("subject").selectRowByValue(1);
assert.equal(find(".on-select-test").html(), "1");
await this.get("subject").expand();
await this.get("subject").selectRowByValue(2);
assert.equal(
find(".on-select-test").html(),
"2",
"it calls onSelect for noopRows"
);
clearCallbacks();
}
});

14
test/javascripts/components/single-select-test.js.es6
View File

@ -488,7 +488,10 @@ componentTest("support modifying on select behavior through plugin api", {
});
});
this.set("content", [{ id: "1", name: "robin" }]);
this.set("content", [
{ id: "1", name: "robin" },
{ id: "2", name: "arpit", __sk_row_type: "noopRow" }
]);
},
async test(assert) {
@ -497,6 +500,15 @@ componentTest("support modifying on select behavior through plugin api", {
assert.equal(find(".on-select-test").html(), "1");
await this.get("subject").expand();
await this.get("subject").selectRowByValue(2);
assert.equal(
find(".on-select-test").html(),
"2",
"it calls onSelect for noopRows"
);
clearCallbacks();
}
});