Merge pull request craftcms#10179 from craftcms/ts-fixes

Typescript fixes
michaelrog · Nov 29, 2021 · 3e705f7 · 3e705f7
2 parents 6e41392 + 4b08913
commit 3e705f7
Show file tree

Hide file tree

Showing 23 changed files with 41 additions and 687 deletions.
diff --git a/src/templates/_components/utilities/AssetIndexes.twig b/src/templates/_components/utilities/AssetIndexes.twig
@@ -56,8 +56,7 @@
         indexingSessions.push(data);
     {% endfor %}
 
-    Craft.AssetIndexer = new AssetIndexer($('#indexing-sessions'), indexingSessions);
-
+    const assetIndexer = new Craft.AssetIndexer($('#indexing-sessions'), indexingSessions);
     $('form#asset-indexes').on('submit', function (ev) {
         const anyVolumesSelected = $('input[name="volumes[]"]').is(':checked') || $('input[name="volumes"]').is(':checked');
         if (!anyVolumesSelected) {
@@ -78,7 +77,7 @@
 
         $submitButton.addClass('disabled').after('<div class="spinner"></div>');
 
-        Craft.AssetIndexer.startIndexing(data, () => {
+        assetIndexer.startIndexing(data, () => {
             $('form#asset-indexes .spinner').remove();
             $submitButton.removeClass('disabled')
         });

diff --git a/src/templates/assets/_previews/image.twig b/src/templates/assets/_previews/image.twig
@@ -22,7 +22,7 @@
 ]) %}
 
 {% js %}
-Craft.focalPoint = new FocalPoint(Craft.PreviewFileModal.openInstance.$container.find('.asset-image-preview'), $('#toggle-focal'), {{ editFocal|default(false) }});
+const focalPoint = new Craft.FocalPoint(Craft.PreviewFileModal.openInstance.$container.find('.asset-image-preview'), $('#toggle-focal'), {{ editFocal|default(false) }});
 
 function resizePreviewImage() {
     var instance = Craft.PreviewFileModal.openInstance;
@@ -74,7 +74,7 @@ function resizePreviewImage() {
 
         instance._resizeContainer(containerWidth, containerHeight);
         $img.css({'width': containerWidth, 'height': containerHeight});
-        Craft.focalPoint.renderFocal();
+        focalPoint.renderFocal();
     }
 }
 {% endjs %}
diff --git a/src/web/assets/admintable/dist/css/app.css b/src/web/assets/admintable/dist/css/app.css
diff --git a/src/web/assets/admintable/dist/css/app.css.map b/src/web/assets/admintable/dist/css/app.css.map
diff --git a/src/web/assets/admintable/dist/js/app.js b/src/web/assets/admintable/dist/js/app.js
diff --git a/src/web/assets/admintable/dist/js/app.js.LICENSE.txt b/src/web/assets/admintable/dist/js/app.js.LICENSE.txt
@@ -8,7 +8,7 @@
  */
 
 /**!
- * Sortable 1.13.0
+ * Sortable 1.14.0
  * @author	RubaXa   <[email protected]>
  * @author	owenm    <[email protected]>
  * @license MIT

diff --git a/src/web/assets/admintable/dist/js/app.js.map b/src/web/assets/admintable/dist/js/app.js.map
diff --git a/src/web/assets/admintable/dist/manifest.json b/src/web/assets/admintable/dist/manifest.json
@@ -1 +1 @@
-{"app.css":"/css/app.css","app.js":"/js/app.js","app.js.map":"/js/app.js.map"}
+{"app.css":"/css/app.css","app.js":"/js/app.js","app.css.map":"/css/app.css.map","app.js.map":"/js/app.js.map"}
diff --git a/src/web/assets/assetindexes/AssetIndexesAsset.php b/src/web/assets/assetindexes/AssetIndexesAsset.php
@@ -31,6 +31,6 @@ class AssetIndexesAsset extends AssetBundle
      * @inheritdoc
      */
     public $js = [
-        'AssetIndexer.min.js',
+        'AssetIndexer.js',
     ];
 }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"app.css":"/css/app.css","app.js":"/js/app.js","app.js.map":"/js/app.js.map"}
		{"app.css":"/css/app.css","app.js":"/js/app.js","app.css.map":"/css/app.css.map","app.js.map":"/js/app.js.map"}