X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/fe0b122aca89dbad9741a8ec607b20621d009e39..refs/pull/154/head:/resources/assets/js/global.js diff --git a/resources/assets/js/global.js b/resources/assets/js/global.js index 90b03e856..44562abd0 100644 --- a/resources/assets/js/global.js +++ b/resources/assets/js/global.js @@ -5,9 +5,9 @@ var angular = require('angular'); var ngResource = require('angular-resource'); var ngAnimate = require('angular-animate'); var ngSanitize = require('angular-sanitize'); +require('angular-ui-sortable'); -var ngApp = angular.module('bookStack', ['ngResource', 'ngAnimate', 'ngSanitize']); - +var ngApp = angular.module('bookStack', ['ngResource', 'ngAnimate', 'ngSanitize', 'ui.sortable']); // Global Event System var Events = { @@ -54,10 +54,10 @@ $.expr[":"].contains = $.expr.createPseudo(function (arg) { // Global jQuery Elements $(function () { - var notifications = $('.notification'); var successNotification = notifications.filter('.pos'); var errorNotification = notifications.filter('.neg'); + var warningNotification = notifications.filter('.warning'); // Notification Events window.Events.listen('success', function (text) { successNotification.hide(); @@ -66,6 +66,10 @@ $(function () { successNotification.show(); }, 1); }); + window.Events.listen('warning', function (text) { + warningNotification.find('span').text(text); + warningNotification.show(); + }); window.Events.listen('error', function (text) { errorNotification.find('span').text(text); errorNotification.show(); @@ -95,7 +99,7 @@ $(function () { scrollTop.style.display = 'block'; scrollTopShowing = true; setTimeout(() => { - scrollTop.style.opacity = 1; + scrollTop.style.opacity = 0.4; }, 1); } else if (scrollTopShowing && document.body.scrollTop < scrollTopBreakpoint) { scrollTop.style.opacity = 0; @@ -108,22 +112,11 @@ $(function () { // Common jQuery actions $('[data-action="expand-entity-list-details"]').click(function() { - $('.entity-list.compact').find('p').slideToggle(240); + $('.entity-list.compact').find('p').not('.empty-text').slideToggle(240); }); }); - -function elemExists(selector) { - return document.querySelector(selector) !== null; -} - -// TinyMCE editor -if (elemExists('#html-editor')) { - var tinyMceOptions = require('./pages/page-form'); - tinymce.init(tinyMceOptions); -} - // Page specific items -require('./pages/page-show'); \ No newline at end of file +require('./pages/page-show');