diff options
author | dizzy <diosmosis@users.noreply.github.com> | 2021-11-11 13:53:05 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-11 13:53:05 +0300 |
commit | 680ac30b2078ce7f0fb587c145161dab0bce2c24 (patch) | |
tree | 17aeb01ffa31e59267a6b9859f900c944883c1fd /plugins/Morpheus | |
parent | ac3d508c9ac9700c7d3928bd8014a34205f4c296 (diff) |
[Vue] migrate dropdown and related directives (#18214)
* migrating RateFeature and ReviewLinks + adding AjaxHelper.fetch utility method (all untested)
* get ratefeature component to work, modify matomodialog component to use v-model, add event parameters to createAngularAdapter, allow translate to use variadic args or one string array + rebuild
* remove ratefeature angularjs files
* rebuild + make vue mapping property optional in createANgularJsAdapter
* migrate enrichedheadline and get to work
* fix test
* fix translate
* fix another translate issue & migrate contentblock directive
* fix anchor links, not including the "/" causes angularjs to fail (also on 4.x-dev)
* update expected screenshots
* fix ui test
* fix some test failures
* fix nested transclude issue
* remove content block files
* fix icon spacing that occurs due to angularjs inserting empty comments in between nodes while vue 3 does not
* update some screenshots
* update screenshot (actually fixes an alignment issue)
* update screenshot
* first pass at converting comparisons service/component
* get new code to build and load without error in the UI
* debugging
* getting basic functionaltiy to work
* Update _dataTable.twig
* fix UI test failure + URL encoding/angularjs issue causing back button to not work
* fix order of operations issue
* built vue files
* using ref in setup() is not needed to access this.$refs
* Convert comparisons service angularjs tests to comparison store typescript tests.
* migrate piwik-date-picker directive
* migrate date range picker component (changed invalid date in input handling to just reset back to the previous date since it was easier in vue to do that)
* migrate period-date-picker component (using composition api more when easier for migration)
* convert piwik-expand-onclick directive to vue directive
* migrate expand on hover directive to vue directive
* fix variable reference
* build
* Add materialize-css @types and migrate piwik-dropdown-menu.
* migrate focus-anywhere-but-here directive to vue directive
* migrate focus-if directive
* migrate menudropdown directive
* forgot to remove old files
* built vue files
* rewrite URL handling to use computed properties in a URL store + do the same for other dependent data in the comparison store to allow vues to subscribe to the properties for changes to global state
* fix some tests
* some more fixes
* more fixes + disallow modifications to MatomoUrl state
* get angularjs unit tests to pass + fix a couple more issues
* another fix
* fix bad merge
* self review + fixes
* remove old fix as it may not be needed anymore
* empty string is not a valid date + do not report invalid date exception just rethrow
* update screenshots and try to fix random failure
* use jquery $destroy event instead of scope one since the scope one is broadcasted
* rangeChange event must be triggered once on mount
* initialize startDateText/endDateText correctly
* use jquery $destroy event instead of angularjs one
* built vue files
* fix menudropdown.directive.js reference
* load vue in installation/updater & correctly make focusanywherebuthere stateful
* correctly implement stateful directives for ExpandOnClick/ExpandOnHover
* less tweak (angularjs comment removal)
* fix submenu check
* quick type fix
* load vue in installation workflow
* add broadcast.js to Installation workflow + do not fail in pk_translate if no translations are loaded
* update expected screenshots (spacing of arrow changed because of angularjs comment no longer being there)
* fix prop type
* built vue files
* re add accidentally removed (?) file
* remove no longer needed file
* Add CoreHome UMD in CoreUpdater/Installation.
* self review
* remove file from JS list
* fix UI tests
* apply review fixes
Co-authored-by: sgiehl <stefan@matomo.org>
Diffstat (limited to 'plugins/Morpheus')
-rw-r--r-- | plugins/Morpheus/javascripts/piwikHelper.js | 5 | ||||
-rw-r--r-- | plugins/Morpheus/stylesheets/base.less | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/plugins/Morpheus/javascripts/piwikHelper.js b/plugins/Morpheus/javascripts/piwikHelper.js index 4cfc22e51d..390d257041 100644 --- a/plugins/Morpheus/javascripts/piwikHelper.js +++ b/plugins/Morpheus/javascripts/piwikHelper.js @@ -6,8 +6,9 @@ */ function _pk_translate(translationStringId, values) { - - if( typeof(piwik_translations[translationStringId]) != 'undefined' ){ + if (typeof(piwik_translations) !== 'undefined' + && typeof(piwik_translations[translationStringId]) != 'undefined' + ) { var translation = piwik_translations[translationStringId]; if (typeof values != 'undefined' && values && values.length) { values.unshift(translation); diff --git a/plugins/Morpheus/stylesheets/base.less b/plugins/Morpheus/stylesheets/base.less index f4951ddbcf..e2deb1c633 100644 --- a/plugins/Morpheus/stylesheets/base.less +++ b/plugins/Morpheus/stylesheets/base.less @@ -15,7 +15,7 @@ @import "uibase/_header.less"; @import "uibase/_headerMessage.less"; @import "../../CoreHome/angularjs/siteselector/siteselector.directive.less"; -@import "../../CoreHome/angularjs/menudropdown/menudropdown.directive.less"; +@import "../../CoreHome/vue/src/Menudropdown/Menudropdown.less"; @import "../../CoreHome/vue/src/Alert/alert.less"; @import "../../CoreHome/stylesheets/dataTable/_entityTable.less"; @import "uibase/_periodSelect.less"; |