Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordiosmosis <diosmosis@users.noreply.github.com>2020-06-08 02:46:56 +0300
committerGitHub <noreply@github.com>2020-06-08 02:46:56 +0300
commitd0aaab95f1ef6d8b748b0e8d54f811a366864249 (patch)
tree86820438b4b56c764912316ebe8152362aa3e2dd /plugins/Transitions
parentd10c4e89dc5d1081a3755497c45d366b470eeec7 (diff)
Switch from bower to npm and update JS libraries (#14082)
* Starting to replace bower with npm: use updated jquery-ui from npm. * Use jquery from npm./ * Use angular from npm. * Add more angular libraries. * Use chroma-js from npm. * Remove html5shiv, does not appear to be used. * Use iframe resizer library from npm. * Add jquery-mousewheel * Add jquery.dotdotdot from npm. * Get jquery.scrollto from npm. * Get jscrollpane from npm. * Get materialize-css from npm. * Get mousetrap from npm. * Remove ngDialog, as it is no longer used. * Install qrcode.js from npm. * Get sprintf-js from npm. * Get visibillityjs from npm. * Remove bower.json. * Getting parts of matomo to work w/ new versions of libraries installed by npm. * Ignore node_modules subfolders in node_modules since we only use npm for frontend dependencies + fix a test. * Fix button padding. * Fix series picker checkboxes. * Fix karma conf. * Fix CSS in right place. * Fixing more css/less issues. * More test fixes. * Limit selection style fix. * Fix more tests + materializecss issues. * Fix a couple more tests. * Fix annotation styling. * remove error * add ng-dialog files * try to fix some tests * Fix several UI tests. * fixing more build issues * Fix several more tests and issues. * fixing more tests * split ui tests into 3 groups * fix several more issues and tests * Fix some console warnings on chrome. * Updating more test files. * fix some tests * yet more fixes * couple more fixes * another form fix * Fix some tests. * update screenshot * update more expected files * Fix two more form issues. * test commit (travis is not fetching submodules for some reason...) * remove scripts removed in merge * three travis builds * split UIIntegrationTest into multiple suites * lets try this again * updae several expected screenshots * fix some more tests * fix plugin details material select and tabs initiaialization * update screenshots + css fix * re-initialize materialize tabs since we load jquery-ui afterwards for datepicker which unsets materialize tabs * update more screenshots and fix couple more issues * update more screenshots + tweak to test * more fixes and screenshot updates * fix some issues and update more screenshots * update submodules * more fixes + more updated screenshots * more css fixes and test fixes * couple fixes & updated screenshots * update screenshots * fix random failure * Map old bower_component files to new ones in AssetManager. * Remove node_modules from PR and ignore node_modules in .gitignore and remove libs/jquery (adding new required libs). * Update .travis.yml. * update screenshots * fixing some more issues * fix copy pasta * update screenshots * fix more modal issues * Update css & screenshots. * correct close modal calls * fixing more issues * data-target instead of data-activates * fix more tests * trigger build that works? * fix more tests * update submodule * debugging travis * more debugging * try to fix test * fix modal no button click in test * update more screenshots * couple more test fixes * some more fixes and updated screenshots * update screenshots * apply some review feedback * Fix modal centering and initial top position. * apply some more pr feedback * another pr fix * update submodule * remove style * fix color of checkbox mark * Fix centering the popover Note: centering the popover relative to body doesn't work poperly anymore, maybe because of the fixed position of the widget overlay. Using the ui-widget-overlay to position the dialog centered seems to work * ignore line endings check for node modules * updates expected UI files * submodule updates * use minified file of jquery.browser.js * updates expected test files * ensure to hide parent tooltips when row action tooltips are shown * tweak less for datatable navigation * style is only useful for dashboard * update some screenshots * update submodules Co-authored-by: sgiehl <stefan@matomo.org>
Diffstat (limited to 'plugins/Transitions')
-rw-r--r--plugins/Transitions/stylesheets/transitions.less10
-rw-r--r--plugins/Transitions/tests/UI/Transitions_spec.js2
-rw-r--r--plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_popup_titles.png4
-rw-r--r--plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_popup_urls.png4
-rw-r--r--plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_no_data_widget.png4
-rw-r--r--plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_switch_type_title.png4
-rw-r--r--plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_switch_url.png4
-rw-r--r--plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_with_data_report.png4
-rw-r--r--plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_with_data_widget.png4
9 files changed, 25 insertions, 15 deletions
diff --git a/plugins/Transitions/stylesheets/transitions.less b/plugins/Transitions/stylesheets/transitions.less
index dd4652185a..cec09f230a 100644
--- a/plugins/Transitions/stylesheets/transitions.less
+++ b/plugins/Transitions/stylesheets/transitions.less
@@ -248,3 +248,13 @@ body .ui-tooltip.Transitions_Tooltip_Small {
}
}
}
+
+#transitions_report > .row {
+ margin-left: 0;
+ margin-right: 0;
+
+ body.widgetized & {
+ margin-left: 0.75rem;
+ margin-right: 0.75rem;
+ }
+} \ No newline at end of file
diff --git a/plugins/Transitions/tests/UI/Transitions_spec.js b/plugins/Transitions/tests/UI/Transitions_spec.js
index 0738a0f35c..2261967734 100644
--- a/plugins/Transitions/tests/UI/Transitions_spec.js
+++ b/plugins/Transitions/tests/UI/Transitions_spec.js
@@ -21,7 +21,7 @@ describe("Transitions", function () {
}, field);
await page.waitFor(500);
await page.webpage.evaluate((field, title) => {
- $(field + ' .dropdown-content.active li:contains("' + title + '"):first').click()
+ $(field + ' .dropdown-content li:contains("' + title + '"):first').click()
}, field, title);
}
diff --git a/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_popup_titles.png b/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_popup_titles.png
index c5d0926cbe..7a6889f312 100644
--- a/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_popup_titles.png
+++ b/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_popup_titles.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:7d032ff7d2d7364508bde073397bda857fd75a4d2779ab5e3e3dcc0402ec99a8
-size 68909
+oid sha256:2cff3452a9e684ac44fc8339bfe13ae4a958c118fe8aa898670b0049c616d12d
+size 68986
diff --git a/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_popup_urls.png b/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_popup_urls.png
index 78b032c5b8..a4ed3ec4d3 100644
--- a/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_popup_urls.png
+++ b/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_popup_urls.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:39ac15a5e0145a9c814f0638111905a473557dfd17949bc32d9c081c8344a0c7
-size 79049
+oid sha256:094206c9db59ca1a7936dacf6252f491222688d92e135078b125b7e10d1fe6df
+size 79642
diff --git a/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_no_data_widget.png b/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_no_data_widget.png
index 2e4bba3d6d..db2abe1cc7 100644
--- a/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_no_data_widget.png
+++ b/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_no_data_widget.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:082e88a4b9d38aee3e920e8a946dba872e40f1dde33d311b84705d170a297912
-size 27266
+oid sha256:34a52191fa08e0c1f5121032036137539949513698d5c74e9f5ffee38ab95684
+size 27385
diff --git a/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_switch_type_title.png b/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_switch_type_title.png
index 12c7f6d06d..72f8d81339 100644
--- a/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_switch_type_title.png
+++ b/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_switch_type_title.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:c6b31574475121e71de56c846d24ab714a8d3d3568d5fe9f7402cf4930d40f4d
-size 182720
+oid sha256:21d2e71ee82dbb88885b0868b1bbb58081da879fbbbd51909bc6ca0888dd8847
+size 182640
diff --git a/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_switch_url.png b/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_switch_url.png
index 5e71b0c52d..42657cf6c7 100644
--- a/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_switch_url.png
+++ b/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_switch_url.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:90122e7c6b416be6bec8988d9cd05f28830fd25bc7a586cb64c8f3d56a33fddb
-size 112814
+oid sha256:bab8fe246763bfa8fa6d65ad7a85903d9627fd3bacccd5de0d11e34d5a73f07d
+size 112738
diff --git a/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_with_data_report.png b/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_with_data_report.png
index aab6a088a3..4d111f6943 100644
--- a/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_with_data_report.png
+++ b/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_with_data_report.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:2ec956ceb714308075616c3e69bf05c7e655457a9bc8ecb7cc22db221ed9e882
-size 112693
+oid sha256:adc3f2fe34e466cd89159c6342a6a373808bd4277bf9a5e5b147f1a7dec37745
+size 112635
diff --git a/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_with_data_widget.png b/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_with_data_widget.png
index 35f2eb3fcd..607a27a8a5 100644
--- a/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_with_data_widget.png
+++ b/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_with_data_widget.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:6be01887158481243cb7dae8151d4281b0234bcb7481a16c776d4ba934928781
-size 106638
+oid sha256:f602413f4da1a499ce1eb9ea5da6a0a193e32aa3a6951f3764b7337762986f49
+size 106635