Pārlūkot izejas kodu

style: sider issues

version-14
Faris Ansari pirms 4 gadiem
vecāks
revīzija
fa236fd9c5
7 mainītis faili ar 12 papildinājumiem un 12 dzēšanām
  1. +2
    -2
      esbuild/esbuild.js
  2. +3
    -3
      esbuild/utils.js
  3. +1
    -1
      frappe/printing/page/print/print.js
  4. +1
    -1
      frappe/printing/page/print_format_builder/print_format_builder.js
  5. +1
    -1
      frappe/public/js/frappe/utils/common.js
  6. +2
    -2
      frappe/public/js/frappe/utils/utils.js
  7. +2
    -2
      frappe/public/js/libs.bundle.js

+ 2
- 2
esbuild/esbuild.js Parādīt failu

@@ -367,8 +367,8 @@ function run_build_command_for_apps(apps) {
let root_app_path = path.resolve(get_app_path(app), "..");
let package_json = path.resolve(root_app_path, "package.json");
if (fs.existsSync(package_json)) {
let package = require(package_json);
if (package.scripts && package.scripts.build) {
let { scripts } = require(package_json);
if (scripts && scripts.build) {
log("\nRunning build command for", chalk.bold(app));
process.chdir(root_app_path);
execSync("yarn build", { encoding: "utf8", stdio: "inherit" });


+ 3
- 3
esbuild/utils.js Parādīt failu

@@ -98,16 +98,16 @@ function get_cli_arg(name) {

function log_error(message, badge = "ERROR") {
badge = chalk.white.bgRed(` ${badge} `);
console.error(`${badge} ${message}`);
console.error(`${badge} ${message}`); // eslint-disable-line no-console
}

function log_warn(message, badge = "WARN") {
badge = chalk.black.bgYellowBright(` ${badge} `);
console.warn(`${badge} ${message}`);
console.warn(`${badge} ${message}`); // eslint-disable-line no-console
}

function log(...args) {
console.log(...args);
console.log(...args); // eslint-disable-line no-console
}

module.exports = {


+ 1
- 1
frappe/printing/page/print/print.js Parādīt failu

@@ -408,7 +408,7 @@ frappe.ui.form.PrintView = class {

setup_print_format_dom(out, $print_format) {
this.print_wrapper.find('.print-format-skeleton').remove();
let base_url = frappe.urllib.get_base_url()
let base_url = frappe.urllib.get_base_url();
let print_css = frappe.assets.bundled_asset('print.bundle.css');
this.$print_format_body.find('head').html(
`<style type="text/css">${out.style}</style>


+ 1
- 1
frappe/printing/page/print_format_builder/print_format_builder.js Parādīt failu

@@ -177,7 +177,7 @@ frappe.PrintFormatBuilder = class PrintFormatBuilder {
fieldtype: "Custom HTML",
fieldname: "_custom_html",
label: __("Custom HTML")
}
};
}
render_layout() {
this.page.main.empty();


+ 1
- 1
frappe/public/js/frappe/utils/common.js Parādīt failu

@@ -1,5 +1,5 @@
// common file between desk and website
import md5 from 'md5'
import md5 from 'md5';

frappe.avatar = function (user, css_class, title, image_url=null, remove_color=false, filterable=false) {
let user_info;


+ 2
- 2
frappe/public/js/frappe/utils/utils.js Parādīt failu

@@ -965,8 +965,8 @@ Object.assign(frappe.utils, {
let expression_function = new Function(...variable_names, code);
return expression_function(...variables);
} catch (error) {
console.log('Error evaluating the following expression:');
console.error(code);
console.log('Error evaluating the following expression:'); // eslint-disable-line no-console
console.error(code); // eslint-disable-line no-console
throw error;
}
},


+ 2
- 2
frappe/public/js/libs.bundle.js Parādīt failu

@@ -8,8 +8,8 @@ import Sortable from "./lib/Sortable.min.js";
// Don't think jquery.hotkeys is being used anywhere. Will remove this after being sure.
// import "./lib/jquery/jquery.hotkeys.js";

window.moment = moment;
window.moment = momentTimezone;
window.Vue = Vue;
window.Sortable = Sortable;
window.io = io
window.io = io;

Notiek ielāde…
Atcelt
Saglabāt