-
+
+
```
@@ -181,59 +508,32 @@ Example of a `direct-handler`:
var action = require('action');
//Bind a click handler to all .mySpecialButtons within #myContainer
-action.bindAction('#myContainer', 'click', '.mySendButton', function(evt) {
+action.bindAction('#myContainer', 'click', '.sendButton', function(evt) {
//this within a handler function always points to the triggered jQuery node
- client.post(this.data('action-url').then(function(resp) {...});
+ client.post(evt).then(function(resp) {...});
});
```
> TIP: Since humhub action binding is based on jquerys event delegation, you can use all event types of jquery.
-> TIP: In case of direct action-handlers, there is no need to define a action-handler like data-action-click="myHandler" on the trigger element.
-
> NOTE: The first argument of the bindAction should be the first static (never removed from dom or lazy loaded) parent node of all nodes you wish to bind. Too many delegated events to the `document` is a performance antipattern.
-Example registered `ajax-handler`:
-
-```html
-
-
-```
-
-```javascript
-//Somewhere within myModule
-action.registerAjaxHandler('humhub.modules.myModule.sendAjax', {
- success: function(response) {
- //My success handler
- },
- error: function(response) {
- //My error handler
- }
-}
-
-//No need to call bindAction, since data-action-click nodes are bound automatically
-``
-
Example a `namepace-handler`:
```html
-
+
```
-
-> TIP: The action handler will determine the action url and execute the provides success/error handler automatically
-
-> TIP: If you have multiple actions with different action urls you can specify `data-action-url-click`, `data-action-url-change`,...
-data-action-url is always used as fallback
-
-> TIP: The action module binds some default actions like click, dbclick and change to nodes with a data-action-'+module.text('activityEmpty')+'
@@ -13,13 +22,8 @@ $this->registerJsVar('activityInfoUrl', $infoUrl);
diff --git a/protected/humhub/modules/comment/tests/codeception/_support/_generated/FunctionalTesterActions.php b/protected/humhub/modules/comment/tests/codeception/_support/_generated/FunctionalTesterActions.php
index f6454d637a..38e4f428d9 100644
--- a/protected/humhub/modules/comment/tests/codeception/_support/_generated/FunctionalTesterActions.php
+++ b/protected/humhub/modules/comment/tests/codeception/_support/_generated/FunctionalTesterActions.php
@@ -1,5 +1,5 @@
- \yii\web\View::POS_END];
+
+ public $sourcePath = '@content/assets';
+ public $css = [];
+ public $js = [
+ 'js/humhub.content.container.js'
+ ];
+
+}
diff --git a/protected/humhub/modules/content/assets/js/humhub.content.container.js b/protected/humhub/modules/content/assets/js/humhub.content.container.js
new file mode 100644
index 0000000000..7f62f8cf62
--- /dev/null
+++ b/protected/humhub/modules/content/assets/js/humhub.content.container.js
@@ -0,0 +1,34 @@
+/**
+ * This module provides an api for handling content objects e.g. Posts, Polls...
+ *
+ * @type undefined|Function
+ */
+
+humhub.initModule('content.container', function (module, require, $) {
+ var client = require('client');
+
+ var follow = function(evt) {
+ var containerId = evt.$trigger.data('content-container-id');
+ client.post(evt).then(function(response) {
+ evt.$trigger.hide();
+ $('[data-content-container-id="'+containerId+'"].unfollowButton').addClass('animated bounceIn').show();
+ }).catch(function(e) {
+ module.log.error(e, true);
+ });
+ };
+
+ var unfollow = function(evt) {
+ var containerId = evt.$trigger.data('content-container-id');
+ client.post(evt).then(function(response) {
+ evt.$trigger.hide();
+ $('[data-content-container-id="'+containerId+'"].followButton').addClass('animated bounceIn').show();
+ }).catch(function(e) {
+ module.log.error(e, true);
+ });
+ };
+
+ module.export({
+ follow: follow,
+ unfollow: unfollow
+ });
+});
\ No newline at end of file
diff --git a/protected/humhub/modules/content/models/Content.php b/protected/humhub/modules/content/models/Content.php
index 681ca1e09d..f8cfba4e34 100644
--- a/protected/humhub/modules/content/models/Content.php
+++ b/protected/humhub/modules/content/models/Content.php
@@ -161,6 +161,8 @@ class Content extends \humhub\components\ActiveRecord
$this->created_by = Yii::$app->user->id;
}
}
+
+ $this->stream_sort_date = new \yii\db\Expression('NOW()');
if ($this->created_by == "")
throw new Exception("Could not save content without created_by!");
diff --git a/protected/humhub/modules/dashboard/controllers/DashboardController.php b/protected/humhub/modules/dashboard/controllers/DashboardController.php
index 262c8c3eec..2516482cbc 100644
--- a/protected/humhub/modules/dashboard/controllers/DashboardController.php
+++ b/protected/humhub/modules/dashboard/controllers/DashboardController.php
@@ -13,6 +13,8 @@ use Yii;
class DashboardController extends Controller
{
+
+ public $topMenuRoute = '/dashboard/dashboard';
public function init()
{
diff --git a/protected/humhub/modules/file/widgets/views/showFiles.php b/protected/humhub/modules/file/widgets/views/showFiles.php
index 22d9a8a5ea..9ac5c66bc1 100644
--- a/protected/humhub/modules/file/widgets/views/showFiles.php
+++ b/protected/humhub/modules/file/widgets/views/showFiles.php
@@ -13,7 +13,7 @@ $object = $this->context->object;
Latest activities'); ?>
-
applyFile($file)): ?>
- getUniqueId(); ?>" href="getUrl(); ?>#.jpeg" data-footer=''>
+ getUniqueId(); ?>" href="getUrl(); ?>#.jpeg">
; ?>)
diff --git a/protected/humhub/modules/space/views/create/create.php b/protected/humhub/modules/space/views/create/create.php
index 76bd7f590c..79f14186af 100644
--- a/protected/humhub/modules/space/views/create/create.php
+++ b/protected/humhub/modules/space/views/create/create.php
@@ -88,10 +88,10 @@ use yii\helpers\Url;
// change link arrow
$('#access-settings-link i').removeClass('fa-caret-down');
$('#access-settings-link i').addClass('fa-caret-right');
- })
+ });
// prevent enter key and simulate ajax button submit click
- $(document).ready(function () {
+ $(document).on('ready pjax:success', function () {
$(window).keydown(function (event) {
if (event.keyCode == 13) {
event.preventDefault();
diff --git a/protected/humhub/modules/space/widgets/views/header.php b/protected/humhub/modules/space/widgets/views/header.php
index 19800d4a7e..3941ec87a9 100755
--- a/protected/humhub/modules/space/widgets/views/header.php
+++ b/protected/humhub/modules/space/widgets/views/header.php
@@ -98,8 +98,7 @@ if ($space->isAdmin()) {
profileImage->hasImage()) : ?>
- '>
+
$space, 'width' => 140]); ?>
diff --git a/protected/humhub/modules/space/widgets/views/spaceNameColorInput.php b/protected/humhub/modules/space/widgets/views/spaceNameColorInput.php
index fb0eaa5959..1b6376b49f 100644
--- a/protected/humhub/modules/space/widgets/views/spaceNameColorInput.php
+++ b/protected/humhub/modules/space/widgets/views/spaceNameColorInput.php
@@ -28,7 +28,7 @@