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/CoreHome/angularjs/common
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/CoreHome/angularjs/common')
-rw-r--r--plugins/CoreHome/angularjs/common/directives/dropdown-button.js22
-rw-r--r--plugins/CoreHome/angularjs/common/directives/show-sensitive-data.js2
-rw-r--r--plugins/CoreHome/angularjs/common/directives/side-nav.js3
3 files changed, 17 insertions, 10 deletions
diff --git a/plugins/CoreHome/angularjs/common/directives/dropdown-button.js b/plugins/CoreHome/angularjs/common/directives/dropdown-button.js
index 00c9bf326f..04ac857795 100644
--- a/plugins/CoreHome/angularjs/common/directives/dropdown-button.js
+++ b/plugins/CoreHome/angularjs/common/directives/dropdown-button.js
@@ -19,14 +19,22 @@
return {
restrict: 'C',
compile: function (element, attrs) {
+ // BC for materializecss 0.97 => 1.0
+ if (!element.attr('data-target')
+ && element.attr('data-activates')
+ ) {
+ element.attr('data-target', element.attr('data-activates'));
+ }
- $(element).dropdown({
- inDuration: 300,
- outDuration: 225,
- constrain_width: false, // Does not change width of dropdown to that of the activator
- // hover: true, // Activate on hover
- belowOrigin: true // Displays dropdown below the button
- });
+ if (element.attr('data-target')) {
+ $(element).dropdown({
+ inDuration: 300,
+ outDuration: 225,
+ constrainWidth: false, // Does not change width of dropdown to that of the activator
+ // hover: true, // Activate on hover
+ belowOrigin: true // Displays dropdown below the button
+ });
+ }
return function (scope, element, attrs) {
diff --git a/plugins/CoreHome/angularjs/common/directives/show-sensitive-data.js b/plugins/CoreHome/angularjs/common/directives/show-sensitive-data.js
index 12a9d74ff3..fc111100bb 100644
--- a/plugins/CoreHome/angularjs/common/directives/show-sensitive-data.js
+++ b/plugins/CoreHome/angularjs/common/directives/show-sensitive-data.js
@@ -24,7 +24,7 @@
restrict: 'A',
link: function(scope, element, attr) {
- var sensitiveData = attr.piwikShowSensitiveData || attr.text();
+ var sensitiveData = attr.piwikShowSensitiveData || (attr.text ? attr.text() : '');
var showCharacters = attr.showCharacters || 6;
var clickElement = attr.clickElementSelector || element;
diff --git a/plugins/CoreHome/angularjs/common/directives/side-nav.js b/plugins/CoreHome/angularjs/common/directives/side-nav.js
index 8906a28eda..1f62df58a3 100644
--- a/plugins/CoreHome/angularjs/common/directives/side-nav.js
+++ b/plugins/CoreHome/angularjs/common/directives/side-nav.js
@@ -25,7 +25,6 @@
restrict: 'A',
priority: 10,
link: function(scope, element, attr, ctrl) {
-
if (attr.piwikSideNav) {
$timeout(function () {
if (!initialized) {
@@ -33,7 +32,7 @@
var sideNavActivator = $(attr.piwikSideNav).show();
- sideNavActivator.sideNav({
+ $('#' + sideNavActivator.attr('data-target')).sidenav({
closeOnClick: true
});
}