diff --git a/app/assets/javascripts/pretty-text-bundle.js b/app/assets/javascripts/pretty-text-bundle.js index 6602c63a6b5..6f2ab7de7bf 100644 --- a/app/assets/javascripts/pretty-text-bundle.js +++ b/app/assets/javascripts/pretty-text-bundle.js @@ -7,7 +7,6 @@ //= require ./pretty-text/addon/engines/discourse-markdown-it //= require xss.min //= require ./pretty-text/addon/allow-lister -//= require ./pretty-text/addon/white-lister //= require ./pretty-text/addon/sanitizer //= require ./pretty-text/addon/oneboxer //= require ./pretty-text/addon/oneboxer-cache diff --git a/app/assets/javascripts/pretty-text/addon/allow-lister.js b/app/assets/javascripts/pretty-text/addon/allow-lister.js index a6378ee61c3..764eaa8188c 100644 --- a/app/assets/javascripts/pretty-text/addon/allow-lister.js +++ b/app/assets/javascripts/pretty-text/addon/allow-lister.js @@ -1,4 +1,3 @@ -import deprecated from "discourse-common/lib/deprecated"; // to match: // abcd // abcd[test] @@ -27,14 +26,6 @@ export default class AllowLister { this._rawFeatures.push([feature, info]); } - whiteListFeature(feature, info) { - deprecated("`whiteListFeature` has been replaced with `allowListFeature`", { - since: "2.6.0.beta.4", - dropFrom: "2.7.0", - }); - this.allowListFeature(feature, info); - } - disable(feature) { this._enabled[feature] = false; this._cache = null; @@ -105,14 +96,6 @@ export default class AllowLister { return this._cache.allowList; } - getWhiteList() { - deprecated("`getWhiteList` has been replaced with `getAllowList`", { - since: "2.6.0.beta.4", - dropFrom: "2.7.0", - }); - return this.getAllowList(); - } - getCustom() { this._ensureCache(); return this._cache.custom; diff --git a/app/assets/javascripts/pretty-text/addon/white-lister.js b/app/assets/javascripts/pretty-text/addon/white-lister.js deleted file mode 100644 index e07df502e44..00000000000 --- a/app/assets/javascripts/pretty-text/addon/white-lister.js +++ /dev/null @@ -1,16 +0,0 @@ -import AllowLister, { - DEFAULT_LIST as NEW_DEFAULT_LIST, -} from "pretty-text/allow-lister"; -import deprecated from "discourse-common/lib/deprecated"; - -export default class WhiteLister extends AllowLister { - constructor(options) { - deprecated("`WhiteLister` has been replaced with `AllowLister`", { - since: "2.6.0.beta.4", - dropFrom: "2.7.0", - }); - super(options); - } -} - -export const DEFAULT_LIST = NEW_DEFAULT_LIST;