Fixed inline editor and system notifications

diff --git a/wcfsetup/install/files/js/WCF.js b/wcfsetup/install/files/js/WCF.js
index c552b106a4786728497f71a1e3ab9883e771a7f4..2d58a5e4aa62bf0cf24f90375ad626d3158bf1e9 100644 (file)
--- a/wcfsetup/install/files/js/WCF.js
+++ b/wcfsetup/install/files/js/WCF.js
@@ -528,7 +528,7 @@ WCF.Dropdown = {
                                
                                // calculate top offset for menu
                                $dropdown.next('.dropdownMenu').css({
-                                       top: $dropdown.outerHeight() + 10
+                                       top: $dropdown.outerHeight() + 14
                                });
                        }
                });
@@ -4127,10 +4127,13 @@ WCF.System.Notification = Class.extend({
         * @param       string          cssClassNames
         */
        init: function(message, cssClassNames) {
-               this._overlay = $('<div class="wcf-systemNotification"><p>' + message + '</p></div>').appendTo(document.body);
+               this._overlay = $('#systemNotification');
+               if (!this._overlay.length) {
+                       this._overlay = $('<div id="systemNotification"><p>' + message + '</p></div>').appendTo(document.body);
+               }
                
                if (cssClassNames) {
-                       this._overlay.children('p').addClass(cssClassNames);
+                       this._overlay.children('p').removeClass().addClass(cssClassNames);
                }
        },
        
@@ -4139,8 +4142,10 @@ WCF.System.Notification = Class.extend({
         * 
         * @param       object          callback
         * @param       integer         duration
+        * @param       string          message
+        * @param       string          cssClassName
         */
-       show: function(callback, duration) {
+       show: function(callback, duration, message, cssClassNames) {
                duration = parseInt(duration);
                if (!duration) duration = 2000;
                
@@ -4148,6 +4153,9 @@ WCF.System.Notification = Class.extend({
                        this._callback = callback;
                }
                
+               if (message) this._overlay.children('p').html(message);
+               if (cssClassNames) this._overlay.children('p').removeClass().addClass(cssClassNames);
+               
                // hide overlay after specified duration
                new WCF.PeriodicalExecuter($.proxy(this._hide, this), duration);
                
@@ -4293,6 +4301,12 @@ WCF.InlineEditor = Class.extend({
         */
        _callbacks: [ ],
        
+       /**
+        * list of dropdown selections
+        * @var object
+        */
+       _dropdowns: { },
+       
        /**
         * list of container elements
         * @var object
@@ -4300,10 +4314,10 @@ WCF.InlineEditor = Class.extend({
        _elements: { },
        
        /**
-        * list of dropdown selections
-        * @var object
+        * notification object
+        * @var WCF.System.Notification
         */
-       _dropdowns: { },
+       _notification: null,
        
        /**
         * list of known options
@@ -4356,6 +4370,8 @@ WCF.InlineEditor = Class.extend({
                this._setOptions();
                
                WCF.CloseOverlayHandler.addCallback('WCF.InlineEditor', $.proxy(this._closeAll, this));
+               
+               this._notification = new WCF.System.Notification(WCF.Language.get('wcf.global.success'), 'success');
        },
        
        /**
@@ -4401,12 +4417,15 @@ WCF.InlineEditor = Class.extend({
         * @param       object          event
         */
        _show: function(event) {
+               console.debug(event.currentTarget);
                var $elementID = $(event.currentTarget).data('elementID');
                
                // build drop down
                if (!this._dropdowns[$elementID]) {
-                       var $trigger = this._getTriggerElement(this._elements[$elementID]).wrap('<span />');
-                       this._dropdowns[$elementID] = $('<ul class="wcf-dropdown" />').insertAfter($trigger);
+                       var $trigger = this._getTriggerElement(this._elements[$elementID]).addClass('dropdownToggle').wrap('<span class="dropdown" />');
+                       var $dropdown = $trigger.parent('span');
+                       $trigger.data('trigger', $dropdown.wcfIdentify());
+                       this._dropdowns[$elementID] = $('<ul class="dropdownMenu" style="top: ' + ($dropdown.outerHeight() + 14) + 'px;" />').insertAfter($trigger);
                }
                this._dropdowns[$elementID].empty();
                
@@ -4415,7 +4434,10 @@ WCF.InlineEditor = Class.extend({
                for (var $i = 0, $length = this._options.length; $i < $length; $i++) {
                        var $option = this._options[$i];
                        
-                       if (this._validate($elementID, $option.optionName) || this._validateCallbacks($elementID, $option.optionName)) {
+                       if ($option.optionName === 'divider') {
+                               $('<li class="dropdownDivider" />').appendTo(this._dropdowns[$elementID]);
+                       }
+                       else if (this._validate($elementID, $option.optionName) || this._validateCallbacks($elementID, $option.optionName)) {
                                var $listItem = $('<li><span>' + $option.label + '</span></li>').appendTo(this._dropdowns[$elementID]);
                                $listItem.data('elementID', $elementID).data('optionName', $option.optionName).click($.proxy(this._click, this));
                                
@@ -4424,7 +4446,7 @@ WCF.InlineEditor = Class.extend({
                }
                
                if ($hasOptions) {
-                       this._dropdowns[$elementID].addClass('open');
+                       this._dropdowns[$elementID].parent('span').addClass('dropdownOpen');
                }
                
                return false;
@@ -4539,7 +4561,7 @@ WCF.InlineEditor = Class.extend({
         */
        _hide: function(elementID) {
                if (this._dropdowns[elementID]) {
-                       this._dropdowns[elementID].empty().removeClass('open');
+                       this._dropdowns[elementID].empty().parent('span').removeClass('dropdownOpen');
                }
        }
 });

diff --git a/wcfsetup/install/files/style/dialog.less b/wcfsetup/install/files/style/dialog.less
index df0fc5f1f56ba4abb835961fda9293789360dd2e..0f4ff84deac973bd3f7e371c2b598314e3c465f7 100644 (file)
--- a/wcfsetup/install/files/style/dialog.less
+++ b/wcfsetup/install/files/style/dialog.less
@@ -113,4 +113,27 @@
 
 .systemConfirmation p {
        padding-top: @wcfGapSmall;
+}
+
+/* notification overlay */
+#systemNotification {
+       left: 40%;
+       opacity: 0;
+       position: absolute;
+       right: 40%;
+       top: 0;
+       z-index: 460;
+
+       .transition(opacity, .1s);
+       
+       &.open {
+               opacity: 1;
+       }
+       
+       > p {
+               border-top-left-radius: 0;
+               border-top-right-radius: 0;
+               border-top-width: 0;
+               margin-top: 0;
+       }
 }
\ No newline at end of file