tonyair
/
silverstripe-framework
mirror of https://github.com/silverstripe/silverstripe-framework
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove .show() as not compatible with Flex 

Removed .show() as it uses display: block rather than display: flex
This commit is contained in:
Paul Clarke 2016-09-02 16:41:26 +12:00
parent c3f4d0cf0b
commit cfee2022ba
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
client/dist/js/HtmlEditorField.js vendored
View File

@ -368,23 +368,23 @@
this.resetFileField();
this.find('.step2').nextAll('.field').not('.field[id$="' + linkType + '_Holder"]').hide();
this.find('.field[id$="LinkType_Holder"]').show();
this.find('.field[id$="' + linkType + '_Holder"]').show();
this.find('.field[id$="LinkType_Holder"]').attr('style', 'display: -webkit-flex; display: flex');
this.find('.field[id$="' + linkType + '_Holder"]').attr('style', 'display: -webkit-flex; display: flex');
if (linkType == 'internal' || linkType == 'anchor') {
this.find('.field[id$="Anchor_Holder"]').show();
this.find('.field[id$="Anchor_Holder"]').attr('style', 'display: -webkit-flex; display: flex');
}
if (linkType == 'email') {
this.find('.field[id$="Subject_Holder"]').show();
this.find('.field[id$="Subject_Holder"]').attr('style', 'display: -webkit-flex; display: flex');
} else {
this.find('.field[id$="TargetBlank_Holder"]').show();
this.find('.field[id$="TargetBlank_Holder"]').attr('style', 'display: -webkit-flex; display: flex');
}
if (linkType == 'anchor') {
this.find('.field[id$="AnchorSelector_Holder"]').show();
this.find('.field[id$="AnchorSelector_Holder"]').attr('style', 'display: -webkit-flex; display: flex');
}
this.find('.field[id$="Description_Holder"]').show();
this.find('.field[id$="Description_Holder"]').attr('style', 'display: -webkit-flex; display: flex');
},
getLinkAttributes: function getLinkAttributes() {

14
client/src/legacy/HtmlEditorField.js
View File

@ -533,23 +533,23 @@ $.entwine('ss', function($) {
// Toggle field visibility depending on the link type.
this.find('.step2').nextAll('.field').not('.field[id$="' + linkType +'_Holder"]').hide();
this.find('.field[id$="LinkType_Holder"]').show();
this.find('.field[id$="' + linkType +'_Holder"]').show();
this.find('.field[id$="LinkType_Holder"]').attr('style', 'display: -webkit-flex; display: flex');
this.find('.field[id$="' + linkType +'_Holder"]').attr('style', 'display: -webkit-flex; display: flex');
if(linkType == 'internal' || linkType == 'anchor') {
this.find('.field[id$="Anchor_Holder"]').show();
this.find('.field[id$="Anchor_Holder"]').attr('style', 'display: -webkit-flex; display: flex');
}
if(linkType == 'email') {
this.find('.field[id$="Subject_Holder"]').show();
this.find('.field[id$="Subject_Holder"]').attr('style', 'display: -webkit-flex; display: flex');
} else {
this.find('.field[id$="TargetBlank_Holder"]').show();
this.find('.field[id$="TargetBlank_Holder"]').attr('style', 'display: -webkit-flex; display: flex');
}
if(linkType == 'anchor') {
this.find('.field[id$="AnchorSelector_Holder"]').show();
this.find('.field[id$="AnchorSelector_Holder"]').attr('style', 'display: -webkit-flex; display: flex');
}
this.find('.field[id$="Description_Holder"]').show();
this.find('.field[id$="Description_Holder"]').attr('style', 'display: -webkit-flex; display: flex');
},
/**
* @return Object Keys: 'href', 'target', 'title'