Эх сурвалжийг харах

Remove field to set height to audio in CKEditor plugin - refs BT#12748

Angel Fernando Quiroz Campos 7 жил өмнө
parent
commit
2ad1efe3b2

+ 9 - 35
main/inc/lib/javascript/ckeditor/plugins/audio/dialogs/audio.js

@@ -9,35 +9,18 @@ CKEDITOR.dialog.add('audio', function(editor)
             value = generateId();
         }
 
-        if (this.id !== 'autoplay') {
-            audioNode.setAttribute(this.id, value);
-            
-            switch (this.id) {
-                case 'width':
-                    audioNode.setAttribute('style', 'width:' + value + 'px;');
-                    break;
-                case 'height':
-                    var styleAttr = audioNode.getAttribute('style');
-
-                    audioNode.setAttribute('style', styleAttr + 'height:' + value + 'px;');
-                    break;
-            }
-        } else {
-            if (value === true) {
-                audioNode.setAttribute(this.id, '');
-            }
-        }
-
-        if (!value) {
-            return;
-        }
-
         switch (this.id) {
             case 'width':
+                audioNode.setAttribute('style', 'width:' + value + 'px;');
                 extraStyles.width = value + 'px';
+                //no break
+            case 'id':
+                audioNode.setAttribute(this.id, value);
                 break;
-            case 'height':
-                extraStyles.height = value + 'px';
+            case 'autoplay':
+                if (value === true) {
+                    audioNode.setAttribute('autoplay', '');
+                }
                 break;
         }
     }
@@ -165,7 +148,7 @@ CKEDITOR.dialog.add('audio', function(editor)
                 elements: [
                     {
                         type: 'hbox',
-                        widths: ['33%', '33%', '33%'],
+                        widths: ['20%', '80%'],
                         children: [
                             {
                                 type: 'text',
@@ -176,15 +159,6 @@ CKEDITOR.dialog.add('audio', function(editor)
                                 commit: commitValue,
                                 setup: loadValue
                             },
-                            {
-                                type: 'text',
-                                id: 'height',
-                                label: editor.lang.common.height,
-                                'default': 300,
-                                validate: CKEDITOR.dialog.validate.notEmpty(lang.heightRequired),
-                                commit: commitValue,
-                                setup: loadValue
-                            },
                             {
                                 type: 'text',
                                 id: 'id',

+ 1 - 1
main/inc/lib/javascript/ckeditor/plugins/audio/plugin.js

@@ -118,7 +118,7 @@
                                 }
                             }
 
-                            var fakeElement = editor.createFakeParserElement(realElement, 'cke_video', 'audio', false),
+                            var fakeElement = editor.createFakeParserElement(realElement, 'cke_audio', 'audio', false),
                                     fakeStyle = fakeElement.attributes.style || '';
 
                             var width = realElement.attributes.width,