传输文件

talkview/src/js/directive/currentmessage.js

@@ -91,15 +91,27 @@
                 content = content.replace(/(((((http|ftp|https|HTTP|FTP|HTTPS):\/\/)[\w\-_]+)|www|WWW|[0-9]+)(\.(?!gif|jpg|png|mp3)[\w\-_]+)+([\w\-\.,@?^=%:/~\+#]*[\w\-\@?^=%/~\+#\r\n]))/ig, function() {
                     var html = '';
                     var g = (/((((http|ftp|https|HTTP|FTP|HTTPS):\/\/)[\w\-_]+)(\.[\w\-_]+)+([\w\-\.,@?^=%:/~\+#]*[\w\-\@?^=%/~\+#\r\n]))/ig).exec(m[i]);
-                    if (g == null)
-                        html = '<a target="_blank" href="http://' + m[i] + '">' +
-                        m[i] +
-                        '</a>';
-                    else
-                        html = '<a target="_blank" href="' + m[i] + '">' +
-                        m[i] +
-                        '</a>';
-                    i = i + 1;
+                    if (getUserID()) {
+                        if (g == null)
+                            html = '<a style="color:white;text-decoration:underline;" target="_blank" href="http://' + m[i] + '">' +
+                            m[i] +
+                            '</a>';
+                        else
+                            html = '<a style="color:white;text-decoration:underline;" target="_blank" href="' + m[i] + '">' +
+                            m[i] +
+                            '</a>';
+                        i = i + 1;
+                    } else {
+                        if (g == null)
+                            html = '<a style="text-decoration:underline;" target="_blank" href="http://' + m[i] + '">' +
+                            m[i] +
+                            '</a>';
+                        else
+                            html = '<a style="text-decoration:underline;" target="_blank" href="' + m[i] + '">' +
+                            m[i] +
+                            '</a>';
+                        i = i + 1;
+                    }
                     return html;
                 });
                 return content;
@@ -113,19 +125,37 @@
                 html = '<span class="text-message">' + scope.msg.content + '</span>';
             } else if (scope.msg.contentType == 1) {
                 //var style = { style: "normal", weight: "normal" };
-                var style = scope.msg.style === "" || scope.msg.style === undefined ? {
-                    style: 'normal',
-                    weight: 'normal',
-                    size: 9,
-                    family: '微软雅黑',
-                    color: 0
-                } : _.assign({
-                    style: 'normal',
-                    weight: 'normal',
-                    size: 9,
-                    family: '微软雅黑',
-                    color: 0
-                }, JSON.parse(scope.msg.style));
+                if (getUserID()) {
+                    var style = scope.msg.style === "" || scope.msg.style === undefined ? {
+                        style: 'normal',
+                        weight: 'normal',
+                        size: 9,
+                        family: '微软雅黑',
+                        color: 16777215
+                    } : _.assign({
+                        style: 'normal',
+                        weight: 'normal',
+                        size: 9,
+                        family: '微软雅黑',
+                        color: 16777215
+                    }, JSON.parse(scope.msg.style));
+                    style.color = 16777215;
+                } else {
+                    var style = scope.msg.style === "" || scope.msg.style === undefined ? {
+                        style: 'normal',
+                        weight: 'normal',
+                        size: 9,
+                        family: '微软雅黑',
+                        color: 0
+                    } : _.assign({
+                        style: 'normal',
+                        weight: 'normal',
+                        size: 9,
+                        family: '微软雅黑',
+                        color: 0
+                    }, JSON.parse(scope.msg.style));
+                    style.color = 0;
+                }
                 html = '<span class="text-message"' + ' style="font:' + style.style + ' ' + style.weight + ' ' + style.size + 'pt' + ' ' + style.family + ';color:#' + _.padStart(style.color.toString(16), 6, '0') + '">' +
                     replaceSystemFace(scope.msg.content) + '</span>';
             } else if (scope.msg.contentType == 2) {
@@ -161,20 +191,19 @@
                     '</audio>' +
                     '</span>';
             }
-            console.log(html);
-            var newElement = angular.element(html);
+
+            if (getUserID()) {
+                var html_g = '<div class="wellself m-l-xs m-t-xs fit-content" >' +
+                    '<div class="text-point"></div>' + html +
+                    '</div>';
+            } else {
+                var html_g = '<div class="well m-l-xs m-t-xs fit-content" >' +
+                    '<div class="text-point"></div>' + html +
+                    '</div>';
+            }
+            console.log(html_g);
+            var newElement = angular.element(html_g);
             element.append(newElement);
-            console.log(getUserID());
-            // if (getUserID()) {
-            //     angular.element(".fit-content").removeClass("well");
-            //     angular.element(".fit-content").addClass("wellself");
-            // } else if (!getUserID()) {
-            //     angular.element(".fit-content").removeClass("wellself");
-            //     angular.element(".fit-content").addClass("well");
-            // }
-            // $(function() {
-            //     $("img.lazy").lazyload();
-            // });
             message.addEventListener('load', gotoBottom());
         }
     }

talkview/src/js/directive/historymessages.js

@@ -80,15 +80,27 @@
                 content = content.replace(/(((((http|ftp|https|HTTP|FTP|HTTPS):\/\/)[\w\-_]+)|www|WWW|[0-9]+)(\.(?!gif|jpg|png|mp3)[\w\-_]+)+([\w\-\.,@?^=%:/~\+#]*[\w\-\@?^=%/~\+#\r\n]))/ig, function() {
                     var html = '';
                     var g = (/((((http|ftp|https|HTTP|FTP|HTTPS):\/\/)[\w\-_]+)(\.[\w\-_]+)+([\w\-\.,@?^=%:/~\+#]*[\w\-\@?^=%/~\+#\r\n]))/ig).exec(m[i]);
-                    if (g == null)
-                        html = '<a target="_blank" href="http://' + m[i] + '">' +
-                        m[i] +
-                        '</a>';
-                    else
-                        html = '<a target="_blank" href="' + m[i] + '">' +
-                        m[i] +
-                        '</a>';
-                    i = i + 1;
+                    if (getUserID()) {
+                        if (g == null)
+                            html = '<a style="color:white;text-decoration:underline;" target="_blank" href="http://' + m[i] + '">' +
+                            m[i] +
+                            '</a>';
+                        else
+                            html = '<a style="color:white;text-decoration:underline;" target="_blank" href="' + m[i] + '">' +
+                            m[i] +
+                            '</a>';
+                        i = i + 1;
+                    } else {
+                        if (g == null)
+                            html = '<a style="text-decoration:underline;" target="_blank" href="http://' + m[i] + '">' +
+                            m[i] +
+                            '</a>';
+                        else
+                            html = '<a style="text-decoration:underline;" target="_blank" href="' + m[i] + '">' +
+                            m[i] +
+                            '</a>';
+                        i = i + 1;
+                    }
                     return html;
                 });
                 return content;
@@ -102,19 +114,37 @@
                 html = '<span class="text-message">' + scope.msg.content + '</span>';
             } else if (scope.msg.contentType == 1) {
                 //var style = { style: "normal", weight: "normal" };
-                var style = scope.msg.style === "" || scope.msg.style === undefined ? {
-                    style: 'normal',
-                    weight: 'normal',
-                    size: 9,
-                    family: '微软雅黑',
-                    color: 0
-                } : _.assign({
-                    style: 'normal',
-                    weight: 'normal',
-                    size: 9,
-                    family: '微软雅黑',
-                    color: 0
-                }, JSON.parse(scope.msg.style));
+                if (getUserID()) {
+                    var style = scope.msg.style === "" || scope.msg.style === undefined ? {
+                        style: 'normal',
+                        weight: 'normal',
+                        size: 9,
+                        family: '微软雅黑',
+                        color: 16777215
+                    } : _.assign({
+                        style: 'normal',
+                        weight: 'normal',
+                        size: 9,
+                        family: '微软雅黑',
+                        color: 16777215
+                    }, JSON.parse(scope.msg.style));
+                    style.color = 16777215;
+                } else {
+                    var style = scope.msg.style === "" || scope.msg.style === undefined ? {
+                        style: 'normal',
+                        weight: 'normal',
+                        size: 9,
+                        family: '微软雅黑',
+                        color: 0
+                    } : _.assign({
+                        style: 'normal',
+                        weight: 'normal',
+                        size: 9,
+                        family: '微软雅黑',
+                        color: 0
+                    }, JSON.parse(scope.msg.style));
+                    style.color = 0;
+                }
                 html = '<span class="text-message"' + ' style="font:' + style.style + ' ' + style.weight + ' ' + style.size + 'pt' + ' ' + style.family + ';color:#' + _.padStart(style.color.toString(16), 6, '0') + '">' +
                     replaceSystemFace(scope.msg.content) + '</span>';
             } else if (scope.msg.contentType == 2) {
@@ -147,25 +177,29 @@
                     '</span>';
             }
 
-            var html_g = '<div class="feed-element">' +
-                '<div class="media-body">' +
-                '<p><strong>' +
-                scope.msg.senderDisplayName +
-                '</strong><small class="text-muted">-' +
-                getTime(scope.msg) + '</small></p>' +
-                '<div class="well m-l-xs m-t-xs fit-content" >' +
-                '<div class="text-point"></div>' + html +
-                '</div></div></div>';
-
+            if (getUserID()) {
+                var html_g = '<div class="feed-element">' +
+                    '<div class="media-body">' +
+                    '<p><strong>' +
+                    scope.msg.senderDisplayName +
+                    '</strong><small class="text-muted">-' +
+                    getTime(scope.msg) + '</small></p>' +
+                    '<div class="wellself m-l-xs m-t-xs fit-content" >' +
+                    '<div class="text-point"></div>' + html +
+                    '</div></div></div>';
+            } else {
+                var html_g = '<div class="feed-element">' +
+                    '<div class="media-body">' +
+                    '<p><strong>' +
+                    scope.msg.senderDisplayName +
+                    '</strong><small class="text-muted">-' +
+                    getTime(scope.msg) + '</small></p>' +
+                    '<div class="well m-l-xs m-t-xs fit-content" >' +
+                    '<div class="text-point"></div>' + html +
+                    '</div></div></div>';
+            }
             angular.element("#loadmore").prepend(html_g);
             console.log(html_g);
-            // if (getUserID()) {
-            //     angular.element(".fit-content").removeClass("well");
-            //     angular.element(".fit-content").addClass("wellself");
-            // } else if (!getUserID()) {
-            //     angular.element(".fit-content").removeClass("wellself");
-            //     angular.element(".fit-content").addClass("well");
-            // }
             if (scope.count) {
                 message.addEventListener('load', gotoBottom());
             }

talkview/src/less/app.main.less

@@ -114,7 +114,7 @@
             border-left: solid 7px;
             border-color:transparent transparent #009BDB transparent;
         }
-    }
+}
 .fit-content {
     width: fit-content;
 }

talkview/src/templates/messages.html

@@ -13,14 +13,14 @@
             </div>-->
     </div>
     <div class="feed-activity-list p-l-xs p-t-xs p-r-xs" id="sendmessage">
-        <div class="feed-element animate" ng-repeat="item in sendmessages track by $index">
+        <div class="feed-element animate" ng-repeat="item in sendmessages track by $index" ng-current-msg="item" ng-app-content="appContent" id="message">
             <div class="media-body">
                 <p>
                     <strong>{{item.senderDisplayName === undefined || item.senderDisplayName == ''? item.sender : item.senderDisplayName}}</strong><small class="text-muted">-{{getTime(item)}}</small>
                 </p>
-                <div class="well m-l-xs m-t-xs fit-content" ng-current-msg="item" ng-app-content="appContent" id="message">
+                <!--<div class="well m-l-xs m-t-xs fit-content">
                     <div class="text-point"></div>
-                </div>
+                </div>-->
             </div>
         </div>
         <!--<a role="button" ng-click="addClick({name:'web', time:'2016-06-24 15:55', message:'hello world'})">test</a>-->