[PE] Changed special paste menu.
This commit is contained in:
parent
28a1c6561f
commit
9e48dbd68d
|
@ -687,36 +687,6 @@ define([
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
var onSignatureClick = function(guid, width, height) {
|
|
||||||
if (_.isUndefined(me.fontStore)) {
|
|
||||||
me.fontStore = new Common.Collections.Fonts();
|
|
||||||
var fonts = PE.getController('Toolbar').getView('Toolbar').cmbFontName.store.toJSON();
|
|
||||||
var arr = [];
|
|
||||||
_.each(fonts, function(font, index){
|
|
||||||
if (!font.cloneid) {
|
|
||||||
arr.push(_.clone(font));
|
|
||||||
}
|
|
||||||
});
|
|
||||||
me.fontStore.add(arr);
|
|
||||||
}
|
|
||||||
|
|
||||||
var win = new Common.Views.SignDialog({
|
|
||||||
api: me.api,
|
|
||||||
signType: 'visible',
|
|
||||||
fontStore: me.fontStore,
|
|
||||||
signSize: {width: width, height: height},
|
|
||||||
handler: function(dlg, result) {
|
|
||||||
if (result == 'ok') {
|
|
||||||
var props = dlg.getSettings();
|
|
||||||
me.api.asc_Sign(props.certificateId, guid, props.images[0], props.images[1]);
|
|
||||||
}
|
|
||||||
me.fireEvent('editcomplete', me);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
win.show();
|
|
||||||
};
|
|
||||||
|
|
||||||
var onTextLanguage = function(langid) {
|
var onTextLanguage = function(langid) {
|
||||||
me._currLang.id = langid;
|
me._currLang.id = langid;
|
||||||
};
|
};
|
||||||
|
@ -1536,6 +1506,9 @@ define([
|
||||||
me._arrSpecialPaste[Asc.c_oSpecialPasteProps.paste] = me.textPaste;
|
me._arrSpecialPaste[Asc.c_oSpecialPasteProps.paste] = me.textPaste;
|
||||||
me._arrSpecialPaste[Asc.c_oSpecialPasteProps.keepTextOnly] = me.txtKeepTextOnly;
|
me._arrSpecialPaste[Asc.c_oSpecialPasteProps.keepTextOnly] = me.txtKeepTextOnly;
|
||||||
me._arrSpecialPaste[Asc.c_oSpecialPasteProps.picture] = me.txtPastePicture;
|
me._arrSpecialPaste[Asc.c_oSpecialPasteProps.picture] = me.txtPastePicture;
|
||||||
|
me._arrSpecialPaste[Asc.c_oSpecialPasteProps.sourceformatting] = me.txtPasteSourceFormat;
|
||||||
|
me._arrSpecialPaste[Asc.c_oSpecialPasteProps.destinationFormatting] = me.txtPasteDestFormat;
|
||||||
|
|
||||||
|
|
||||||
pasteContainer = $('<div id="special-paste-container" style="position: absolute;"><div id="id-document-holder-btn-special-paste"></div></div>');
|
pasteContainer = $('<div id="special-paste-container" style="position: absolute;"><div id="id-document-holder-btn-special-paste"></div></div>');
|
||||||
me.cmpEl.append(pasteContainer);
|
me.cmpEl.append(pasteContainer);
|
||||||
|
@ -1620,7 +1593,6 @@ define([
|
||||||
me.api.asc_registerCallback('asc_onUpdateThemeIndex', _.bind(onApiUpdateThemeIndex, me));
|
me.api.asc_registerCallback('asc_onUpdateThemeIndex', _.bind(onApiUpdateThemeIndex, me));
|
||||||
me.api.asc_registerCallback('asc_onLockDocumentTheme', _.bind(onApiLockDocumentTheme, me));
|
me.api.asc_registerCallback('asc_onLockDocumentTheme', _.bind(onApiLockDocumentTheme, me));
|
||||||
me.api.asc_registerCallback('asc_onUnLockDocumentTheme', _.bind(onApiUnLockDocumentTheme, me));
|
me.api.asc_registerCallback('asc_onUnLockDocumentTheme', _.bind(onApiUnLockDocumentTheme, me));
|
||||||
me.api.asc_registerCallback('asc_onSignatureClick', _.bind(onSignatureClick, me));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return me;
|
return me;
|
||||||
|
@ -3391,7 +3363,8 @@ define([
|
||||||
txtChangeTheme: 'Change Theme',
|
txtChangeTheme: 'Change Theme',
|
||||||
txtKeepTextOnly: 'Keep text only',
|
txtKeepTextOnly: 'Keep text only',
|
||||||
txtPastePicture: 'Picture',
|
txtPastePicture: 'Picture',
|
||||||
txtPasteSourceFormat: 'Keep Source formatting'
|
txtPasteSourceFormat: 'Keep source formatting',
|
||||||
|
txtPasteDestFormat: 'Use destination theme'
|
||||||
|
|
||||||
}, PE.Views.DocumentHolder || {}));
|
}, PE.Views.DocumentHolder || {}));
|
||||||
});
|
});
|
|
@ -856,7 +856,8 @@
|
||||||
"PE.Views.DocumentHolder.vertAlignText": "Vertical Alignment",
|
"PE.Views.DocumentHolder.vertAlignText": "Vertical Alignment",
|
||||||
"PE.Views.DocumentHolder.txtKeepTextOnly": "Keep text only",
|
"PE.Views.DocumentHolder.txtKeepTextOnly": "Keep text only",
|
||||||
"PE.Views.DocumentHolder.txtPastePicture": "Picture",
|
"PE.Views.DocumentHolder.txtPastePicture": "Picture",
|
||||||
"PE.Views.DocumentHolder.txtPasteSourceFormat": "Keep Source formatting",
|
"PE.Views.DocumentHolder.txtPasteSourceFormat": "Keep source formatting",
|
||||||
|
"PE.Views.DocumentHolder.txtPasteDestFormat": "Use destination theme",
|
||||||
"PE.Views.DocumentPreview.goToSlideText": "Go to Slide",
|
"PE.Views.DocumentPreview.goToSlideText": "Go to Slide",
|
||||||
"PE.Views.DocumentPreview.slideIndexText": "Slide {0} of {1}",
|
"PE.Views.DocumentPreview.slideIndexText": "Slide {0} of {1}",
|
||||||
"PE.Views.DocumentPreview.txtClose": "Close slideshow",
|
"PE.Views.DocumentPreview.txtClose": "Close slideshow",
|
||||||
|
|
Loading…
Reference in a new issue