remove mentions of deprecated.js

diff --git a/include/functions.php b/include/functions.php
index 0fd8ef61ac05a9cfd82e75b4f9f2d2ca61834a0a..02d0416f8e863fe462cf76f42854eec11aa785cc 100644 (file)
--- a/include/functions.php
+++ b/include/functions.php
@@ -2349,9 +2349,9 @@
 
                foreach ($files as $js) {
                        if (!isset($_GET['debug'])) {
-                               $cached_file = CACHE_DIR . "/js/".basename($js).".js";
+                               $cached_file = CACHE_DIR . "/js/".basename($js);
 
-                               if (file_exists($cached_file) && is_readable($cached_file) && filemtime($cached_file) >= filemtime("js/$js.js")) {
+                               if (file_exists($cached_file) && is_readable($cached_file) && filemtime($cached_file) >= filemtime("js/$js")) {
 
                                        list($header, $contents) = explode("\n", file_get_contents($cached_file), 2);
 
@@ -2365,12 +2365,12 @@
                                        }
                                }
 
-                               $minified = JShrink\Minifier::minify(file_get_contents("js/$js.js"));
+                               $minified = JShrink\Minifier::minify(file_get_contents("js/$js"));
                                file_put_contents($cached_file, "tt-rss:" . VERSION . "\n" . $minified);
                                $rv .= $minified;
 
                        } else {
-                               $rv .= file_get_contents("js/$js.js"); // no cache in debug mode
+                               $rv .= file_get_contents("js/$js"); // no cache in debug mode
                        }
                }
 

diff --git a/index.php b/index.php
index daa532aa23dfd5a35f60cfe289afa562aaf78b18..a1bcd5643570549dbcf34ee1d8dff41f8541b609 100644 (file)
--- a/index.php
+++ b/index.php
@@ -114,8 +114,8 @@
        <?php
                require_once 'lib/jshrink/Minifier.php';
 
-               print get_minified_js(array("tt-rss",
-                       "functions", "feedlist", "viewfeed", "PluginHost"));
+               print get_minified_js(["tt-rss.js",
+                       "functions.js", "feedlist.js", "viewfeed.js", "PluginHost.js"]);
 
                foreach (PluginHost::getInstance()->get_plugins() as $n => $p) {
                        if (method_exists($p, "get_js")) {

diff --git a/prefs.php b/prefs.php
index a0fe93b15ef868d665cb1ddd66a98afe938d36ab..bffd5cdf5c526bf025ea595202a8cb82e54d91df 100644 (file)
--- a/prefs.php
+++ b/prefs.php
@@ -92,7 +92,7 @@
                        }
                }
 
-               print get_minified_js(array("functions", "deprecated", "prefs"));
+               print get_minified_js(["functions.js", "prefs.js"]);
 
                init_js_translations();
        ?>