remove feedback popupm-18250-remove-review-popup

remove feedback popup

6 files changed, 1 insertions, 113 deletions

diff --git a/plugins/Feedback/Feedback.php b/plugins/Feedback/Feedback.php
index 8e6531b7af..36625ce869 100644
--- a/plugins/Feedback/Feedback.php
+++ b/plugins/Feedback/Feedback.php
@@ -37,16 +37,12 @@ class Feedback extends \Piwik\Plugin
 
     public function getStylesheetFiles(&$stylesheets)
     {
-        $stylesheets[] = "plugins/Feedback/stylesheets/feedback.less";
         $stylesheets[] = "plugins/Feedback/vue/src/RateFeature/RateFeature.less";
-        $stylesheets[] = "plugins/Feedback/angularjs/feedback-popup/feedback-popup.directive.less";
         $stylesheets[] = "plugins/Feedback/angularjs/refer-banner/refer-banner.directive.less";
     }
 
     public function getJsFiles(&$jsFiles)
     {
-        $jsFiles[] = "plugins/Feedback/angularjs/feedback-popup/feedback-popup.controller.js";
-        $jsFiles[] = "plugins/Feedback/angularjs/feedback-popup/feedback-popup.directive.js";
         $jsFiles[] = "plugins/Feedback/angularjs/refer-banner/refer-banner.directive.js";
         $jsFiles[] = "plugins/Feedback/angularjs/refer-banner/refer-banner.controller.js";
     }
@@ -78,23 +74,15 @@ class Feedback extends \Piwik\Plugin
 
     public function renderViewsAndAddToPage(&$pageHtml)
     {
-        $feedbackPopopView = $this->renderFeedbackPopup();
         $referBannerView = $this->renderReferBanner();
 
-        $views = [$feedbackPopopView, $referBannerView];
+        $views = [$referBannerView];
         $implodedViews = implode('', $views);
 
         $endOfBody = strpos($pageHtml, '</body>');
         $pageHtml = substr_replace($pageHtml, $implodedViews, $endOfBody, 0);
     }
 
-    public function renderFeedbackPopup()
-    {
-        $popupView = new View('@Feedback/feedbackPopup');
-        $popupView->promptForFeedback = (int)$this->getShouldPromptForFeedback();
-
-        return $popupView->render();
-    }
 
     public function renderReferBanner()
     {
diff --git a/plugins/Feedback/angularjs/feedback-popup/feedback-popup.controller.js b/plugins/Feedback/angularjs/feedback-popup/feedback-popup.controller.js
deleted file mode 100644
index 02c669805f..0000000000
--- a/plugins/Feedback/angularjs/feedback-popup/feedback-popup.controller.js
+++ /dev/null
@@ -1,42 +0,0 @@
-/*!
- * Matomo - free/libre analytics platform
- *
- * @link http://matomo.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-(function () {
-    angular.module('piwikApp').controller('FeedbackPopupController', FeedbackPopupController);
-
-    FeedbackPopupController.$inject = ['$scope', '$timeout', 'piwikApi'];
-
-    function FeedbackPopupController($scope, $timeout, piwikApi) {
-
-        var saveNextReminder = function(nextReminder) {
-            var ajaxHandler = new ajaxHelper();
-            ajaxHandler.addParams({'module': 'Feedback', 'action': 'updateFeedbackReminderDate'}, 'GET');
-            ajaxHandler.addParams({'nextReminder': nextReminder}, 'POST');
-            ajaxHandler.send();
-        };
-
-        var remindMeLater = function() {
-            saveNextReminder(90);
-        };
-
-        var dontShowAgain = function() {
-            saveNextReminder(-1);
-        };
-
-        var init = function() {
-            if ($scope.promptForFeedback === 1) {
-                $timeout(function() {
-                    $scope.feedbackPopup.dialog = {};
-                    $scope.feedbackPopup.dialog.show = true;
-                    $scope.feedbackPopup.remindMeLater = remindMeLater;
-                    $scope.feedbackPopup.dontShowAgain = dontShowAgain;
-                });
-            }
-        };
-
-        init();
-    }
-})();
\ No newline at end of file
diff --git a/plugins/Feedback/angularjs/feedback-popup/feedback-popup.directive.html b/plugins/Feedback/angularjs/feedback-popup/feedback-popup.directive.html
deleted file mode 100644
index 97ecf18924..0000000000
--- a/plugins/Feedback/angularjs/feedback-popup/feedback-popup.directive.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<div ng-controller="FeedbackPopupController">
-    <div class="feedbackPopup ui-confirm"
-         piwik-dialog="feedbackPopup.dialog.show"
-         yes="feedbackPopup.remindMeLater()"
-         no="feedbackPopup.dontShowAgain()"
-         close=""
-    >
-
-        <div class="intro">
-            <h2>{{'Feedback_ReviewMatomoTitle'|translate }}</h2>
-        </div>
-
-
-        <div class="footer">
-            <input type="button" value="{{ 'Feedback_RemindMeLater'|translate }}" role="yes"/>
-            <input type="button" value="{{ 'Feedback_NeverAskMeAgain'|translate }}" role="no"/>
-        </div>
-    </div>
-</div>
\ No newline at end of file
diff --git a/plugins/Feedback/angularjs/feedback-popup/feedback-popup.directive.js b/plugins/Feedback/angularjs/feedback-popup/feedback-popup.directive.js
deleted file mode 100644
index 4614c88dc8..0000000000
--- a/plugins/Feedback/angularjs/feedback-popup/feedback-popup.directive.js
+++ /dev/null
@@ -1,38 +0,0 @@
-/*!
- * Matomo - free/libre analytics platform
- *
- * @link http://matomo.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-/**
- * Usage:
- * <div piwik-feedback-popup>
- */
-(function () {
-    angular.module('piwikApp').directive('piwikFeedbackPopup', piwikFeedbackPopup);
-
-    piwikFeedbackPopup.$inject = ['piwik'];
-
-    function piwikFeedbackPopup(piwik){
-        var defaults = {
-        };
-
-        return {
-            restrict: 'A',
-            scope: {
-                promptForFeedback: '<'
-            },
-            templateUrl: 'plugins/Feedback/angularjs/feedback-popup/feedback-popup.directive.html?cb=' + piwik.cacheBuster,
-            controller: 'FeedbackPopupController',
-            controllerAs: 'feedbackPopup',
-            compile: function (element, attrs) {
-                for (var index in defaults) {
-                    if (defaults.hasOwnProperty(index) && attrs[index] === undefined) {
-                        attrs[index] = defaults[index];
-                    }
-                }
-            }
-        };
-    }
-})();
\ No newline at end of file
diff --git a/plugins/Feedback/angularjs/feedback-popup/feedback-popup.directive.less b/plugins/Feedback/angularjs/feedback-popup/feedback-popup.directive.less
deleted file mode 100644
index e69de29bb2..0000000000
--- a/plugins/Feedback/angularjs/feedback-popup/feedback-popup.directive.less
+++ /dev/null
diff --git a/plugins/Feedback/templates/feedbackPopup.twig b/plugins/Feedback/templates/feedbackPopup.twig
deleted file mode 100644
index 7315d4ad12..0000000000
--- a/plugins/Feedback/templates/feedbackPopup.twig
+++ /dev/null
@@ -1 +0,0 @@
-<div piwik-feedback-popup prompt-for-feedback="{{ promptForFeedback }}"></div>