diff --git a/app.js b/app.js index 9bfb34570..15b2ed9fa 100644 --- a/app.js +++ b/app.js @@ -1,7 +1,6 @@ /* application specific logic */ import 'jquery'; -import 'jQuery-Impromptu'; import 'olm'; diff --git a/css/_jquery-impromptu.scss b/css/_jquery-impromptu.scss deleted file mode 100644 index caa5ecd28..000000000 --- a/css/_jquery-impromptu.scss +++ /dev/null @@ -1,129 +0,0 @@ -/* ------------------------------- - Impromptu ------------------------------- -*/ -.jqifade{ - position: absolute; - background-color: #000; -} -div.jqi{ - width: 400px; - position: absolute; - color: #3a3a3a; - background-color: #ffffff; - font-size: 11px; - text-align: left; - border: solid 1px #eeeeee; - border-radius: 6px; - -moz-border-radius: 6px; - -webkit-border-radius: 6px; - padding: 7px; -} -div.jqi .jqicontainer{ -} -div.jqi .jqiclose{ - position: absolute; - top: 4px; right: -2px; - width: 18px; - cursor: default; - color: #bbbbbb; - font-weight: bold; -} -div.jqi .jqistate{ - background-color: #fff; -} -div.jqi .jqititle{ - padding: 5px 10px; - font-size: 16px; - line-height: 20px; - border-bottom: solid 1px #eeeeee; -} -div.jqi .jqimessage{ - padding: 10px; - line-height: 20px; - color: #444444; -} -div.jqi .jqibuttons{ - text-align: right; - margin: 0 -7px -7px -7px; - border-top: solid 1px #e4e4e4; - background-color: #f4f4f4; - border-radius: 0 0 6px 6px; - -moz-border-radius: 0 0 6px 6px; - -webkit-border-radius: 0 0 6px 6px; -} -div.jqi .jqibuttons button{ - margin: 0; - padding: 5px 20px; - background-color: transparent !important; - font-weight: normal; - border: none; - border-left: solid 1px #e4e4e4; - color: #777; - font-weight: bold; - font-size: 12px; -} -div.jqi .jqibuttons button.jqidefaultbutton{ - color: #489afe; -} - -div.jqi .jqibuttons button:disabled { - color: #b6b6b6 !important; -} -div.jqi .jqibuttons button:hover, -div.jqi .jqibuttons button:focus{ - color: #287ade; - outline: none; -} -.jqiwarning .jqi .jqibuttons{ - background-color: #b95656; -} - -/* sub states */ -div.jqi .jqiparentstate::after{ - background-color: #777; - opacity: 0.6; - filter: alpha(opacity=60); - content: ''; - position: absolute; - top:0;left:0;bottom:0;right:0; - border-radius: 6px; - -moz-border-radius: 6px; - -webkit-border-radius: 6px; -} -div.jqi .jqisubstate{ - position: absolute; - top:0; - left: 20%; - width: 60%; - padding: 7px; - border: solid 1px #eeeeee; - border-top: none; - border-radius: 0 0 6px 6px; - -moz-border-radius: 0 0 6px 6px; - -webkit-border-radius: 0 0 6px 6px; -} -div.jqi .jqisubstate .jqibuttons button{ - padding: 10px 18px; -} - -/* arrows for tooltips/tours */ -.jqi .jqiarrow{ position: absolute; height: 0; width:0; line-height: 0; font-size: 0; border: solid 10px transparent;} - -.jqi .jqiarrowtl{ left: 10px; top: -20px; border-bottom-color: #ffffff; } -.jqi .jqiarrowtc{ left: 50%; top: -20px; border-bottom-color: #ffffff; margin-left: -10px; } -.jqi .jqiarrowtr{ right: 10px; top: -20px; border-bottom-color: #ffffff; } - -.jqi .jqiarrowbl{ left: 10px; bottom: -20px; border-top-color: #ffffff; } -.jqi .jqiarrowbc{ left: 50%; bottom: -20px; border-top-color: #ffffff; margin-left: -10px; } -.jqi .jqiarrowbr{ right: 10px; bottom: -20px; border-top-color: #ffffff; } - -.jqi .jqiarrowlt{ left: -20px; top: 10px; border-right-color: #ffffff; } -.jqi .jqiarrowlm{ left: -20px; top: 50%; border-right-color: #ffffff; margin-top: -10px; } -.jqi .jqiarrowlb{ left: -20px; bottom: 10px; border-right-color: #ffffff; } - -.jqi .jqiarrowrt{ right: -20px; top: 10px; border-left-color: #ffffff; } -.jqi .jqiarrowrm{ right: -20px; top: 50%; border-left-color: #ffffff; margin-top: -10px; } -.jqi .jqiarrowrb{ right: -20px; bottom: 10px; border-left-color: #ffffff; } - diff --git a/css/_jquery.contextMenu.scss b/css/_jquery.contextMenu.scss deleted file mode 100644 index 7380541c7..000000000 --- a/css/_jquery.contextMenu.scss +++ /dev/null @@ -1,206 +0,0 @@ -@charset "UTF-8"; -/*! - * jQuery contextMenu - Plugin for simple contextMenu handling - * - * Version: v2.1.1 - * - * Authors: Björn Brala (SWIS.nl), Rodney Rehm, Addy Osmani (patches for FF) - * Web: http://swisnl.github.io/jQuery-contextMenu/ - * - * Copyright (c) 2011-2016 SWIS BV and contributors - * - * Licensed under - * MIT License http://www.opensource.org/licenses/mit-license - * - * Date: 2016-02-28T09:53:18.890Z - */ -@font-face { - font-family: "context-menu-icons"; - font-style: normal; - font-weight: normal; - - src: url("font/context-menu-icons.eot?2qmzf"); - src: url("font/context-menu-icons.eot?2qmzf#iefix") format("embedded-opentype"), url("font/context-menu-icons.woff2?2qmzf") format("woff2"), url("font/context-menu-icons.woff?2qmzf") format("woff"), url("font/context-menu-icons.ttf?2qmzf") format("truetype"); -} - -.context-menu-icon:before { - position: absolute; - top: 50%; - left: 0; - width: 28px; - font-family: "context-menu-icons"; - font-size: 16px; - font-style: normal; - font-weight: normal; - line-height: 1; - color: #2980b9; - text-align: center; - -webkit-transform: translateY(-50%); - -ms-transform: translateY(-50%); - -o-transform: translateY(-50%); - transform: translateY(-50%); - - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; -} - -.context-menu-icon-add:before { - content: ""; -} - -.context-menu-icon-copy:before { - content: ""; -} - -.context-menu-icon-cut:before { - content: ""; -} - -.context-menu-icon-delete:before { - content: ""; -} - -.context-menu-icon-edit:before { - content: ""; -} - -.context-menu-icon-paste:before { - content: ""; -} - -.context-menu-icon-quit:before { - content: ""; -} - -.context-menu-icon.context-menu-hover:before { - color: #fff; -} - -.context-menu-list { - position: absolute; - display: inline-block; - min-width: 180px; - max-width: 360px; - padding: 4px 0; - margin: 5px; - font-family: inherit; - font-size: inherit; - list-style-type: none; - background: #fff; - border: 1px solid #bebebe; - border-radius: $borderRadius; - -webkit-box-shadow: 0 2px 5px rgba(0, 0, 0, .5); - box-shadow: 0 2px 5px rgba(0, 0, 0, .5); -} - -.context-menu-item { - position: relative; - padding: 3px 28px; - color: #2f2f2f; - -webkit-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; - background-color: #fff; -} - -.context-menu-separator { - padding: 0; - margin: 5px 0; - border-bottom: 1px solid #e6e6e6; -} - -.context-menu-item > label > input, -.context-menu-item > label > textarea { - -webkit-user-select: text; - -moz-user-select: text; - -ms-user-select: text; - user-select: text; -} - -.context-menu-item.context-menu-hover { - color: #fff; - cursor: pointer; - background-color: #2980b9; -} - -.context-menu-item.context-menu-disabled { - color: #626262; - background-color: #fff; -} - -.context-menu-item.context-menu-disabled { - color: #626262; -} - -.context-menu-input.context-menu-hover, -.context-menu-item.context-menu-disabled.context-menu-hover { - cursor: default; - background-color: #eee; -} - -.context-menu-submenu:after { - position: absolute; - top: 50%; - right: 8px; - z-index: $zindex1; - width: 0; - height: 0; - content: ''; - border-color: transparent transparent transparent #2f2f2f; - border-style: solid; - border-width: 4px 0 4px 4px; - -webkit-transform: translateY(-50%); - -ms-transform: translateY(-50%); - -o-transform: translateY(-50%); - transform: translateY(-50%); -} - -/** - * Inputs - */ -.context-menu-item.context-menu-input { - padding: 5px 10px; -} - -/* vertically align inside labels */ -.context-menu-input > label > * { - vertical-align: top; -} - -/* position checkboxes and radios as icons */ -.context-menu-input > label > input[type="checkbox"], -.context-menu-input > label > input[type="radio"] { - position: relative; - top: 3px; -} - -.context-menu-input > label, -.context-menu-input > label > input[type="text"], -.context-menu-input > label > textarea, -.context-menu-input > label > select { - display: block; - width: 100%; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; -} - -.context-menu-input > label > textarea { - height: 100px; -} - -.context-menu-item > .context-menu-list { - top: 5px; - /* re-positioned by js */ - right: -5px; - display: none; -} - -.context-menu-item.context-menu-visible > .context-menu-list { - display: block; -} - -.context-menu-accesskey { - text-decoration: underline; -} diff --git a/css/main.scss b/css/main.scss index 97a0daf44..95bfa6f69 100644 --- a/css/main.scss +++ b/css/main.scss @@ -57,7 +57,6 @@ $flagsImagePath: "../images/"; @import 'welcome_page_content'; @import 'welcome_page_settings_toolbar'; @import 'toolbars'; -@import 'jquery.contextMenu'; @import 'keyboard-shortcuts'; @import 'redirect_page'; @import 'components/form-control'; diff --git a/modules/UI/UI.js b/modules/UI/UI.js index aa5d1c7a9..452d49f70 100644 --- a/modules/UI/UI.js +++ b/modules/UI/UI.js @@ -104,9 +104,6 @@ UI.initConference = function() { * established, false - otherwise (for example in the case of welcome page) */ UI.start = function() { - // Set the defaults for prompt dialogs. - $.prompt.setDefaults({ persistent: false }); - VideoLayout.initLargeVideo(); // Do not animate the video area on UI start (second argument passed into diff --git a/package-lock.json b/package-lock.json index 24a6b6076..66c994750 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10083,10 +10083,6 @@ "iterate-iterator": "^1.0.1" } }, - "jQuery-Impromptu": { - "version": "github:trentrichardson/jQuery-Impromptu#753c2833f62f9c00301dd8b75af03599dc4f2ee8", - "from": "github:trentrichardson/jQuery-Impromptu#v6.0.0" - }, "jest-get-type": { "version": "24.9.0", "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-24.9.0.tgz", diff --git a/package.json b/package.json index 7da91d884..3ed72d3fe 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,6 @@ "i18next": "17.0.6", "i18next-browser-languagedetector": "3.0.1", "i18next-xhr-backend": "3.0.0", - "jQuery-Impromptu": "github:trentrichardson/jQuery-Impromptu#v6.0.0", "jitsi-meet-logger": "github:jitsi/jitsi-meet-logger#v1.0.0", "jquery": "3.5.1", "jquery-i18next": "1.2.1", @@ -151,8 +150,5 @@ "start": "make dev", "ios": "react-native run-ios", "android": "react-native run-android" - }, - "browser": { - "jQuery-Impromptu": "jQuery-Impromptu/src/jquery-impromptu.js" } }