Преглед на файлове

Merge pull request #6402 from netchampfaris/marketplace-fixes

Marketplace fixes
version-14
Faris Ansari преди 6 години
committed by GitHub
родител
ревизия
6beac087db
No known key found for this signature in database GPG ключ ID: 4AEE18F83AFDEB23
променени са 3 файла, в които са добавени 8 реда и са изтрити 3 реда
  1. +1
    -1
      frappe/public/js/frappe/list/list_view.js
  2. +6
    -2
      frappe/public/js/frappe/router.js
  3. +1
    -0
      frappe/public/js/frappe/views/image/image_view.js

+ 1
- 1
frappe/public/js/frappe/list/list_view.js Целия файл

@@ -694,7 +694,7 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
}

setup_list_click() {
this.$result.on('click', '.list-row', (e) => {
this.$result.on('click', '.list-row, .image-view-header', (e) => {
const $target = $(e.target);
// tick checkbox if Ctrl/Meta key is pressed
if (e.ctrlKey || e.metaKey && !$target.is('a')) {


+ 6
- 2
frappe/public/js/frappe/router.js Целия файл

@@ -4,6 +4,7 @@
// route urls to their virtual pages

// re-route map (for rename)
frappe.provide('frappe.views');
frappe.re_route = {"#login": ""};
frappe.route_titles = {};
frappe.route_flags = {};
@@ -53,7 +54,9 @@ frappe.route = function() {
} else {
// show page
const route_name = frappe.utils.xss_sanitise(route[0]);
frappe.views.pageview.show(route_name);
if (frappe.views.pageview) {
frappe.views.pageview.show(route_name);
}
}


@@ -150,9 +153,10 @@ frappe.set_route = function() {
window.location.hash = route;

// Set favicon (app.js)
frappe.provide('frappe.app');
frappe.app.set_favicon && frappe.app.set_favicon();
setTimeout(() => {
frappe.after_ajax(() => {
frappe.after_ajax && frappe.after_ajax(() => {
resolve();
});
}, 100);


+ 1
- 0
frappe/public/js/frappe/views/image/image_view.js Целия файл

@@ -15,6 +15,7 @@ frappe.views.ImageView = class ImageView extends frappe.views.ListView {

setup_view() {
this.setup_columns();
this.setup_check_events();
}

set_fields() {


Зареждане…
Отказ
Запис