← Back to branch summary

~canonical-sysadmins/wordpress/4.8.3

« back to all changes in this revision

Viewing changes to wp-includes/js/tinymce/plugins/image/plugin.js

  • Committer: Ryan Finnie
  • Date: 2015-08-31 16:09:47 UTC
  • mfrom: (1.1.9 upstream)
  • Revision ID: ryan.finnie@canonical.com-20150831160947-1h6rfxby9z1ec62u
Merge WP4.3 from upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
wp-includes/js/tinymce/plugins/image/plugin.js
1
1
/**
2
2
 * plugin.js
3
3
 *
4
 
 * Copyright, Moxiecode Systems AB
5
4
 * Released under LGPL License.
 
5
 * Copyright (c) 1999-2015 Ephox Corp. All rights reserved
6
6
 *
7
7
 * License: http://www.tinymce.com/license
8
8
 * Contributing: http://www.tinymce.com/contributing
23
23
                }
24
24
 
25
25
                img.onload = function() {
26
 
                        done(img.clientWidth, img.clientHeight);
 
26
                        done(Math.max(img.width, img.clientWidth), Math.max(img.height, img.clientHeight));
27
27
                };
28
28
 
29
29
                img.onerror = function() {
308
308
                                        win.find('#src').value(e.control.value()).fire('change');
309
309
                                },
310
310
                                onPostRender: function() {
 
311
                                        /*eslint consistent-this: 0*/
311
312
                                        imageListCtrl = this;
312
313
                                }
313
314
                        };