vendor/assets/javascripts/ckeditor/plugins/CKCss/dialogs/ckcss.js in glebtv-ckeditor-4.0.2.2 vs vendor/assets/javascripts/ckeditor/plugins/CKCss/dialogs/ckcss.js in glebtv-ckeditor-4.0.2.4
- old
+ new
@@ -673,20 +673,18 @@
preview(this);
}
},
{
type: 'button',
- id: 'colorChoose',
+ id: 'txcolorChoose',
label: editor.lang.CKCss.choose,
style: 'margin-left: 10px',
onClick: function () {
var self = this;
- getDialogValue('colordialog', function (colorDialog) {
+ editor.getColorFromDialog(function(val) {
var destElem = self.getDialog().getContentElement('page1', 'color');
- destElem.setValue(
- colorDialog.getContentElement('picker', 'selectedColor').getValue()
- );
+ destElem.setValue(val);
preview(destElem);
});
}
}
]
@@ -1017,20 +1015,18 @@
preview(this);
}
},
{
type: 'button',
- id: 'colorChoose',
+ id: 'bgcolorChoose',
label: editor.lang.CKCss.choose,
style: 'margin-left: 10px',
onClick: function () {
var self = this;
- getDialogValue('colordialog', function (colorDialog) {
+ editor.getColorFromDialog(function(val) {
var destElem = self.getDialog().getContentElement('page3', 'backgroundColor');
- destElem.setValue(
- colorDialog.getContentElement('picker', 'selectedColor').getValue()
- );
+ destElem.setValue(val);
preview(destElem);
});
}
}
]
@@ -1381,20 +1377,18 @@
if (elem.getValue()) elem.setValue(true);
}
},
{
type: 'button',
- id: 'colorChoose',
+ id: 'btcolorChoose',
label: editor.lang.CKCss.choose,
style: 'margin-left: 10px',
onClick: function () {
var self = this;
- getDialogValue('colordialog', function (colorDialog) {
+ editor.getColorFromDialog(function(val) {
var destElem = self.getDialog().getContentElement('page4', 'borderTopColor');
- destElem.setValue(
- colorDialog.getContentElement('picker', 'selectedColor').getValue()
- );
+ destElem.setValue(val);
preview(destElem);
var dialog = destElem.getDialog();
var elem = dialog.getContentElement('page4', 'borderColorAll');
if (elem.getValue()) elem.setValue(true);
});
@@ -1483,20 +1477,18 @@
preview(this);
}
},
{
type: 'button',
- id: 'colorChoose',
+ id: 'brcolorChoose',
label: editor.lang.CKCss.choose,
style: 'margin-left: 10px',
onClick: function () {
var self = this;
- getDialogValue('colordialog', function (colorDialog) {
+ editor.getColorFromDialog(function(val) {
var destElem = self.getDialog().getContentElement('page4', 'borderRightColor');
- destElem.setValue(
- colorDialog.getContentElement('picker', 'selectedColor').getValue()
- );
+ destElem.setValue(val);
preview(destElem);
});
}
}
]
@@ -1582,20 +1574,18 @@
preview(this);
}
},
{
type: 'button',
- id: 'colorChoose',
+ id: 'bbcolorChoose',
label: editor.lang.CKCss.choose,
style: 'margin-left: 10px',
onClick: function () {
var self = this;
- getDialogValue('colordialog', function (colorDialog) {
+ editor.getColorFromDialog(function(val) {
var destElem = self.getDialog().getContentElement('page4', 'borderBottomColor');
- destElem.setValue(
- colorDialog.getContentElement('picker', 'selectedColor').getValue()
- );
+ destElem.setValue(val);
preview(destElem);
});
}
}
]
@@ -1681,19 +1671,17 @@
preview(this);
}
},
{
type: 'button',
- id: 'colorChoose',
+ id: 'blcolorChoose',
label: editor.lang.CKCss.choose,
style: 'margin-left: 10px',
onClick: function () {
var self = this;
- getDialogValue('colordialog', function (colorDialog) {
+ editor.getColorFromDialog(function(val) {
var destElem = self.getDialog().getContentElement('page4', 'borderLeftColor');
- destElem.setValue(
- colorDialog.getContentElement('picker', 'selectedColor').getValue()
- );
+ destElem.setValue(val);
preview(destElem);
});
}
}
]
\ No newline at end of file