From 9ea598070e9a8f25f7c5664c360f03ae854ed3b7 Mon Sep 17 00:00:00 2001 From: Hadi Nategh Date: Thu, 10 Jun 2021 15:52:00 +0200 Subject: [PATCH] Get vfs and expose working --- api/js/etemplate/et2_widget_vfs.js | 3 +++ api/js/etemplate/et2_widget_vfs.ts | 3 +++ api/js/etemplate/expose.js | 1 + api/js/etemplate/expose.ts | 2 +- api/js/jquery/jquery.noconflict.js | 1 + 5 files changed, 9 insertions(+), 1 deletion(-) diff --git a/api/js/etemplate/et2_widget_vfs.js b/api/js/etemplate/et2_widget_vfs.js index dd9ab1d6d5..511532bec1 100644 --- a/api/js/etemplate/et2_widget_vfs.js +++ b/api/js/etemplate/et2_widget_vfs.js @@ -30,6 +30,9 @@ import { et2_inputWidget } from "./et2_core_inputWidget"; import { et2_no_init } from "./et2_core_common"; import { egw, egw_get_file_editor_prefered_mimes } from "../jsapi/egw_global"; import { expose } from "./expose"; +import { egw_getAppObjectManager } from "../egw_action/egw_action.js"; +import { EGW_KEY_ENTER, egw_keyHandler } from '../egw_action/egw_keymanager.js'; +import { etemplate2 } from "./etemplate2"; /** * Class which implements the "vfs" XET-Tag * diff --git a/api/js/etemplate/et2_widget_vfs.ts b/api/js/etemplate/et2_widget_vfs.ts index a580872c85..28037b7cfe 100644 --- a/api/js/etemplate/et2_widget_vfs.ts +++ b/api/js/etemplate/et2_widget_vfs.ts @@ -32,6 +32,9 @@ import {et2_IDetachedDOM, et2_IExposable} from "./et2_core_interfaces"; import {et2_no_init} from "./et2_core_common"; import {egw, egw_get_file_editor_prefered_mimes} from "../jsapi/egw_global"; import {expose} from "./expose"; +import {egw_getAppObjectManager, egwActionObject} from "../egw_action/egw_action.js"; +import {EGW_KEY_ENTER, egw_keyHandler} from '../egw_action/egw_keymanager.js'; +import {etemplate2} from "./etemplate2"; /** * Class which implements the "vfs" XET-Tag diff --git a/api/js/etemplate/expose.js b/api/js/etemplate/expose.js index 77025364fc..8a977c92d8 100644 --- a/api/js/etemplate/expose.js +++ b/api/js/etemplate/expose.js @@ -15,6 +15,7 @@ import { et2_createWidget } from "./et2_core_widget"; import { et2_dialog } from "./et2_widget_dialog"; import { egw, egw_get_file_editor_prefered_mimes } from "../jsapi/egw_global"; +import { et2_nextmatch } from "./et2_extension_nextmatch"; import { ET2_DATAVIEW_STEPSIZE } from "./et2_dataview_controller"; /** * This function extends the given widget with blueimp gallery plugin diff --git a/api/js/etemplate/expose.ts b/api/js/etemplate/expose.ts index 8ee27b4b53..b0434aa412 100644 --- a/api/js/etemplate/expose.ts +++ b/api/js/etemplate/expose.ts @@ -19,7 +19,7 @@ import {et2_createWidget} from "./et2_core_widget"; import {et2_dialog} from "./et2_widget_dialog"; import {egw, egw_get_file_editor_prefered_mimes} from "../jsapi/egw_global"; -import type {et2_nextmatch} from "./et2_extension_nextmatch"; +import {et2_nextmatch} from "./et2_extension_nextmatch"; import {ET2_DATAVIEW_STEPSIZE} from "./et2_dataview_controller"; type Constructor = new (...args: any[]) => T; diff --git a/api/js/jquery/jquery.noconflict.js b/api/js/jquery/jquery.noconflict.js index b3c8a763ef..6a5a691bad 100644 --- a/api/js/jquery/jquery.noconflict.js +++ b/api/js/jquery/jquery.noconflict.js @@ -18,5 +18,6 @@ /vendor/bower-asset/jquery-touchswipe/jquery.touchSwipe.js; /vendor/egroupware/magicsuggest/magicsuggest.js; /api/js/jquery/jquery.splitter.js; + /api/js/jquery/blueimp/js/blueimp-gallery.min.js; */ jQuery.noConflict(); \ No newline at end of file