diff --git a/Gruntfile.js b/Gruntfile.js index a020010461..d0d7563374 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -53,8 +53,8 @@ module.exports = function (grunt) { api: { files: { "api/js/jsapi.min.js": [ - "api/js/jquery/jquery.js", - "api/js/jquery/jquery-ui.js", + "vendor/bower-asset/jquery/dist/jquery.js", + "vendor/bower-asset/jquery-ui/jquery-ui.js", "api/js/jsapi/jsapi.js", "api/js/egw_json.js", "api/js/jsapi/egw_core.js", @@ -153,7 +153,7 @@ module.exports = function (grunt) { "api/js/etemplate/et2_dataview_interfaces.js", "api/js/etemplate/et2_dataview_view_container.js", "api/js/etemplate/et2_dataview_view_row.js", - "api/js/jquery/TouchSwipe/jquery.touchSwipe.js", + "/vendor/bower-asset/jquery-touchswipe/jquery.touchSwipe.js", "api/js/etemplate/et2_dataview_view_aoi.js", "api/js/etemplate/et2_dataview_controller_selection.js", "api/js/etemplate/et2_dataview_controller.js", @@ -234,7 +234,7 @@ module.exports = function (grunt) { mobile: { files: { "pixelegg/js/fw_mobile.min.js": [ - "api/js/jquery/fastclick/lib/fastclick.js", + "/vendor/bower-asset/fastclick/lib/fastclick.js", "api/js/framework/fw_base.js", "api/js/framework/fw_browser.js", "api/js/jquery/mousewheel/mousewheel.js", @@ -278,7 +278,7 @@ module.exports = function (grunt) { files: { "pixelegg/css/pixelegg.min.css": [ "api/js/jquery/chosen/chosen.css", - "api/js/jquery/jquery-ui/redmond/jquery-ui.css", + "vendor/bower-asset/jquery-ui/themes/redmond/jquery-ui.css", "api/js/jquery/magicsuggest/magicsuggest.css", "api/js/jquery/jpicker/css/jPicker-1.1.6.min.css", "api/js/jquery/jquery-ui-timepicker-addon.css", @@ -293,7 +293,7 @@ module.exports = function (grunt) { ], "pixelegg/css/mobile.min.css": [ "api/js/jquery/chosen/chosen.css", - "api/js/jquery/jquery-ui/redmond/jquery-ui.css", + "vendor/bower-asset/jquery-ui/themes/redmond/jquery-ui.css", "api/js/jquery/magicsuggest/magicsuggest.css", "api/js/jquery/jpicker/css/jPicker-1.1.6.min.css", "api/js/jquery/jquery-ui-timepicker-addon.css", @@ -308,7 +308,7 @@ module.exports = function (grunt) { ], "pixelegg/mobile/fw_mobile.min.css": [ "api/js/jquery/chosen/chosen.css", - "api/js/jquery/jquery-ui/redmond/jquery-ui.css", + "vendor/bower-asset/jquery-ui/themes/redmond/jquery-ui.css", "api/js/jquery/magicsuggest/magicsuggest.css", "api/js/jquery/jpicker/css/jPicker-1.1.6.min.css", "api/js/jquery/jquery-ui-timepicker-addon.css", @@ -327,7 +327,7 @@ module.exports = function (grunt) { files: { "jdots/css/high-contrast.min.css": [ "api/js/jquery/chosen/chosen.css", - "api/js/jquery/jquery-ui/redmond/jquery-ui.css", + "vendor/bower-asset/jquery-ui/themes/redmond/jquery-ui.css", "api/js/jquery/magicsuggest/magicsuggest.css", "api/js/jquery/jpicker/css/jPicker-1.1.6.min.css", "api/js/jquery/jquery-ui-timepicker-addon.css", @@ -346,7 +346,7 @@ module.exports = function (grunt) { ], "jdots/css/jdots.min.css": [ "api/js/jquery/chosen/chosen.css", - "api/js/jquery/jquery-ui/redmond/jquery-ui.css", + "vendor/bower-asset/jquery-ui/themes/redmond/jquery-ui.css", "api/js/jquery/magicsuggest/magicsuggest.css", "api/js/jquery/jpicker/css/jPicker-1.1.6.min.css", "api/js/jquery/jquery-ui-timepicker-addon.css", @@ -364,7 +364,7 @@ module.exports = function (grunt) { ], "jdots/css/orange-green.min.css": [ "api/js/jquery/chosen/chosen.css", - "api/js/jquery/jquery-ui/redmond/jquery-ui.css", + "vendor/bower-asset/jquery-ui/themes/redmond/jquery-ui.css", "api/js/jquery/magicsuggest/magicsuggest.css", "api/js/jquery/jpicker/css/jPicker-1.1.6.min.css", "api/js/jquery/jquery-ui-timepicker-addon.css", diff --git a/api/js/egw_action/egw_action_dragdrop.js b/api/js/egw_action/egw_action_dragdrop.js index 42fc2d5b07..0cf6ab974e 100644 --- a/api/js/egw_action/egw_action_dragdrop.js +++ b/api/js/egw_action/egw_action_dragdrop.js @@ -13,8 +13,8 @@ egw_action; egw_action_common; egw_action_popup; - jquery.jquery; - jquery.jquery-ui; + vendor.bower-asset.jquery.dist.jquery; + /vendor/bower-asset/jquery-ui/jquery-ui.js; */ /** diff --git a/api/js/egw_action/egw_action_popup.js b/api/js/egw_action/egw_action_popup.js index 438063751d..5360a251a5 100644 --- a/api/js/egw_action/egw_action_popup.js +++ b/api/js/egw_action/egw_action_popup.js @@ -10,7 +10,7 @@ */ /*egw:uses - jquery.jquery; + vendor.bower-asset.jquery.dist.jquery; egw_menu; /api/js/jquery/jquery-tap-and-hold/jquery.tapandhold.js; */ @@ -268,7 +268,7 @@ function egwPopupActionImplementation() var contextHandler = function(e) { if(egwIsMobile()) { - if (e.originalEvent.which == 3) + if (e.which == 3) { // Enable onhold trigger till we define a better handler for tree contextmenu // return; diff --git a/api/js/egw_action/egw_keymanager.js b/api/js/egw_action/egw_keymanager.js index 2f3249b1be..e9922adc43 100644 --- a/api/js/egw_action/egw_keymanager.js +++ b/api/js/egw_action/egw_keymanager.js @@ -10,7 +10,7 @@ */ /*egw:uses - jquery.jquery; + vendor.bower-asset.jquery.dist.jquery; egw_action; */ @@ -143,7 +143,7 @@ function _egw_nodeIsInInput(_node) } /** - * Register the onkeypress handler on the document + * Register the onkeypress handler on the document */ jQuery(document).ready(function() { @@ -197,7 +197,7 @@ jQuery(window).on("contextmenu",document, function(event) { */ function egw_shortcutIdx(_keyCode, _shift, _ctrl, _alt) { - return "_" + _keyCode + "_" + + return "_" + _keyCode + "_" + (_shift ? "S" : "") + (_ctrl ? "C" : "") + (_alt ? "A" : ""); @@ -262,7 +262,7 @@ function egw_keyHandler(_keyCode, _shift, _ctrl, _alt) { var result = shortcut.handler.call(shortcut.context, shortcut.shortcut); if(result) return result; } - + // Pass the keypress to the currently focused action object // Get the object manager and fetch the container of the currently diff --git a/api/js/egw_json.js b/api/js/egw_json.js index 00cdedeebe..926bd1cd02 100644 --- a/api/js/egw_json.js +++ b/api/js/egw_json.js @@ -11,7 +11,7 @@ /*egw:uses jsapi.jsapi; // Contains some helper functions - jquery.jquery; // Used for the ajax requests + vendor.bower-asset.jquery.dist.jquery; // Used for the ajax requests */ /* The egw_json_request is the javaScript side implementation of class.egw_json.inc.php.*/ diff --git a/api/js/etemplate/et2_core_baseWidget.js b/api/js/etemplate/et2_core_baseWidget.js index 3e7b1fd334..7c6175d700 100644 --- a/api/js/etemplate/et2_core_baseWidget.js +++ b/api/js/etemplate/et2_core_baseWidget.js @@ -11,7 +11,7 @@ */ /*egw:uses - jquery.jquery; + /vendor/bower-asset/jquery/dist/jquery.js; lib/tooltip; et2_core_DOMWidget; */ diff --git a/api/js/etemplate/et2_core_inputWidget.js b/api/js/etemplate/et2_core_inputWidget.js index cd9ea7da19..6c9cfdab1b 100644 --- a/api/js/etemplate/et2_core_inputWidget.js +++ b/api/js/etemplate/et2_core_inputWidget.js @@ -11,7 +11,7 @@ */ /*egw:uses - jquery.jquery; + /vendor/bower-asset/jquery/dist/jquery.js; et2_core_interfaces; et2_core_valueWidget; */ diff --git a/api/js/etemplate/et2_core_valueWidget.js b/api/js/etemplate/et2_core_valueWidget.js index 3b1accee5e..404986cd9a 100644 --- a/api/js/etemplate/et2_core_valueWidget.js +++ b/api/js/etemplate/et2_core_valueWidget.js @@ -11,7 +11,7 @@ */ /*egw:uses - jquery.jquery; + /vendor/bower-asset/jquery/dist/jquery.js; et2_core_baseWidget; */ diff --git a/api/js/etemplate/et2_dataview.js b/api/js/etemplate/et2_dataview.js index 57789dccab..07ceeea7bc 100644 --- a/api/js/etemplate/et2_dataview.js +++ b/api/js/etemplate/et2_dataview.js @@ -11,7 +11,7 @@ */ /*egw:uses - jquery.jquery; + /vendor/bower-asset/jquery/dist/jquery.js; et2_core_common; et2_dataview_model_columns; diff --git a/api/js/etemplate/et2_dataview_view_aoi.js b/api/js/etemplate/et2_dataview_view_aoi.js index a2486bd777..b93595a7d8 100644 --- a/api/js/etemplate/et2_dataview_view_aoi.js +++ b/api/js/etemplate/et2_dataview_view_aoi.js @@ -13,7 +13,7 @@ /*egw:uses egw_action.egw_action_common; egw_action.egw_action; - /api/js/jquery/TouchSwipe/jquery.touchSwipe.js; + /vendor/bower-asset/jquery-touchswipe/jquery.touchSwipe.js; */ /** diff --git a/api/js/etemplate/et2_dataview_view_container.js b/api/js/etemplate/et2_dataview_view_container.js index 2bcdbc1888..e03e395c0c 100644 --- a/api/js/etemplate/et2_dataview_view_container.js +++ b/api/js/etemplate/et2_dataview_view_container.js @@ -11,7 +11,7 @@ */ /*egw:uses - jquery.jquery; + /vendor/bower-asset/jquery/dist/jquery.js; et2_dataview_interfaces; */ diff --git a/api/js/etemplate/et2_dataview_view_grid.js b/api/js/etemplate/et2_dataview_view_grid.js index d2b9b6c01e..43a58fc4ea 100644 --- a/api/js/etemplate/et2_dataview_view_grid.js +++ b/api/js/etemplate/et2_dataview_view_grid.js @@ -11,7 +11,7 @@ */ /*egw:uses - jquery.jquery; + /vendor/bower-asset/jquery/dist/jquery.js; et2_core_common; et2_dataview_interfaces; diff --git a/api/js/etemplate/et2_dataview_view_rowProvider.js b/api/js/etemplate/et2_dataview_view_rowProvider.js index ec05855a84..e50e1336b7 100644 --- a/api/js/etemplate/et2_dataview_view_rowProvider.js +++ b/api/js/etemplate/et2_dataview_view_rowProvider.js @@ -11,7 +11,7 @@ */ /*egw:uses - jquery.jquery; + /vendor/bower-asset/jquery/dist/jquery.js; et2_core_inheritance; et2_core_interfaces; et2_core_arrayMgr; diff --git a/api/js/etemplate/et2_dataview_view_spacer.js b/api/js/etemplate/et2_dataview_view_spacer.js index 09d82d7093..2dc1cdf588 100644 --- a/api/js/etemplate/et2_dataview_view_spacer.js +++ b/api/js/etemplate/et2_dataview_view_spacer.js @@ -11,7 +11,7 @@ */ /*egw:uses - jquery.jquery; + /vendor/bower-asset/jquery/dist/jquery.js; et2_dataview_view_container; */ diff --git a/api/js/etemplate/et2_dataview_view_tile.js b/api/js/etemplate/et2_dataview_view_tile.js index bbfb04bb30..2360759e06 100644 --- a/api/js/etemplate/et2_dataview_view_tile.js +++ b/api/js/etemplate/et2_dataview_view_tile.js @@ -11,7 +11,7 @@ */ /*egw:uses - jquery.jquery; + /vendor/bower-asset/jquery/dist/jquery.js; et2_dataview_interfaces; */ diff --git a/api/js/etemplate/et2_extension_customfields.js b/api/js/etemplate/et2_extension_customfields.js index d51e470003..fc4ea67627 100644 --- a/api/js/etemplate/et2_extension_customfields.js +++ b/api/js/etemplate/et2_extension_customfields.js @@ -12,7 +12,7 @@ /*egw:uses lib/tooltip; - jquery.jquery; + /vendor/bower-asset/jquery/dist/jquery.js; et2_core_xml; et2_core_DOMWidget; et2_core_inputWidget; diff --git a/api/js/etemplate/et2_extension_nextmatch_dynheight.js b/api/js/etemplate/et2_extension_nextmatch_dynheight.js index 9432dcc909..43f470ea21 100644 --- a/api/js/etemplate/et2_extension_nextmatch_dynheight.js +++ b/api/js/etemplate/et2_extension_nextmatch_dynheight.js @@ -11,7 +11,7 @@ */ /*egw:use - jquery.jquery; + /vendor/bower-asset/jquery/dist/jquery.js; et2_core_inheritance; */ diff --git a/api/js/etemplate/et2_extension_nextmatch_rowProvider.js b/api/js/etemplate/et2_extension_nextmatch_rowProvider.js index 311f23b184..f054254464 100644 --- a/api/js/etemplate/et2_extension_nextmatch_rowProvider.js +++ b/api/js/etemplate/et2_extension_nextmatch_rowProvider.js @@ -11,7 +11,7 @@ */ /*egw:uses - jquery.jquery; + /vendor/bower-asset/jquery/dist/jquery.js; et2_core_inheritance; et2_core_interfaces; et2_core_arrayMgr; diff --git a/api/js/etemplate/et2_widget_ajaxSelect.js b/api/js/etemplate/et2_widget_ajaxSelect.js index 737b86c870..53678c6e0a 100644 --- a/api/js/etemplate/et2_widget_ajaxSelect.js +++ b/api/js/etemplate/et2_widget_ajaxSelect.js @@ -12,8 +12,8 @@ */ /*egw:uses - jquery.jquery; - jquery.jquery-ui; + /vendor/bower-asset/jquery/dist/jquery.js; + /vendor/bower-asset/jquery-ui/jquery-ui.js; et2_core_inputWidget; et2_core_valueWidget; */ diff --git a/api/js/etemplate/et2_widget_barcode.js b/api/js/etemplate/et2_widget_barcode.js index d538df3d29..13f4b78e91 100644 --- a/api/js/etemplate/et2_widget_barcode.js +++ b/api/js/etemplate/et2_widget_barcode.js @@ -11,7 +11,7 @@ */ /*egw:uses - jquery.jquery; + /vendor/bower-asset/jquery/dist/jquery.js; /api/js/jquery/barcode/jquery-barcode.min.js; et2_core_interfaces; et2_core_baseWidget; diff --git a/api/js/etemplate/et2_widget_box.js b/api/js/etemplate/et2_widget_box.js index e436be6361..77ae28629e 100644 --- a/api/js/etemplate/et2_widget_box.js +++ b/api/js/etemplate/et2_widget_box.js @@ -11,7 +11,7 @@ */ /*egw:uses - jquery.jquery; + /vendor/bower-asset/jquery/dist/jquery.js; et2_core_baseWidget; */ diff --git a/api/js/etemplate/et2_widget_button.js b/api/js/etemplate/et2_widget_button.js index 223d0de82d..10cc16b191 100644 --- a/api/js/etemplate/et2_widget_button.js +++ b/api/js/etemplate/et2_widget_button.js @@ -11,7 +11,7 @@ */ /*egw:uses - jquery.jquery; + /vendor/bower-asset/jquery/dist/jquery.js; et2_core_interfaces; et2_core_baseWidget; */ diff --git a/api/js/etemplate/et2_widget_checkbox.js b/api/js/etemplate/et2_widget_checkbox.js index 7b2d1be474..6041fb02b1 100644 --- a/api/js/etemplate/et2_widget_checkbox.js +++ b/api/js/etemplate/et2_widget_checkbox.js @@ -11,7 +11,7 @@ */ /*egw:uses - jquery.jquery; + /vendor/bower-asset/jquery/dist/jquery.js; et2_core_inputWidget; et2_core_valueWidget; */ diff --git a/api/js/etemplate/et2_widget_color.js b/api/js/etemplate/et2_widget_color.js index 3106829556..7985610d03 100644 --- a/api/js/etemplate/et2_widget_color.js +++ b/api/js/etemplate/et2_widget_color.js @@ -11,7 +11,7 @@ */ /*egw:uses - jquery.jquery; + /vendor/bower-asset/jquery/dist/jquery.js; et2_core_inputWidget; et2_core_valueWidget; /api/js/jquery/jpicker/jpicker-1.1.6.js; diff --git a/api/js/etemplate/et2_widget_date.js b/api/js/etemplate/et2_widget_date.js index 028594984c..902eb03faf 100644 --- a/api/js/etemplate/et2_widget_date.js +++ b/api/js/etemplate/et2_widget_date.js @@ -11,8 +11,8 @@ */ /*egw:uses - jquery.jquery; - jquery.jquery-ui; + /vendor/bower-asset/jquery/dist/jquery.js; + /vendor/bower-asset/jquery-ui/jquery-ui.js; lib/date; et2_core_inputWidget; et2_core_valueWidget; diff --git a/api/js/etemplate/et2_widget_description.js b/api/js/etemplate/et2_widget_description.js index 851a13515e..b12534b110 100644 --- a/api/js/etemplate/et2_widget_description.js +++ b/api/js/etemplate/et2_widget_description.js @@ -11,7 +11,7 @@ */ /*egw:uses - jquery.jquery; + /vendor/bower-asset/jquery/dist/jquery.js; et2_core_baseWidget; expose; */ diff --git a/api/js/etemplate/et2_widget_dialog.js b/api/js/etemplate/et2_widget_dialog.js index c17c03a207..973c95102b 100644 --- a/api/js/etemplate/et2_widget_dialog.js +++ b/api/js/etemplate/et2_widget_dialog.js @@ -11,7 +11,7 @@ /*egw:uses et2_core_widget; - jquery.jquery-ui; + /vendor/bower-asset/jquery-ui/jquery-ui.js; */ /** diff --git a/api/js/etemplate/et2_widget_diff.js b/api/js/etemplate/et2_widget_diff.js index 5f1b7cfbde..4b49182b16 100644 --- a/api/js/etemplate/et2_widget_diff.js +++ b/api/js/etemplate/et2_widget_diff.js @@ -11,8 +11,8 @@ */ /*egw:uses - jquery.jquery; - jquery.jquery-ui; + /vendor/bower-asset/jquery/dist/jquery.js; + /vendor/bower-asset/jquery-ui/jquery-ui.js; lib/jsdifflib/difflib; lib/jsdifflib/diffview; et2_core_valueWidget; diff --git a/api/js/etemplate/et2_widget_dropdown_button.js b/api/js/etemplate/et2_widget_dropdown_button.js index 416acc1328..885bd8a585 100644 --- a/api/js/etemplate/et2_widget_dropdown_button.js +++ b/api/js/etemplate/et2_widget_dropdown_button.js @@ -11,8 +11,8 @@ */ /*egw:uses - jquery.jquery; - jquery.jquery-ui; + /vendor/bower-asset/jquery/dist/jquery.js; + /vendor/bower-asset/jquery-ui/jquery-ui.js; et2_baseWidget; */ diff --git a/api/js/etemplate/et2_widget_grid.js b/api/js/etemplate/et2_widget_grid.js index ab1e91264f..fe07cca919 100644 --- a/api/js/etemplate/et2_widget_grid.js +++ b/api/js/etemplate/et2_widget_grid.js @@ -11,7 +11,7 @@ */ /*egw:uses - jquery.jquery; + /vendor/bower-asset/jquery/dist/jquery.js; et2_core_DOMWidget; et2_core_xml; */ diff --git a/api/js/etemplate/et2_widget_hbox.js b/api/js/etemplate/et2_widget_hbox.js index 71795b7867..f3055b7394 100644 --- a/api/js/etemplate/et2_widget_hbox.js +++ b/api/js/etemplate/et2_widget_hbox.js @@ -11,7 +11,7 @@ */ /*egw:uses - jquery.jquery; + /vendor/bower-asset/jquery/dist/jquery.js; et2_core_baseWidget; */ diff --git a/api/js/etemplate/et2_widget_historylog.js b/api/js/etemplate/et2_widget_historylog.js index 3af6a33151..7fb1c3ea6a 100644 --- a/api/js/etemplate/et2_widget_historylog.js +++ b/api/js/etemplate/et2_widget_historylog.js @@ -11,8 +11,8 @@ */ /*egw:uses - jquery.jquery; - jquery.jquery-ui; + /vendor/bower-asset/jquery/dist/jquery.js; + /vendor/bower-asset/jquery-ui/jquery-ui.js; et2_core_valueWidget; // Include the grid classes diff --git a/api/js/etemplate/et2_widget_html.js b/api/js/etemplate/et2_widget_html.js index d343af36a6..381ef43f2b 100644 --- a/api/js/etemplate/et2_widget_html.js +++ b/api/js/etemplate/et2_widget_html.js @@ -12,7 +12,7 @@ /*egw:uses jsapi.jsapi; // Needed for egw_seperateJavaScript - jquery.jquery; + /vendor/bower-asset/jquery/dist/jquery.js; et2_core_baseWidget; */ diff --git a/api/js/etemplate/et2_widget_htmlarea.js b/api/js/etemplate/et2_widget_htmlarea.js index 0ed01cf55d..9147e2d8a9 100644 --- a/api/js/etemplate/et2_widget_htmlarea.js +++ b/api/js/etemplate/et2_widget_htmlarea.js @@ -12,7 +12,7 @@ /*egw:uses jsapi.jsapi; // Needed for egw_seperateJavaScript - jquery.jquery; + /vendor/bower-asset/jquery/dist/jquery.js; ckeditor.ckeditor; ckeditor.config; ckeditor.adapters/jquery; diff --git a/api/js/etemplate/et2_widget_image.js b/api/js/etemplate/et2_widget_image.js index 3a9f2d673b..0fd21afbc0 100644 --- a/api/js/etemplate/et2_widget_image.js +++ b/api/js/etemplate/et2_widget_image.js @@ -11,7 +11,7 @@ */ /*egw:uses - jquery.jquery; + /vendor/bower-asset/jquery/dist/jquery.js; et2_core_interfaces; et2_core_baseWidget; expose; diff --git a/api/js/etemplate/et2_widget_itempicker.js b/api/js/etemplate/et2_widget_itempicker.js index cb34138d8f..dd0f2cdf66 100755 --- a/api/js/etemplate/et2_widget_itempicker.js +++ b/api/js/etemplate/et2_widget_itempicker.js @@ -14,7 +14,7 @@ */ /*egw:uses - jquery.jquery; + /vendor/bower-asset/jquery/dist/jquery.js; et2_core_inputWidget; et2_core_valueWidget; et2_extension_itempicker_actions; diff --git a/api/js/etemplate/et2_widget_link.js b/api/js/etemplate/et2_widget_link.js index f71aadfa71..ce34226902 100644 --- a/api/js/etemplate/et2_widget_link.js +++ b/api/js/etemplate/et2_widget_link.js @@ -11,8 +11,8 @@ */ /*egw:uses - jquery.jquery; - jquery.jquery-ui; + /vendor/bower-asset/jquery/dist/jquery.js; + /vendor/bower-asset/jquery-ui/jquery-ui.js; et2_core_inputWidget; et2_core_valueWidget; diff --git a/api/js/etemplate/et2_widget_portlet.js b/api/js/etemplate/et2_widget_portlet.js index 264f9abacc..895519424e 100644 --- a/api/js/etemplate/et2_widget_portlet.js +++ b/api/js/etemplate/et2_widget_portlet.js @@ -11,7 +11,7 @@ */ /*egw:uses - jquery.jquery; + /vendor/bower-asset/jquery/dist/jquery.js; et2_core_baseWidget; */ diff --git a/api/js/etemplate/et2_widget_progress.js b/api/js/etemplate/et2_widget_progress.js index 37d2990624..d03fcac7bf 100644 --- a/api/js/etemplate/et2_widget_progress.js +++ b/api/js/etemplate/et2_widget_progress.js @@ -10,7 +10,7 @@ */ /*egw:uses - jquery.jquery; + /vendor/bower-asset/jquery/dist/jquery.js; et2_core_interfaces; et2_core_valueWidget; */ diff --git a/api/js/etemplate/et2_widget_radiobox.js b/api/js/etemplate/et2_widget_radiobox.js index 2afd6a558e..5a044f1648 100644 --- a/api/js/etemplate/et2_widget_radiobox.js +++ b/api/js/etemplate/et2_widget_radiobox.js @@ -11,7 +11,7 @@ */ /*egw:uses - jquery.jquery; + /vendor/bower-asset/jquery/dist/jquery.js; et2_core_inputWidget; */ diff --git a/api/js/etemplate/et2_widget_selectbox.js b/api/js/etemplate/et2_widget_selectbox.js index d2aa60d02a..17c00b2620 100644 --- a/api/js/etemplate/et2_widget_selectbox.js +++ b/api/js/etemplate/et2_widget_selectbox.js @@ -12,7 +12,7 @@ */ /*egw:uses - jquery.jquery; + /vendor/bower-asset/jquery/dist/jquery.js; /api/js/jquery/chosen/chosen.jquery.js; et2_core_xml; et2_core_DOMWidget; @@ -565,7 +565,7 @@ var et2_selectbox = (function(){ "use strict"; return et2_inputWidget.extend( */ find_multi_option: function(_value) { - return jQuery("input[value='"+ + return jQuery("input[value='"+ (typeof _value === 'string' ? _value.replace(this._escape_value_replace, this._escape_value_with) : _value)+ "']", this.multiOptions ); @@ -836,7 +836,7 @@ var et2_selectbox = (function(){ "use strict"; return et2_inputWidget.extend( return this._super.apply(this, arguments); } }, - + /** * override set disabled for tags as the tags using * chosen dom and need to be treated different diff --git a/api/js/etemplate/et2_widget_split.js b/api/js/etemplate/et2_widget_split.js index e6203c7bf5..6d98fbbdaf 100644 --- a/api/js/etemplate/et2_widget_split.js +++ b/api/js/etemplate/et2_widget_split.js @@ -11,7 +11,7 @@ */ /*egw:uses - jquery.jquery; + /vendor/bower-asset/jquery/dist/jquery.js; jquery.splitter; et2_core_baseWidget; */ diff --git a/api/js/etemplate/et2_widget_tabs.js b/api/js/etemplate/et2_widget_tabs.js index bfc796d55f..8086ecec84 100644 --- a/api/js/etemplate/et2_widget_tabs.js +++ b/api/js/etemplate/et2_widget_tabs.js @@ -12,7 +12,7 @@ /*egw:uses jsapi.egw; - jquery.jquery; + /vendor/bower-asset/jquery/dist/jquery.js; et2_core_valueWidget; */ diff --git a/api/js/etemplate/et2_widget_textbox.js b/api/js/etemplate/et2_widget_textbox.js index 655f162191..9ac38db02b 100644 --- a/api/js/etemplate/et2_widget_textbox.js +++ b/api/js/etemplate/et2_widget_textbox.js @@ -11,7 +11,7 @@ */ /*egw:uses - jquery.jquery; + /vendor/bower-asset/jquery/dist/jquery.js; et2_core_inputWidget; et2_core_valueWidget; */ diff --git a/api/js/etemplate/et2_widget_toolbar.js b/api/js/etemplate/et2_widget_toolbar.js index d4d45b1c26..b6da5327a5 100644 --- a/api/js/etemplate/et2_widget_toolbar.js +++ b/api/js/etemplate/et2_widget_toolbar.js @@ -11,8 +11,8 @@ */ /*egw:uses - jquery.jquery; - jquery.jquery-ui; + /vendor/bower-asset/jquery/dist/jquery.js; + /vendor/bower-asset/jquery-ui/jquery-ui.js; et2_DOMWidget; */ diff --git a/api/js/etemplate/et2_widget_vfs.js b/api/js/etemplate/et2_widget_vfs.js index 8052c0bf4f..6cf90130d8 100644 --- a/api/js/etemplate/et2_widget_vfs.js +++ b/api/js/etemplate/et2_widget_vfs.js @@ -11,7 +11,7 @@ */ /*egw:uses - jquery.jquery; + /vendor/bower-asset/jquery/dist/jquery.js; et2_core_inputWidget; et2_core_valueWidget; et2_widget_description; diff --git a/api/js/etemplate/et2_widget_video.js b/api/js/etemplate/et2_widget_video.js index 0539d4e4e8..439051cbf1 100644 --- a/api/js/etemplate/et2_widget_video.js +++ b/api/js/etemplate/et2_widget_video.js @@ -11,7 +11,7 @@ */ /*egw:uses - jquery.jquery; + /vendor/bower-asset/jquery/dist/jquery.js; et2_core_interfaces; et2_core_baseWidget; */ diff --git a/api/js/etemplate/expose.js b/api/js/etemplate/expose.js index 81e54d7be8..32abd7c5fa 100644 --- a/api/js/etemplate/expose.js +++ b/api/js/etemplate/expose.js @@ -11,7 +11,7 @@ */ /*egw:uses - jquery.jquery; + /vendor/bower-asset/jquery/dist/jquery.js; /api/js/jquery/blueimp/js/blueimp-gallery.min.js; */ diff --git a/api/js/framework/fw_base.js b/api/js/framework/fw_base.js index e8005c1187..d603fb2f07 100644 --- a/api/js/framework/fw_base.js +++ b/api/js/framework/fw_base.js @@ -8,7 +8,7 @@ */ /*egw:uses - jquery.jquery; + vendor.bower-asset.jquery.dist.jquery; egw_inheritance.js; */ diff --git a/api/js/framework/fw_browser.js b/api/js/framework/fw_browser.js index cb61a1a839..c7a4f34aea 100644 --- a/api/js/framework/fw_browser.js +++ b/api/js/framework/fw_browser.js @@ -7,7 +7,7 @@ */ /*egw:uses - jquery.jquery; + vendor.bower-asset.jquery.dist.jquery; egw_action.egw_action_common; egw_inheritance.js; */ diff --git a/api/js/framework/fw_desktop.js b/api/js/framework/fw_desktop.js index 4cd3c881b9..a2aa7e8dc4 100644 --- a/api/js/framework/fw_desktop.js +++ b/api/js/framework/fw_desktop.js @@ -9,7 +9,7 @@ */ /*egw:uses - jquery.jquery; + vendor.bower-asset.jquery.dist.jquery; framework.fw_base; framework.fw_browser; framework.fw_ui; diff --git a/api/js/framework/fw_ui.js b/api/js/framework/fw_ui.js index 4fdcb6b5e6..402d607692 100644 --- a/api/js/framework/fw_ui.js +++ b/api/js/framework/fw_ui.js @@ -8,7 +8,7 @@ */ /*egw:uses - jquery.jquery; + vendor.bower-asset.jquery.dist.jquery; /api/js/jquery/mousewheel/mousewheel.js; egw_inheritance.js; */ diff --git a/api/js/jquery/TouchSwipe/.gitignore b/api/js/jquery/TouchSwipe/.gitignore deleted file mode 100644 index c8c74ad0d9..0000000000 --- a/api/js/jquery/TouchSwipe/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -.DS_Store \ No newline at end of file diff --git a/api/js/jquery/TouchSwipe/README.md b/api/js/jquery/TouchSwipe/README.md deleted file mode 100644 index a1d1a085cb..0000000000 --- a/api/js/jquery/TouchSwipe/README.md +++ /dev/null @@ -1,101 +0,0 @@ -#TouchSwipe 1.6 -A jquery plugin to be used on touch devices such as iPad, iPhone, android etc - -Detects single and multiple finger swipes, pinches and falls back to mouse 'drags' on the desktop. - -Time and distance thresholds can be set to destinguish between swipe gesture and slow drag. - -Allows exclusion of child elements (interactive elements) as well allowing page scrolling or page zooming depending on configuration. - - -### Demos, examples and docs - -[http://labs.rampinteractive.co.uk/touchSwipe](http://labs.rampinteractive.co.uk/touchSwipe) -[http://labs.rampinteractive.co.uk/touchSwipe/docs](http://labs.rampinteractive.co.uk/touchSwipe/docs) - - - -### For port to XUI see: -https://github.com/cowgp/xui-touchSwipe - -### Version History - -* **1.6.6** *2014-06-04* - - Merge of pull requests. - - IE10 touch support - - Only prevent default event handling on valid swipe - - Separate license/changelog comment - - Detect if the swipe is valid at the end of the touch event. - - Pass fingerdata to event handlers. - - Add 'hold' gesture - - Be more tolerant about the tap distance - - Typos and minor fixes -* **1.6.5** *2013-08-24* - - Merged a few pull requests fixing various bugs, added AMD support. -* **1.6.4** *2013-04-04* - - Fixed bug with cancelThreshold introduced in 1.6.3, where swipe status no longer fired start event, and stopped once swiping back. -* **1.6.3** *2013-04-01* - - added doubletap, longtap events and longTapThreshold, doubleTapThreshold property -* **1.6.2** *2013-03-23* - - Added support for events binding with on / off / bind in jQ for all callback names. - - Deprecated the 'click' handler in favour of tap. - - added cancelThreshold property - - added 'option' method to update init options at runtime -* **1.6.1** *2013-02-12* - - Added support for ie8 touch events -* **1.6.0** *2013-01-12* - - Fixed bugs with pinching, mainly when both pinch and swipe enabled, as well as adding time threshold for multifinger gestures, so releasing one finger beofre the other doesnt trigger as single finger gesture. - - made the demo site all static local HTML pages so they can be run locally by a developer - - added jsDoc comments and added documentation for the plugin - - code tidy - - added triggerOnTouchLeave property that will end the event when the user swipes off the element. -* **1.5.1** *2012-11-22* - - Fixed bug with jQuery 1.8 and trailing comma in excludedElements - - Fixed bug with IE and event.preventDefault(); -* **1.5.0** *2012-11-10* - - Added `excludedElements`, a jquery selector that specifies child elements that do NOT trigger swipes. By default, this is one select that removes all form, input select, button and anchor elements. -* **1.4.0** *2012-04-10* - - Added pinch support, `pinchIn`, `pinchOut` and `pinchStatus` -* **1.3.3** *2012-09-08* - - Code tidy prep for minified version -* **1.3.2** *2012-29-07* - - Added `fallbackToMouseEvents` option to NOT capture mouse events on non touch devices. - - Added "all" fingers value to the fingers property, so any combinatin of fingers triggers the swipe, allowing event handlers to check the finger count -* **1.3.1** *2012-05-06* - - Bug fixes - - bind() with false as last argument is no longer supported in jQuery 1.6, also, if you just click, the duration is now returned correctly. -* **1.3.0** *2012-06-06* - - Refactored whole plugin to allow for methods to be executed, as well as exposed defaults for user override. Added `enable`, `disable`, and `destroy` methods -* **1.2.8** *2012-05-06* - - Added the possibility to return a value like null or false in the trigger callback. In that way we can control when the touch start/move should take effect or not (simply by returning in some cases return null; or return false;) This effects the ontouchstart/ontouchmove event. -* **1.2.7** *2012-05-06* - - Changed time threshold to have null default for backwards compatibility. Added duration param passed back in events, and refactored how time is handled. -* **1.2.6** *2012-14-05* - - Added timeThreshold between start and end touch, so user can ignore slow swipes (thanks to Mark Chase). Default is null, all swipes are detected -* **1.2.5** *2011-27-09* - - Added support for testing swipes with mouse on desktop browser (thanks to https://github.com/joelhy) -* **1.2.4** *2011-28-04* - - Changed licence terms to be MIT or GPL inline with jQuery. Added check for support of touch events to stop non compatible browsers erroring. -* **1.2.2** *2011-23-02* - - Fixed bug where scope was not preserved in callback methods. -* **1.2.1** *2011-23-02* - - removed console log! -* **1.2.0** *2011-23-02* - - added `click` handler. This is fired if the user simply clicks and does not swipe. The event object and click target are passed to handler. - - If you use the http://code.google.com/p/jquery-ui-for-ipad-and-iphone/ plugin, you can also assign jQuery mouse events to children of a touchSwipe object. -* **1.1.0** *2011-21-02* - - added `allowPageScroll` property to allow swiping and scrolling of page - - changed handler signatures so one handler can be used for multiple events -* **1.0.1** *2010-12-12* - - removed multibyte comments -* **1.0.0** *2010-12-12* - - feature complete - - - - - - - - - diff --git a/api/js/jquery/TouchSwipe/bower.json b/api/js/jquery/TouchSwipe/bower.json deleted file mode 100644 index f704054298..0000000000 --- a/api/js/jquery/TouchSwipe/bower.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "name": "jquery-touchswipe", - "version": "1.6.6", - "main": "./jquery.touchSwipe.js", - "repository": { - "type": "git", - "url": "git://github.com/mattbryson/TouchSwipe-Jquery-Plugin.git" - } -} diff --git a/api/js/jquery/TouchSwipe/demos/Any_finger_swipe.html b/api/js/jquery/TouchSwipe/demos/Any_finger_swipe.html deleted file mode 100644 index 7257f0b622..0000000000 --- a/api/js/jquery/TouchSwipe/demos/Any_finger_swipe.html +++ /dev/null @@ -1,49 +0,0 @@ - - -
- - - - - - - - - - - -swipe
fingers
By setting the number of fingers
to 'all', any number of fingers will trigger the swipe.
swipe
,swipeLeft
, swipeRight
, swipeUp
, swipeDown
By using the swipe
handler, you can detect all 4 directions, or use the individual methods swipeLeft
, swipeRight
, swipeUp
, swipeDown
enable
, disable
, destroy
By using the enable
, disable
and destroy
methods, you can temporarily disable interaction with a swipe element, or completely destroy it, which requires re instantiation.
-
excludedElements
If you want to exclude certain child elements from triggering swipes, you can simply add a .noSwipe
class to the element. Then the element and any of its children will no longer trigger the swipe.
-
Also, a jQuery selector is used to exclude input elements as well as the .noSwipe
elements. By default all button
, input
, select
, textarea
and a
elements are excluded.
- So either add a .noSwipe
class the element, or set your own selector in the excludedElements property.
-
fingers
By setting the number of fingers
to 2, you can detect ONLY 2 finger swipes, likewise for 3 fingers.
tap
hold
swipe
swipeLeft
swipeRight
swipeUp
swipeDown
swipeStatus
pinch
pinchIn
pinchOut
pinchStatus
You can either assign callback methods as part of the options object, or you can assign
- event handlers using the jQuery on
/off
event registration.
The example below logs both from the callback and the event handlers. The Remove Events button will remove the - event bindings, and then only the callbacks will be logged. Event logs are bold, callbacks are normal.
- - - - - -tap
, hold
longTapThreshold
You can also detect if the user holds their finger down until the longTapthreshold is met
- The hold
handler is passed the original event object and the target that was clicked.
-
If you use the jquery.ui.ipad.js plugin (http://code.google.com/p/jquery-ui-for-ipad-and-iphone/) you can then also pickup - standard jQuery mouse events on children of the touchSwipe object.
- - - - - - -Below is a very simple image gallery to demonstrate how to implement touchSwipe.
- Swipe the images below left and right. Swipe up and down will scroll the page. Uses HTML5
- CSS to animate.
option
By using the option
method, you can change any of the init option properties at run time.
-
- see the docs for more info.
-
-
allowPageScroll
You can set how page scrolling is handled by the browser when the user is interacting with a touchSwipe object.
-
There are 4 possible settings for the allowPageScroll
option. These can be strings, or use the plugin constants in $.fn.swipe.pageScroll
-
auto
or $.fn.swipe.pageScroll.AUTO
none
or $.fn.swipe.pageScroll.NONE
horizontal
or $.fn.swipe.pageScroll.HORIZONTAL
vertical
or $.fn.swipe.pageScroll.VERTICAL
swipe
or swipeStatus
handlers are specificed, then allowPageScroll
will be dissabled by default, as they detect swipes in all directions.
- To use scrolling AND the swipe
handler, set allowPageScroll
to the direction you want the user to be able to scroll.
-
-
-
-
-
-
- swipe
or swipeStatus
handlers
- allowPageScroll
to "vertical" so the user can scroll up and down, and swipe left and right with the general swipe
handler.swipe
or swipeStatus
handlers
- allowPageScroll
to "vertical" so the user can scroll up and down, and swipe left and right with the general swipe
handler.fingers
If just one finger
is set for swipes, at the meta tag enables user-scaling, then page zooms will bubble up and trigger.
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes"/>- - - - - -
pinchIn
, pinchOut
You can also trigger pinch events, pinchIn
will trigger when a user has completed a pinch in event, and pinchOut
will trigger when a user has pinched out.
pinchStatus
, swipeStatus
pinchThreshold
You can combine both pinch
and swipe
events. As the user can simultaneously pinch and swipe, both events are tirggered at the same time.
- The pinchThreshold
property sets how far the user must pinch before it is considered a pinch. The default is 20px. This is useful when trying to elimate slight pinch movement when the user is actually swiping.
-
pinchStatus
You can also get the current status of a pinch
, which can be used in place of the other pinch methods. The pinchStatus
reports phase
, direction
, distance
, duration
, fingerCount
and pinchZoom
.
swipeLeft
, swipeRight
, swipeUp
, swipeDown
, swipe
By using just one handler swipeLeft
you can detect ONLY left swipes. There are handlers for each direction, as well as the generic swipe
handler.
swipeStatus
In your event handlers, you can return a value of false if you want to manually cancel the swipe. This will trigger the 'cancel' event.
- - - - - -swipeStatus
You can also get the current status of the swipe, which can be used in place of all other methods. The status reports phase
, direction
, distance
, duration
and fingerCount
.
- Below has a 200px threshold and a 5 second time limit
-
tap
, doubleTap
, longTap
, swipe
longTapThreshold
, doubleTapThreshold
You can also detect if the user simply taps and does not swipe with the tap
handler
- The tap
, doubleTap
and longTap
handler are passed the original event object and the target that was clicked.
-
- See also the hold
event for when a long tap reaches the longTapThreshold
-
-
If you use the jquery.ui.ipad.js plugin (http://code.google.com/p/jquery-ui-for-ipad-and-iphone/) you can then also pickup - standard jQuery mouse events on children of the touchSwipe object.
- -You can set the delay between taps which defines a double tap, and the length of a long tap with the doubleTapThreshold
and longTapThreshold
properties.
Note: If you assign both tap and double tap, you tap events will be delayed by the length of doubleTapThreshold
as it waits to see if its a double before trigger the event
tap
replaces the old click
handler for naming consistency. Since the introduction of event
- triggering as well as callbacks, the plugin cannot trigger a click
event as it clashes with the jQ click event,
- so both the event and callback are called tap
. For backwards compatibility, the click
callback will still work
- but there is no click event. You must use the tap
event when binding with on
or bind
threshold
By setting the threshold
you can set how far the user must swipe before it is considered a swipe.
Swipe at least 200px
cancelThreshold
By setting the cancelThreshold
you can set the minimum distance in px that the user needs to swipe back to cancel the current swipe, even if they have passed the main threshold
maxTimeThreshold
By setting the maxTimeThreshold
you can set the maximum time the user has to complete the swipe. A swipe LONGER than this is cancelled. This can be useful for ignoring long slow swipes.
Swipe in under 500ms
triggerOnTouchEnd
, triggerOnTouchLeave
With triggerOnTouchEnd
you can trigger the swipe
end handler either when the user releases (default) or when the user has swiped the distance / time of the thresholds (but is still swiping).
With triggerOnTouchLeave
you can end the event if the user swipes off the element
Swipe below, and the swipeEnd handler will trigger when you have swiped 200 px.
- - - - -TouchSwipe is a jquery plugin to be used with jQuery on touch input devices such as iPad, iPhone etc.
-