собираем lor.js через google closure

+ тест более новых конструкций js
maxcom · Jan 2, 2025 · 4dd3103 · 4dd3103
1 parent f0a4529
commit 4dd3103
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 26 deletions.
diff --git a/pom.xml b/pom.xml
@@ -599,6 +599,7 @@
           <excludes>
             <exclude>**/jquery-ui-*/**/*.js</exclude>
             <exclude>**/highlight.min.js</exclude>
+            <exclude>**/lor.js</exclude>
           </excludes>
           <aggregations>
             <aggregation>
@@ -702,6 +703,31 @@
         </configuration>
       </plugin>
 
+      <plugin>
+        <groupId>com.github.blutorange</groupId>
+        <artifactId>closure-compiler-maven-plugin</artifactId>
+        <version>2.31.0</version>
+        <executions>
+          <execution>
+            <id>default-minify</id>
+            <configuration>
+              <encoding>UTF-8</encoding>
+              <includes>
+                <include>lor.js</include>
+              </includes>
+              <skipMerge>true</skipMerge>
+              <logLevel>all</logLevel>
+              <closureLanguageOut>ECMASCRIPT_2016</closureLanguageOut>
+              <outputFilename>#{path}/#{basename}.#{extension}</outputFilename>
+            </configuration>
+            <goals>
+              <goal>minify</goal>
+            </goals>
+            <phase>generate-resources</phase>
+          </execution>
+        </executions>
+      </plugin>
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-antrun-plugin</artifactId>

diff --git a/src/main/webapp/js/lor.js b/src/main/webapp/js/lor.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 1998-2024 Linux.org.ru
+ * Copyright 1998-2025 Linux.org.ru
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
  *    You may obtain a copy of the License at
@@ -66,39 +66,36 @@ function initStarPopovers() {
 
 function init_interpage_adv(ads) {
     $(function() {
-        var ad = ads[Math.floor(Math.random() * ads.length)];
+      const img = $('<img>');
+      const anchor = $('<a>');
+      const ad = ads[Math.floor(Math.random() * ads.length)];
 
-        if (ad.type==='img') {
-            var anchor = $('<a>');
-            anchor.attr('href', ad.href);
-            anchor.attr('target', '_blank');
-
-            var img = $('<img>');
-            img.attr('src', ad.src);
-            if ('width' in ad) {
-                img.attr('width', ad.width);
-            } else {
-                img.attr('width', 728);
-            }
+      if (ad.type === 'img') {
+        anchor.attr('href', ad.href);
+        anchor.attr('target', '_blank');
 
-            if ('height' in ad) {
-                img.attr('height', ad.height);
-            } else {
-                img.attr('height', 90);
-            }
+        img.attr('src', ad.src);
+        if ('width' in ad) {
+          img.attr('width', ad.width);
+        } else {
+          img.attr('width', 728);
+        }
 
-            anchor.append(img);
-            $('#interpage').append(anchor);
+        if ('height' in ad) {
+          img.attr('height', ad.height);
+        } else {
+          img.attr('height', 90);
         }
 
+        anchor.append(img);
+        $('#interpage').append(anchor);
+      }
+
       if (ad.type === 'rimg') {
-        var anchor = $('<a>');
         anchor.attr('href', ad.href);
         anchor.attr('target', '_blank');
 
-        var img = $('<img>');
-
-        var interpage = $('#interpage')
+        const interpage = $('#interpage');
 
         if (interpage.width() > 1024) {
           // img.attr('width', 728);
@@ -117,7 +114,7 @@ function init_interpage_adv(ads) {
         }
 
         anchor.append(img);
-        $('#interpage').append(anchor);
+        interpage.append(anchor);
       }
     });
 }