dgf 8 years ago
parent
commit
d8a7f1be32

+ 1 - 2
talkview/src/js/directive/currentmessage.js

@@ -147,7 +147,6 @@
 
             var replaceImage = function(content) {}
             var html = '';
-            var message = element;
             if (scope.msg.senderDisplayName === undefined || scope.msg.senderDisplayName == '')
                 scope.msg.senderDisplayName = scope.msg.sender;
             // 消息类型([1,文本消息],[2,图片消息],[3,文件消息], [4,位置消息],[5,语音消息])
@@ -254,7 +253,7 @@
             // 添加到文档中
             var newElement = angular.element($dom);
             element.append(newElement);
-            message.addEventListener('load', gotoBottom());
+            element.addEventListener('load', gotoBottom());
         }
     };
     /* @ngInject */

+ 6 - 4
talkview/src/js/directive/historymessages.js

@@ -114,7 +114,7 @@
 
             var replaceImage = function(content) {}
             var html = '';
-            var message = element;
+            var message = document.getElementById("loadmore");
             if (scope.msg.senderDisplayName === undefined || scope.msg.senderDisplayName == '')
                 scope.msg.senderDisplayName = scope.msg.sender;
             // 消息类型([1,文本消息],[2,图片消息],[3,文件消息], [4,位置消息],[5,语音消息])
@@ -186,7 +186,7 @@
             }
 
             if (getUserID()) {
-                var html_g = '<div class="feed-element" ng-cloak>' +
+                var html_g = '<div class="feed-element">' +
                     '<div class="media-body">' +
                     '<p><strong>' +
                     scope.msg.senderDisplayName +
@@ -196,7 +196,7 @@
                     '<div class="text-point"></div>' + html +
                     '</div></div></div>';
             } else {
-                var html_g = '<div class="feed-element" ng-cloak>' +
+                var html_g = '<div class="feed-element">' +
                     '<div class="media-body">' +
                     '<p><strong>' +
                     scope.msg.senderDisplayName +
@@ -213,7 +213,9 @@
             // 也可以用$scope.$new()创建继承的作用域
             var $dom = compileFn(scope);
             // 添加到文档中
-            angular.element(".loadmore").prepend($dom);
+            //angular.element("#loadmore").prepend($dom);
+            var newElement = angular.element($dom);
+            element.prepend(newElement);
             if (scope.count) {
                 gotoBottom();
                 message.addEventListener('load', window.scrollTo(0, document.body.scrollHeight));

+ 1 - 1
talkview/src/less/app.main.less

@@ -18,7 +18,7 @@
         color: #009BDB;
         font-size: 14px;
     }
-    >.loadmore {
+    #loadmore {
         margin-top: -5px;
     }
     #sendmessage {

+ 11 - 11
talkview/src/templates/messages.html

@@ -1,18 +1,18 @@
 <div class="full-client" ng-mouseover="scrollShow()">
     <div id="getMore"><a role="button"><small ng-click="getMore()">加载更多消息</small></a></div>
-    <div class="feed-activity-list p-l-xs p-t-xs p-r-xs loadmore" ng-cloak ng-repeat="item in historymessages track by $index" ng-history-msg="item" ng-app-content="appContent" ng-count="count" ng-height="height">
-        <!--<div class="feed-element" ng-repeat="item in historymessages track by $index">
-                <div class="media-body">
-                    <p>
-                        <strong>{{item.senderDisplayName === undefined || item.senderDisplayName == ''? item.sender : item.senderDisplayName}}</strong><small>-2017-2-6 15:57:17 {{item.ts}}</small>
-                    </p>
-                    <div class="well m-l-xs m-t-xs fit-content" ng-history-msg="item" ng-app-content="appContent">
-                        <div class="text-point"></div>
-                    </div>
+    <div class="feed-activity-list p-l-xs p-t-xs p-r-xs" ng-cloak id="loadmore" ng-repeat="item in historymessages track by $index" ng-history-msg="item" ng-app-content="appContent" ng-count="count" ng-height="height">
+        <!--<div class="feed-element">
+            <div class="media-body">
+                <p>
+                    <strong>{{item.senderDisplayName === undefined || item.senderDisplayName == ''? item.sender : item.senderDisplayName}}</strong><small>-2017-2-6 15:57:17 {{item.ts}}</small>
+                </p>
+                <div class="well m-l-xs m-t-xs fit-content" ng-history-msg="item" ng-app-content="appContent">
+                    <div class="text-point"></div>
                 </div>
-            </div>-->
+            </div>
+        </div>-->
     </div>
-    <div class="feed-activity-list p-l-xs p-t-xs p-r-xs sendmessage" ng-cloak id="sendmessage">
+    <div class="feed-activity-list p-l-xs p-t-xs p-r-xs" ng-cloak id="sendmessage">
         <div class="feed-element animate" ng-repeat="item in sendmessages track by $index">
             <div class="media-body" ng-current-msg="item" ng-app-content="appContent">
                 <!--<p>