Merge pull request #34983 from code-dot-org/phantom-object-fit-images

Remove object-fit-images PhantomJS stub file
code-dot-org · Jun 8, 2020 · ce04407 · ce04407
2 parents 4c4f90e + 85e7d32
commit ce04407
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 21 deletions.
diff --git a/apps/src/applab/applabObjectFitImages.js b/apps/src/applab/applabObjectFitImages.js
diff --git a/apps/src/applab/designElements/image.jsx b/apps/src/applab/designElements/image.jsx
@@ -1,6 +1,7 @@
 import $ from 'jquery';
 import PropTypes from 'prop-types';
 import React from 'react';
+import objectFitImages from 'object-fit-images';
 import PropertyRow from './PropertyRow';
 import ColorPickerPropertyRow from './ColorPickerPropertyRow';
 import BooleanPropertyRow from './BooleanPropertyRow';
@@ -12,7 +13,6 @@ import {ICON_PREFIX_REGEX} from '../constants';
 import EnumPropertyRow from './EnumPropertyRow';
 import BorderProperties from './BorderProperties';
 import * as elementUtils from './elementUtils';
-import {applabObjectFitImages} from '../applabObjectFitImages';
 
 class ImageProperties extends React.Component {
   static propTypes = {
@@ -179,12 +179,10 @@ function setObjectFitStyles(element, value, forceObjectFitNow) {
   // Set a style that will be picked up by objectFitImages() for old browsers:
   element.style.fontFamily = `'object-fit: ${value};'`;
   if (forceObjectFitNow) {
-    //
     // Enable polyfill for this element so we can use object-fit (it relies on
     // the style in font-family and avoid scale-down & using it in media queries)
     // See https://www.npmjs.com/package/object-fit-images for details.
-    //
-    applabObjectFitImages(element);
+    objectFitImages(element);
   }
 }
 

diff --git a/apps/src/applab/designMode.js b/apps/src/applab/designMode.js
@@ -8,6 +8,7 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import {Provider} from 'react-redux';
 import RGBColor from 'rgbcolor';
+import objectFitImages from 'object-fit-images';
 import DesignWorkspace from './DesignWorkspace';
 import * as assetPrefix from '../assetManagement/assetPrefix';
 import elementLibrary from './designElements/library';
@@ -22,7 +23,6 @@ import logToCloud from '../logToCloud';
 import {actions} from './redux/applab';
 import * as screens from './redux/screens';
 import {getStore} from '../redux';
-import {applabObjectFitImages} from './applabObjectFitImages';
 import firehoseClient from '../lib/util/firehose';
 import project from '../code-studio/initApp/project';
 
@@ -1377,9 +1377,7 @@ function makeDraggable(jqueryElements) {
 
     elm.css('position', 'static');
   });
-  setTimeout(() => {
-    applabObjectFitImages();
-  }, 0);
+  setTimeout(() => objectFitImages(), 0);
 }
 
 /**