diff options
Diffstat (limited to 'sources/plugins/image/dialogs/image.js')
| -rw-r--r-- | sources/plugins/image/dialogs/image.js | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/sources/plugins/image/dialogs/image.js b/sources/plugins/image/dialogs/image.js index 4f62f99..5302a7c 100644 --- a/sources/plugins/image/dialogs/image.js +++ b/sources/plugins/image/dialogs/image.js | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /** | 1 | /** |
| 2 | * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved. | 2 | * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved. |
| 3 | * For licensing, see LICENSE.md or http://ckeditor.com/license | 3 | * For licensing, see LICENSE.md or http://ckeditor.com/license |
| 4 | */ | 4 | */ |
| 5 | 5 | ||
| @@ -107,7 +107,7 @@ | |||
| 107 | 107 | ||
| 108 | var oImageOriginal = dialog.originalElement; | 108 | var oImageOriginal = dialog.originalElement; |
| 109 | 109 | ||
| 110 | // Dialog may already closed. (#5505) | 110 | // Dialog may already closed. (http://dev.ckeditor.com/ticket/5505) |
| 111 | if ( !oImageOriginal ) | 111 | if ( !oImageOriginal ) |
| 112 | return null; | 112 | return null; |
| 113 | 113 | ||
| @@ -233,7 +233,7 @@ | |||
| 233 | this.firstLoad = false; | 233 | this.firstLoad = false; |
| 234 | this.dontResetSize = false; | 234 | this.dontResetSize = false; |
| 235 | 235 | ||
| 236 | // Possible fix for #12818. | 236 | // Possible fix for http://dev.ckeditor.com/ticket/12818. |
| 237 | updatePreview( this ); | 237 | updatePreview( this ); |
| 238 | }; | 238 | }; |
| 239 | 239 | ||
| @@ -270,7 +270,7 @@ | |||
| 270 | 270 | ||
| 271 | return { | 271 | return { |
| 272 | title: editor.lang.image[ dialogType == 'image' ? 'title' : 'titleButton' ], | 272 | title: editor.lang.image[ dialogType == 'image' ? 'title' : 'titleButton' ], |
| 273 | minWidth: 420, | 273 | minWidth: ( CKEDITOR.skinName || editor.config.skin ) == 'moono-lisa' ? 500 : 420, |
| 274 | minHeight: 360, | 274 | minHeight: 360, |
| 275 | onShow: function() { | 275 | onShow: function() { |
| 276 | this.imageElement = false; | 276 | this.imageElement = false; |
| @@ -310,7 +310,7 @@ | |||
| 310 | this.linkEditMode = true; | 310 | this.linkEditMode = true; |
| 311 | 311 | ||
| 312 | // If there is an existing link, by default keep it (true). | 312 | // If there is an existing link, by default keep it (true). |
| 313 | // It will be removed if certain conditions are met and Link tab is enabled. (#13351) | 313 | // It will be removed if certain conditions are met and Link tab is enabled. (http://dev.ckeditor.com/ticket/13351) |
| 314 | this.addLink = true; | 314 | this.addLink = true; |
| 315 | 315 | ||
| 316 | // Look for Image element. | 316 | // Look for Image element. |
| @@ -490,6 +490,7 @@ | |||
| 490 | type: 'hbox', | 490 | type: 'hbox', |
| 491 | widths: [ '280px', '110px' ], | 491 | widths: [ '280px', '110px' ], |
| 492 | align: 'right', | 492 | align: 'right', |
| 493 | className: 'cke_dialog_image_url', | ||
| 493 | children: [ { | 494 | children: [ { |
| 494 | id: 'txtUrl', | 495 | id: 'txtUrl', |
| 495 | type: 'text', | 496 | type: 'text', |
| @@ -541,7 +542,7 @@ | |||
| 541 | this.getDialog().dontResetSize = true; | 542 | this.getDialog().dontResetSize = true; |
| 542 | 543 | ||
| 543 | field.setValue( url ); // And call this.onChange() | 544 | field.setValue( url ); // And call this.onChange() |
| 544 | // Manually set the initial value.(#4191) | 545 | // Manually set the initial value.(http://dev.ckeditor.com/ticket/4191) |
| 545 | field.setInitValue(); | 546 | field.setInitValue(); |
| 546 | } | 547 | } |
| 547 | }, | 548 | }, |
| @@ -692,6 +693,7 @@ | |||
| 692 | { | 693 | { |
| 693 | id: 'ratioLock', | 694 | id: 'ratioLock', |
| 694 | type: 'html', | 695 | type: 'html', |
| 696 | className: 'cke_dialog_image_ratiolock', | ||
| 695 | style: 'margin-top:30px;width:40px;height:40px;', | 697 | style: 'margin-top:30px;width:40px;height:40px;', |
| 696 | onLoad: function() { | 698 | onLoad: function() { |
| 697 | // Activate Reset button | 699 | // Activate Reset button |
| @@ -1014,6 +1016,7 @@ | |||
| 1014 | { | 1016 | { |
| 1015 | type: 'button', | 1017 | type: 'button', |
| 1016 | id: 'browse', | 1018 | id: 'browse', |
| 1019 | className: 'cke_dialog_image_browse', | ||
| 1017 | filebrowser: { | 1020 | filebrowser: { |
| 1018 | action: 'Browse', | 1021 | action: 'Browse', |
| 1019 | target: 'Link:txtUrl', | 1022 | target: 'Link:txtUrl', |