nodebb-theme-persona 11.3.20 → 11.3.24

package/public/modules/autohidingnavbar.js

@@ -1,221 +1,221 @@
-/*
- *  Bootstrap Auto-Hiding Navbar - v4.0.0
- *  An extension for Bootstrap's fixed navbar which hides the navbar while the page is scrolling downwards and shows it the other way. The plugin is able to show/hide the navbar programmatically as well.
- *  http://www.virtuosoft.eu/code/bootstrap-autohidingnavbar/
- *
- *  Made by István Ujj-Mészáros
- *  Under Apache License v2.0 License
- */
-;(function($, window, document, undefined) {
-    var pluginName = 'autoHidingNavbar',
-        $window = $(window),
-        $document = $(document),
-        _scrollThrottleTimer = null,
-        _resizeThrottleTimer = null,
-        _throttleDelay = 70,
-        _lastScrollHandlerRun = 0,
-        _previousScrollTop = null,
-        _windowHeight = $window.height(),
-        _visible = true,
-        _hideOffset,
-        defaults = {
-          disableAutohide: false,
-          showOnUpscroll: true,
-          showOnBottom: true,
-          hideOffset: 'auto', // "auto" means the navbar height
-          animationDuration: 200,
-          navbarOffset: 0
-        };
-
-    function AutoHidingNavbar(element, options) {
-      this.element = $(element);
-      this.settings = $.extend({}, defaults, options);
-      this._defaults = defaults;
-      this._name = pluginName;
-      this.init();
-    }
-
-    function hide(autoHidingNavbar) {
-      if (!_visible) {
-        return;
-      }
-
-      autoHidingNavbar.element.addClass('navbar-hidden').animate({
-        top: -1 * parseInt(autoHidingNavbar.element.css('height'), 10) + autoHidingNavbar.settings.navbarOffset
-      }, {
-        queue: false,
-        duration: autoHidingNavbar.settings.animationDuration
-      });
-
-      try {
-        $('.dropdown.open .dropdown-toggle, .dropdown.show .dropdown-toggle', autoHidingNavbar.element).dropdown('toggle');
-      }
-      catch(e) {}
-
-      _visible = false;
-
-      autoHidingNavbar.element.trigger('hide.autoHidingNavbar');
-    }
-
-    function show(autoHidingNavbar) {
-      if (_visible) {
-        return;
-      }
-
-      autoHidingNavbar.element.removeClass('navbar-hidden').animate({
-        top: 0
-      }, {
-        queue: false,
-        duration: autoHidingNavbar.settings.animationDuration
-      });
-      _visible = true;
-
-      autoHidingNavbar.element.trigger('show.autoHidingNavbar');
-    }
-
-    function detectState(autoHidingNavbar) {
-      var scrollTop = $window.scrollTop(),
-          scrollDelta = scrollTop - _previousScrollTop;
-
-      _previousScrollTop = scrollTop;
-
-      if (scrollDelta < 0) {
-        if (_visible) {
-          return;
-        }
-
-        if (autoHidingNavbar.settings.showOnUpscroll || scrollTop <= _hideOffset) {
-          show(autoHidingNavbar);
-        }
-      }
-      else if (scrollDelta > 0) {
-        if (!_visible) {
-          if (autoHidingNavbar.settings.showOnBottom && scrollTop + _windowHeight === $document.height()) {
-            show(autoHidingNavbar);
-          }
-          return;
-        }
-
-        if (scrollTop >= _hideOffset) {
-          hide(autoHidingNavbar);
-        }
-      }
-
-    }
-
-    function scrollHandler(autoHidingNavbar) {
-      if (autoHidingNavbar.settings.disableAutohide) {
-        return;
-      }
-
-      _lastScrollHandlerRun = new Date().getTime();
-
-      detectState(autoHidingNavbar);
-    }
-
-    function bindEvents(autoHidingNavbar) {
-      $document.on('scroll.' + pluginName, function() {
-        if (new Date().getTime() - _lastScrollHandlerRun > _throttleDelay) {
-          scrollHandler(autoHidingNavbar);
-        }
-        else {
-          clearTimeout(_scrollThrottleTimer);
-          _scrollThrottleTimer = setTimeout(function() {
-            scrollHandler(autoHidingNavbar);
-          }, _throttleDelay);
-        }
-      });
-
-      $window.on('resize.' + pluginName, function() {
-        clearTimeout(_resizeThrottleTimer);
-        _resizeThrottleTimer = setTimeout(function() {
-          _windowHeight = $window.height();
-        }, _throttleDelay);
-      });
-    }
-
-    function unbindEvents() {
-      $document.off('.' + pluginName);
-
-      $window.off('.' + pluginName);
-    }
-
-    AutoHidingNavbar.prototype = {
-      init: function() {
-        this.elements = {
-          navbar: this.element
-        };
-
-        this.setDisableAutohide(this.settings.disableAutohide);
-        this.setShowOnUpscroll(this.settings.showOnUpscroll);
-        this.setShowOnBottom(this.settings.showOnBottom);
-        this.setHideOffset(this.settings.hideOffset);
-        this.setAnimationDuration(this.settings.animationDuration);
-
-        _hideOffset = this.settings.hideOffset === 'auto' ? parseInt(this.element.css('height'), 10) : this.settings.hideOffset;
-        bindEvents(this);
-
-        return this.element;
-      },
-      setDisableAutohide: function(value) {
-        this.settings.disableAutohide = value;
-        return this.element;
-      },
-      setShowOnUpscroll: function(value) {
-        this.settings.showOnUpscroll = value;
-        return this.element;
-      },
-      setShowOnBottom: function(value) {
-        this.settings.showOnBottom = value;
-        return this.element;
-      },
-      setHideOffset: function(value) {
-        this.settings.hideOffset = value;
-        return this.element;
-      },
-      setAnimationDuration: function(value) {
-        this.settings.animationDuration = value;
-        return this.element;
-      },
-      show: function() {
-        show(this);
-        return this.element;
-      },
-      hide: function() {
-        hide(this);
-        return this.element;
-      },
-      destroy: function() {
-        unbindEvents(this);
-        show(this);
-        $.data(this, 'plugin_' + pluginName, null);
-        return this.element;
-      }
-    };
-
-    $.fn[pluginName] = function(options) {
-      var args = arguments;
-
-      if (options === undefined || typeof options === 'object') {
-        return this.each(function() {
-          if (!$.data(this, 'plugin_' + pluginName)) {
-            $.data(this, 'plugin_' + pluginName, new AutoHidingNavbar(this, options));
-          }
-        });
-      } else if (typeof options === 'string' && options[0] !== '_' && options !== 'init') {
-        var returns;
-
-        this.each(function() {
-          var instance = $.data(this, 'plugin_' + pluginName);
-
-          if (instance instanceof AutoHidingNavbar && typeof instance[options] === 'function') {
-            returns = instance[options].apply(instance, Array.prototype.slice.call(args, 1));
-          }
-        });
-
-        return returns !== undefined ? returns : this;
-      }
-
-    };
-
+/*
+ *  Bootstrap Auto-Hiding Navbar - v4.0.0
+ *  An extension for Bootstrap's fixed navbar which hides the navbar while the page is scrolling downwards and shows it the other way. The plugin is able to show/hide the navbar programmatically as well.
+ *  http://www.virtuosoft.eu/code/bootstrap-autohidingnavbar/
+ *
+ *  Made by István Ujj-Mészáros
+ *  Under Apache License v2.0 License
+ */
+;(function($, window, document, undefined) {
+    var pluginName = 'autoHidingNavbar',
+        $window = $(window),
+        $document = $(document),
+        _scrollThrottleTimer = null,
+        _resizeThrottleTimer = null,
+        _throttleDelay = 70,
+        _lastScrollHandlerRun = 0,
+        _previousScrollTop = null,
+        _windowHeight = $window.height(),
+        _visible = true,
+        _hideOffset,
+        defaults = {
+          disableAutohide: false,
+          showOnUpscroll: true,
+          showOnBottom: true,
+          hideOffset: 'auto', // "auto" means the navbar height
+          animationDuration: 200,
+          navbarOffset: 0
+        };
+
+    function AutoHidingNavbar(element, options) {
+      this.element = $(element);
+      this.settings = $.extend({}, defaults, options);
+      this._defaults = defaults;
+      this._name = pluginName;
+      this.init();
+    }
+
+    function hide(autoHidingNavbar) {
+      if (!_visible) {
+        return;
+      }
+
+      autoHidingNavbar.element.addClass('navbar-hidden').animate({
+        top: -1 * parseInt(autoHidingNavbar.element.css('height'), 10) + autoHidingNavbar.settings.navbarOffset
+      }, {
+        queue: false,
+        duration: autoHidingNavbar.settings.animationDuration
+      });
+
+      try {
+        $('.dropdown.open .dropdown-toggle, .dropdown.show .dropdown-toggle', autoHidingNavbar.element).dropdown('toggle');
+      }
+      catch(e) {}
+
+      _visible = false;
+
+      autoHidingNavbar.element.trigger('hide.autoHidingNavbar');
+    }
+
+    function show(autoHidingNavbar) {
+      if (_visible) {
+        return;
+      }
+
+      autoHidingNavbar.element.removeClass('navbar-hidden').animate({
+        top: 0
+      }, {
+        queue: false,
+        duration: autoHidingNavbar.settings.animationDuration
+      });
+      _visible = true;
+
+      autoHidingNavbar.element.trigger('show.autoHidingNavbar');
+    }
+
+    function detectState(autoHidingNavbar) {
+      var scrollTop = $window.scrollTop(),
+          scrollDelta = scrollTop - _previousScrollTop;
+
+      _previousScrollTop = scrollTop;
+
+      if (scrollDelta < 0) {
+        if (_visible) {
+          return;
+        }
+
+        if (autoHidingNavbar.settings.showOnUpscroll || scrollTop <= _hideOffset) {
+          show(autoHidingNavbar);
+        }
+      }
+      else if (scrollDelta > 0) {
+        if (!_visible) {
+          if (autoHidingNavbar.settings.showOnBottom && scrollTop + _windowHeight === $document.height()) {
+            show(autoHidingNavbar);
+          }
+          return;
+        }
+
+        if (scrollTop >= _hideOffset) {
+          hide(autoHidingNavbar);
+        }
+      }
+
+    }
+
+    function scrollHandler(autoHidingNavbar) {
+      if (autoHidingNavbar.settings.disableAutohide) {
+        return;
+      }
+
+      _lastScrollHandlerRun = new Date().getTime();
+
+      detectState(autoHidingNavbar);
+    }
+
+    function bindEvents(autoHidingNavbar) {
+      $document.on('scroll.' + pluginName, function() {
+        if (new Date().getTime() - _lastScrollHandlerRun > _throttleDelay) {
+          scrollHandler(autoHidingNavbar);
+        }
+        else {
+          clearTimeout(_scrollThrottleTimer);
+          _scrollThrottleTimer = setTimeout(function() {
+            scrollHandler(autoHidingNavbar);
+          }, _throttleDelay);
+        }
+      });
+
+      $window.on('resize.' + pluginName, function() {
+        clearTimeout(_resizeThrottleTimer);
+        _resizeThrottleTimer = setTimeout(function() {
+          _windowHeight = $window.height();
+        }, _throttleDelay);
+      });
+    }
+
+    function unbindEvents() {
+      $document.off('.' + pluginName);
+
+      $window.off('.' + pluginName);
+    }
+
+    AutoHidingNavbar.prototype = {
+      init: function() {
+        this.elements = {
+          navbar: this.element
+        };
+
+        this.setDisableAutohide(this.settings.disableAutohide);
+        this.setShowOnUpscroll(this.settings.showOnUpscroll);
+        this.setShowOnBottom(this.settings.showOnBottom);
+        this.setHideOffset(this.settings.hideOffset);
+        this.setAnimationDuration(this.settings.animationDuration);
+
+        _hideOffset = this.settings.hideOffset === 'auto' ? parseInt(this.element.css('height'), 10) : this.settings.hideOffset;
+        bindEvents(this);
+
+        return this.element;
+      },
+      setDisableAutohide: function(value) {
+        this.settings.disableAutohide = value;
+        return this.element;
+      },
+      setShowOnUpscroll: function(value) {
+        this.settings.showOnUpscroll = value;
+        return this.element;
+      },
+      setShowOnBottom: function(value) {
+        this.settings.showOnBottom = value;
+        return this.element;
+      },
+      setHideOffset: function(value) {
+        this.settings.hideOffset = value;
+        return this.element;
+      },
+      setAnimationDuration: function(value) {
+        this.settings.animationDuration = value;
+        return this.element;
+      },
+      show: function() {
+        show(this);
+        return this.element;
+      },
+      hide: function() {
+        hide(this);
+        return this.element;
+      },
+      destroy: function() {
+        unbindEvents(this);
+        show(this);
+        $.data(this, 'plugin_' + pluginName, null);
+        return this.element;
+      }
+    };
+
+    $.fn[pluginName] = function(options) {
+      var args = arguments;
+
+      if (options === undefined || typeof options === 'object') {
+        return this.each(function() {
+          if (!$.data(this, 'plugin_' + pluginName)) {
+            $.data(this, 'plugin_' + pluginName, new AutoHidingNavbar(this, options));
+          }
+        });
+      } else if (typeof options === 'string' && options[0] !== '_' && options !== 'init') {
+        var returns;
+
+        this.each(function() {
+          var instance = $.data(this, 'plugin_' + pluginName);
+
+          if (instance instanceof AutoHidingNavbar && typeof instance[options] === 'function') {
+            returns = instance[options].apply(instance, Array.prototype.slice.call(args, 1));
+          }
+        });
+
+        return returns !== undefined ? returns : this;
+      }
+
+    };
+
   })(jQuery, window, document);

package/public/persona.js

@@ -10,10 +10,6 @@ $(document).ready(function () {
 	$(window).on('resize', utils.debounce(configureNavbarHiding, 200));
 	$(window).on('resize', updatePanelOffset);
 
-	$(window).on('action:app.loggedIn', function () {
-		setupMobileMenu();
-	});
-
 	$(window).on('action:app.load', function () {
 		setupTaskbar();
 		setupMobileMenu();
@@ -196,14 +192,14 @@ $(document).ready(function () {
 			return;
 		}
 
-		require(['pulling', 'storage'], function (Pulling, Storage) {
+		require(['pulling', 'storage', 'alerts'], function (Pulling, Storage, alerts) {
 			if (!Pulling) {
 				return;
 			}
 
 			// initialization
 
-			var chatMenuVisible = !config.disableChat && app.user && parseInt(app.user.uid, 10);
+			var chatMenuVisible = app.user && parseInt(app.user.uid, 10);
 			var swapped = !!Storage.getItem('persona:menus:legacy-layout');
 			var margin = window.innerWidth;
 
@@ -285,19 +281,16 @@ $(document).ready(function () {
 				navSlideout.enable().toggle();
 			});
 
-			function loadNotifications() {
-				require(['notifications'], function (notifications) {
-					const notifList = $('#menu [data-section="notifications"] ul');
-					notifications.loadNotifications(notifList, function () {
-						notifList.find('.deco-none').removeClass('deco-none');
-						console.log(notifList.find('.deco-none'));
+			if (chatMenuVisible) {
+				chatsSlideout.on('opened', function loadNotifications() {
+					require(['notifications'], function (notifications) {
+						const notifList = $('#chats-menu [data-section="notifications"] ul');
+						notifications.loadNotifications(notifList, function () {
+							notifList.find('.deco-none').removeClass('deco-none');
+						});
 					});
 				});
-			}
-
-			navSlideout.on('opened', loadNotifications);
 
-			if (chatMenuVisible) {
 				navSlideout.on('beforeopen', function () {
 					chatsSlideout.close();
 					chatsSlideout.disable();
@@ -306,13 +299,16 @@ $(document).ready(function () {
 				});
 			}
 
-			$('#menu [data-section="navigation"] ul').html($('#main-nav').html() + ($('#search-menu').html() || '') + ($('#logged-out-menu').html() || ''));
+			$('#menu [data-section="navigation"] ul').html(
+				$('#main-nav').html() +
+				($('#logged-out-menu').html() || '')
+			);
 
-			$('#user-control-list').children().clone(true, true).appendTo($('#menu [data-section="profile"] ul'));
+			$('#user-control-list').children().clone(true, true).appendTo($('#chats-menu [data-section="profile"] ul'));
 
 			socket.on('event:user_status_change', function (data) {
 				if (parseInt(data.uid, 10) === app.user.uid) {
-					app.updateUserStatus($('#menu [component="user/status"]'), data.status);
+					app.updateUserStatus($('#chats-menu [component="user/status"]'), data.status);
 					navSlideout.close();
 				}
 			});
@@ -344,6 +340,27 @@ $(document).ready(function () {
 					});
 			}
 
+			const searchInputEl = $('.navbar-header .navbar-search input[name="term"]');
+			const searchButton = $('.navbar-header .navbar-search button[type="button"]');
+			searchButton.off('click').on('click', function () {
+				if (!config.loggedIn && !app.user.privileges['search:content']) {
+					alerts.alert({
+						message: '[[error:search-requires-login]]',
+						timeout: 3000,
+					});
+					ajaxify.go('login');
+					return false;
+				}
+
+				searchButton.addClass('hidden');
+				searchInputEl.removeClass('hidden').focus();
+				searchInputEl.off('blur').on('blur', function () {
+					searchInputEl.addClass('hidden');
+					searchButton.removeClass('hidden');
+				});
+				return false;
+			});
+
 			// add a checkbox in the user settings page
 			// so users can swap the sides the menus appear on
 

package/templates/account/blocks.tpl

@@ -1,35 +1,35 @@
-<div class="account">
-	<!-- IMPORT partials/account/header.tpl -->
-
-	<div class="users row">
-		<h1>[[pages:account/blocks, {username}]]</h1>
-
-		<div class="col-sm-8 col-xs-12">
-			<ul id="users-container" class="users-container" data-nextstart="{nextStart}">
-				<!-- IMPORT partials/users_list.tpl -->
-			</ul>
-			<div class="alert alert-warning text-center"<!-- IF users.length --> style="display: none;"<!-- END -->>[[user:has_no_blocks]]</div>
-			<!-- IMPORT partials/paginator.tpl -->
-		</div>
-		<div class="col-sm-4 col-xs-12">
-			<div class="panel panel-default">
-				<div class="panel-body form">
-					<div class="form-group">
-						<label for="user-search">[[users:search]]</label>
-						<input class="form-control" type="text" id="user-search" placeholder="[[users:enter_username]]" />
-						<ul class="block-edit list-group">
-							{{{ each edit }}}
-							<li class="list-group-item clearfix">
-								<button class="btn btn-sm btn-primary pull-right" data-uid="{../uid}" data-action="toggle">[[user:block_toggle]]</button>
-								<div class="pull-left">
-									<a href="{config.relative_path}/uid/{../uid}">{buildAvatar(edit, "sm", true)} {../username}</a>
-								</div>
-							</li>
-							{{{ end }}}
-						</ul>
-					</div>
-				</div>
-			</div>
-		</div>
-	</div>
+<div class="account">
+	<!-- IMPORT partials/account/header.tpl -->
+
+	<div class="users row">
+		<h1>[[pages:account/blocks, {username}]]</h1>
+
+		<div class="col-sm-8 col-xs-12">
+			<ul id="users-container" class="users-container" data-nextstart="{nextStart}">
+				<!-- IMPORT partials/users_list.tpl -->
+			</ul>
+			<div class="alert alert-warning text-center"<!-- IF users.length --> style="display: none;"<!-- END -->>[[user:has_no_blocks]]</div>
+			<!-- IMPORT partials/paginator.tpl -->
+		</div>
+		<div class="col-sm-4 col-xs-12">
+			<div class="panel panel-default">
+				<div class="panel-body form">
+					<div class="form-group">
+						<label for="user-search">[[users:search]]</label>
+						<input class="form-control" type="text" id="user-search" placeholder="[[users:enter_username]]" />
+						<ul class="block-edit list-group">
+							{{{ each edit }}}
+							<li class="list-group-item clearfix">
+								<button class="btn btn-sm btn-primary pull-right" data-uid="{../uid}" data-action="toggle">[[user:block_toggle]]</button>
+								<div class="pull-left">
+									<a href="{config.relative_path}/uid/{../uid}">{buildAvatar(edit, "sm", true)} {../username}</a>
+								</div>
+							</li>
+							{{{ end }}}
+						</ul>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
 </div>