From 30eedebed9a666a7ff51aab6a387b98dd3fb3d38 Mon Sep 17 00:00:00 2001
From: alekseybobkov <aleksey.bobkov@gmail.com>
Date: Thu, 19 Nov 2015 21:02:10 -0800
Subject: [PATCH] Added the ability to load plugin permissions from the
 plugin.yaml file. Minor improvement in the side panel behavior.

---
 modules/backend/assets/js/october-min.js          |  6 ++++--
 modules/backend/assets/js/october.sidepaneltab.js | 15 ++++++++++++---
 modules/system/classes/PluginBase.php             |  7 ++++++-
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/modules/backend/assets/js/october-min.js b/modules/backend/assets/js/october-min.js
index 751afbc89..484457b85 100644
--- a/modules/backend/assets/js/october-min.js
+++ b/modules/backend/assets/js/october-min.js
@@ -1133,7 +1133,8 @@ this.$fixButton=$('<a href="#" class="fix-button"><i class="icon-thumb-tack"></i
 this.$fixButton.click(function(){self.fixPanel()
 return false})
 $('.fix-button-container',this.$el).append(this.$fixButton)
-this.$sideNavItems.click(function(){if(Modernizr.touch&&$(window).width()<self.options.breakpoint){if($(this).data('menu-item')==self.visibleItemId&&self.panelVisible){self.hideSidePanel()
+this.$sideNavItems.click(function(){if($(this).data('no-side-panel')){return}
+if(Modernizr.touch&&$(window).width()<self.options.breakpoint){if($(this).data('menu-item')==self.visibleItemId&&self.panelVisible){self.hideSidePanel()
 return}else
 self.displaySidePanel()}
 self.displayTab(this)
@@ -1141,7 +1142,8 @@ return false})
 if(!Modernizr.touch){self.$sideNav.mouseenter(function(){if($(window).width()<self.options.breakpoint||!self.panelFixed()){self.panelOpenTimeout=setTimeout(function(){self.displaySidePanel()},self.tabOpenDelay)}})
 self.$sideNav.mouseleave(function(){clearTimeout(self.panelOpenTimeout)})
 self.$el.mouseleave(function(){self.hideSidePanel()})
-self.$sideNavItems.mouseenter(function(){if($(window).width()<self.options.breakpoint||!self.panelFixed()){var _this=this
+self.$sideNavItems.mouseenter(function(){if($(window).width()<self.options.breakpoint||!self.panelFixed()){if($(this).data('no-side-panel')){return}
+var _this=this
 self.tabOpenTimeout=setTimeout(function(){self.displayTab(_this)},self.tabOpenDelay)}})
 self.$sideNavItems.mouseleave(function(){clearTimeout(self.tabOpenTimeout)})
 $(window).resize(function(){self.updatePanelPosition()
diff --git a/modules/backend/assets/js/october.sidepaneltab.js b/modules/backend/assets/js/october.sidepaneltab.js
index 0d317fb16..c5ba9a368 100644
--- a/modules/backend/assets/js/october.sidepaneltab.js
+++ b/modules/backend/assets/js/october.sidepaneltab.js
@@ -31,6 +31,10 @@
         $('.fix-button-container', this.$el).append(this.$fixButton)
 
         this.$sideNavItems.click(function(){
+            if ($(this).data('no-side-panel')) {
+                return
+            }
+
             if (Modernizr.touch && $(window).width() < self.options.breakpoint) {
                 if ($(this).data('menu-item') == self.visibleItemId && self.panelVisible) {
                     self.hideSidePanel()
@@ -46,11 +50,13 @@
 
         if (!Modernizr.touch) {
             self.$sideNav.mouseenter(function(){
-               if ($(window).width() < self.options.breakpoint || !self.panelFixed()) {
+                // TODO: The side panel opens regardless of whether
+                // the hovered item has a side panel (data-no-side-panel attribute).
+                if ($(window).width() < self.options.breakpoint || !self.panelFixed()) {
                     self.panelOpenTimeout = setTimeout(function () {
                         self.displaySidePanel()
                     }, self.tabOpenDelay)
-               }
+                }
             })
 
             self.$sideNav.mouseleave(function(){
@@ -63,6 +69,10 @@
 
             self.$sideNavItems.mouseenter(function(){
                 if ($(window).width() < self.options.breakpoint || !self.panelFixed()) {
+                    if ($(this).data('no-side-panel')) {
+                        return
+                    }
+
                     var _this = this
                     self.tabOpenTimeout = setTimeout(function () {
                         self.displayTab(_this)
@@ -74,7 +84,6 @@
                 clearTimeout(self.tabOpenTimeout)
             })
 
-
             $(window).resize(function() {
                 self.updatePanelPosition()
                 self.updateActiveTab()
diff --git a/modules/system/classes/PluginBase.php b/modules/system/classes/PluginBase.php
index 748899d6c..821c9d6b8 100644
--- a/modules/system/classes/PluginBase.php
+++ b/modules/system/classes/PluginBase.php
@@ -109,7 +109,12 @@ class PluginBase extends ServiceProviderBase
      */
     public function registerPermissions()
     {
-        return [];
+        $thisClass = get_class($this);
+
+        $configuration = $this->getConfigurationFromYaml();
+        if (array_key_exists('permissions', $configuration)) {
+            return $configuration['permissions'];
+        }
     }
 
     /**