ENHANCEMENT: File/Image UI fixes #468

Closed
wants to merge 2 commits into
from

Conversation

Projects
None yet
3 participants
Contributor

adrexia commented May 19, 2012

  • Replaced cancel/delete button in files area
  • Consolidated Image upload styles with AssetUpload styles
  • Changed name of step 2 in image upload
  • Made image editing hidden by default, so multiple files can be seen,
    and added ability top open and close
  • Tweaked styles in on page upload field (status colour and file name
    width)
  • Design fixes in insert media pop-up

@chillu chillu and 1 other commented on an outdated diff May 20, 2012

javascript/HtmlEditorField.js
},
toggleCloseButton: function(){
var updateExisting = Boolean(this.find('.ss-htmleditorfield-file').length);
this.find('.overview .action-delete')[updateExisting ? 'hide' : 'show']();
},
onsubmit: function() {
- var self = this, ed = this.getEditor();
+ var textarea = this.closest('.cms').find('.cms-container').find('textarea.htmleditor');
@chillu

chillu May 20, 2012

Owner

That'll break if more than one editor is used. I guess you tried to fix the "call method on null" error? Needs to be excluded from merge, I've fixed that differently in master.

@adrexia

adrexia May 21, 2012

Contributor

Reverted

@chillu chillu and 1 other commented on an outdated diff May 20, 2012

javascript/HtmlEditorField.js
@@ -686,7 +687,8 @@ ss.editorWrappers['default'] = ss.editorWrappers.tinyMCE;
return false;
},
updateFromEditor: function() {
- var self = this, ed = this.getEditor(), node = $(ed.getSelectedNode());
+ var textarea = this.closest('.cms').find('.cms-container').find('textarea.htmleditor');
@chillu

chillu May 20, 2012

Owner

Same here, please exclude from merge

@adrexia

adrexia May 21, 2012

Contributor

Reverted

Owner

chillu commented May 20, 2012

Hey Naomi, that's a lot of changes, and in the past both of us tended to break as much in UploadField as we tried to fix ;) How well have you tested this in the three different upload combinations? 1. admin/assets/add 2. "insert image" 3. "upload file" on its own on page edit form (e.g. through frameworktest module)

Have you tried editing files, expanding the form, loading multiple files, and all of that in at least one version of IE7 or IE8?

Contributor

adrexia commented May 21, 2012

I've just run a bunch of tests. It seems to pass them. I've removed the null object fix, and merged with the recent changes.

Works fine in IE7 and 8. We don't support uploading multiple fles in IE7 or 8 though (because the browsers don't support it). One after another works.

adrexia added some commits May 22, 2012

@adrexia adrexia ENHANCEMENT: File/Image UI fixes
* Replaced cancel/delete button in files area
* Consolidated Image upload styles with AssetUpload styles
* Changed name of step 2 in image upload
* Made image editing hidden by default, so multiple files can be seen,
and added ability top open and close
* Tweaked styles in on page upload field (status colour and file name
width)
14ad753
@adrexia adrexia ENHANCEMENT: Design fixes in insert media pop-up
* Apply design to insert media/image pop-up
39e50bf
Owner

sminnee commented May 27, 2012

I'm going to merge this.

Owner

sminnee commented May 27, 2012

Rebased, tested, and merged.

sminnee closed this May 27, 2012

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment