Revert "rref #5392. Move messaging to separate component"

This reverts commit 6615b38381360f018c00b9ff608f2baa2e267be7.

Revert "rref #5392. Move messaging to separate component"
This reverts commit 6615b38381360f018c00b9ff608f2baa2e267be7.
470a5726 · Vladimir Baranov · 4ca22795 · 470a5726 · 470a5726 · 470a5726
Commit 470a5726 authored Jul 21, 2016 by Vladimir Baranov
5 changed files
--- a/app/components/messaging/messaging.js
+++ b/app/components/messaging/messaging.js
@@ -134,6 +134,7 @@ angular.module("ulakbus.messaging")
                    $scope.hidden = true;
                };
                function selectChannel(channelKey){
                    $scope.loadingChannel = true;
                    return MessagingService.show_channel(channelKey).then(function(result){

--- a/app/components/messaging/messaging_forms.js
+++ b/app/components/messaging/messaging_forms.js
--- a/app/components/messaging/messaging_service.js
+++ b/app/components/messaging/messaging_service.js
--- a/app/components/messaging/templates/index.html
+++ b/app/components/messaging/templates/index.html
@@ -21,7 +21,6 @@
            </div>
            <ng-include src="'components/messaging/templates/conversation.html'"></ng-include>
            <div class="popup-placeholder"></div>

--- a/app/shared/directives.js
+++ b/app/shared/directives.js
@@ -739,4 +739,3 @@ angular.module('ulakbus')
            }
        }
    });