Fix initialization of ButtonMenu

This commit is contained in:
Rikard Bartholf
2017-05-17 12:46:22 +02:00
parent 30b30406fe
commit 6ac64d18bd
4 changed files with 23 additions and 23 deletions
+3 -1
View File
@@ -1,4 +1,5 @@
'use strict';
var config = require('../config');
var util = require('../util');
var ApertureHandler = require('./ApertureHandler');
var ButtonMenu = require('./ButtonMenu');
@@ -62,7 +63,8 @@ var Canvas = fabric.util.createClass(fabric.Canvas, {
*/
getButtonMenu: function (settings) {
if (!this.__buttonMenu) {
this.__buttonMenu = new ButtonMenu(this, settings);
var defaults = config.buttonMenu[this.__type];
this.__buttonMenu = new ButtonMenu(this, $.extend({}, defaults, settings));
}
return this.__buttonMenu;
},