more things

This commit is contained in:
Jake Potrebic 2020-09-23 19:50:12 -07:00 committed by MiniDigger
parent d86d0a3c82
commit 4db1211a30
10 changed files with 40 additions and 28 deletions

View File

@ -1,5 +1,5 @@
module.exports = {
plugins: {
'autoprefixer': true
}
}
plugins: {
autoprefixer: true
}
};

View File

@ -1,4 +1,5 @@
import $ from "jquery";
import "bootstrap/js/dist/modal"
import diff_match_patch from "diff-match-patch";
//=====> DOCUMENT READY

View File

@ -1,4 +1,5 @@
import $ from "jquery";
import "bootstrap/js/dist/modal"
import {toggleSpinner} from "@/utils";
//=====> CONSTANTS

View File

@ -2,7 +2,7 @@ import $ from "jquery";
import ClipboardJS from "clipboard";
import hljs from "highlight.js";
import {initTooltips, scrollToAnchor, toggleSpinner} from "@/utils";
import "webpack-jquery-ui/tooltip";
import "bootstrap/js/dist/tooltip"
//=====> CONSTANTS
@ -14,7 +14,7 @@ clipboardManager.on("success", function() {
.tooltip({ title: "Copied!", placement: "bottom", trigger: "manual" })
.tooltip("show");
setTimeout(function() {
element.tooltip("destroy");
element.tooltip("dispose");
}, 2200);
});

View File

@ -1,4 +1,5 @@
import $ from "jquery";
import "bootstrap/js/dist/tooltip"
import filesize from "filesize";
//=====> CONSTANTS
@ -79,7 +80,7 @@ function reset() {
bs.find("[data-fa-i2svg]")
.removeClass("fa-exclamation-circle")
.addClass("fa-file-archive")
.tooltip("destroy");
.tooltip("dispose");
}
return alert;
}
@ -143,7 +144,7 @@ $(function() {
var newTitle = "Upload plugin";
button
.tooltip("option", "hide", false)
.tooltip("hide")
.data("original-title", newTitle)
.tooltip();
}

View File

@ -1,4 +1,5 @@
import $ from "jquery";
import "bootstrap/js/dist/modal"
import {initChannelManager} from "@/js/channelManage";
//=====> EXTERNAL CONSTANTS

View File

@ -90,4 +90,4 @@ export const scrollToAnchor = function(anchor) {
return true;
};
export const KEY_ENTER = 13;
export const KEY_ENTER = 13;

View File

@ -1,7 +1,6 @@
const path = require("path");
const fs = require("fs");
const MiniCssExtractPlugin = require('mini-css-extract-plugin');
const autoprefixer = require('autoprefixer')
const MiniCssExtractPlugin = require("mini-css-extract-plugin");
const sourceDir = path.resolve(__dirname, "src");
const entryDir = path.resolve(sourceDir, "entrypoints");
@ -33,23 +32,33 @@ module.exports = {
config.entry(file.replace(".js", "")).add(path.resolve(jsDir, file));
}
config.module.rules.delete('css')
config.module.rules.delete('scss')
config.module.rules.delete("css");
config.module.rules.delete("scss");
config.plugin('mini-css-extract').use(MiniCssExtractPlugin, [{filename: 'css/[name].css'}])
config
.plugin("mini-css-extract")
.use(MiniCssExtractPlugin, [{ filename: "css/[name].css" }]);
config.module.rule('css')
.test(/\.(s?)css$/i)
.use('mini-css-extract')
.loader(MiniCssExtractPlugin.loader)
.options({
hmr: process.env.NODE_ENV === 'development',
reloadAll: true,
publicPath: '/css/'
}).end()
.use('css-loader').loader('css-loader').end()
.use('postcss-loader').loader('postcss-loader').end()
.use('sass-loader').loader('sass-loader').end()
config.module
.rule("css")
.test(/\.(s?)css$/i)
.use("mini-css-extract")
.loader(MiniCssExtractPlugin.loader)
.options({
hmr: process.env.NODE_ENV === "development",
reloadAll: true,
publicPath: "/css/"
})
.end()
.use("css-loader")
.loader("css-loader")
.end()
.use("postcss-loader")
.loader("postcss-loader")
.end()
.use("sass-loader")
.loader("sass-loader")
.end();
},
outputDir: outputDir,

View File

@ -122,7 +122,7 @@ showFooter: Boolean = true, noContainer: Boolean = false, additionalMeta: Html =
<#-- <script type="text/javascript" src="<@hangar.url "lib/clipboard/dist/clipboard.min.js" />"></script>-->
<#-- <script type="text/javascript" src="<@hangar.url "highlight/highlight.pack.js" />"></script>-->
<#-- <script type="text/javascript" src="<@hangar.url "jquery-ui/jquery-ui.min.js" />"></script>-->
<#-- <script type="text/javascript" src="<@hangar.url "build/js/main.js" />"></script>-->
<script type="text/javascript" src="<@hangar.url "build/js/main.js" />"></script>
<#-- <script type="text/javascript" src="<@hangar.url "build/js/apiRequests.js" />"></script>-->
${additionalScripts}

View File

@ -3,7 +3,6 @@
<#import "*/layout/base.ftlh" as base />
<#assign scriptsVar>
<script type="text/javascript" src="<@hangar.url "diff-match-patch/javascript/diff_match_patch.js" />"></script>
<script type="text/javascript" src="<@hangar.url "build/js/actionLog.js" />"></script>
</#assign>