From a3b179a4e707a262bf9b3267e2e69e5442cfa880 Mon Sep 17 00:00:00 2001
From: HelloWorld <HelloWorld@qq.com>
Date: Thu, 23 Apr 2020 08:25:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=BE=AE=E4=BF=A1=E5=88=B0?=
 =?UTF-8?q?=E7=83=AD=E9=97=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 view/index_index.html                         |   2 +-
 www/scripts/app-angular.js                    |   8 +-
 ...rticle-controller.js => hot-controller.js} |   4 +-
 www/scripts/services/data-service.js          |   4 +-
 www/views/{weixin-article.html => hot.html}   | 152 +++++++++---------
 5 files changed, 85 insertions(+), 85 deletions(-)
 rename www/scripts/controllers/{weixin-article-controller.js => hot-controller.js} (95%)
 rename www/views/{weixin-article.html => hot.html} (98%)

diff --git a/view/index_index.html b/view/index_index.html
index c0d3c9e..aa2c5b0 100644
--- a/view/index_index.html
+++ b/view/index_index.html
@@ -95,7 +95,7 @@
     <script src="scripts/controllers/edit-controller.js"></script>
     <script src="scripts/controllers/bookmark-info-controller.js"></script>
     <script src="scripts/controllers/search-controller.js"></script>
-    <script src="scripts/controllers/weixin-article-controller.js"></script>
+    <script src="scripts/controllers/hot-controller.js"></script>
     <script src="scripts/controllers/note-controller.js"></script>
     <script src="scripts/externe/semantic.min.js"></script>
     <script src="scripts/externe/calendar.min.js"></script>
diff --git a/www/scripts/app-angular.js b/www/scripts/app-angular.js
index 1090043..ae229ec 100644
--- a/www/scripts/app-angular.js
+++ b/www/scripts/app-angular.js
@@ -53,10 +53,10 @@ app.config(function ($stateProvider, $urlRouterProvider, $httpProvider) {
       templateUrl: 'views/bookmarks.html',
       controller: 'bookmarksCtr'
     })
-    .state('weixin-article', {
-      url: '/weixin-article',
-      templateUrl: 'views/weixin-article.html',
-      controller: 'weixinArticleCtr'
+    .state('hot', {
+      url: '/hot',
+      templateUrl: 'views/hot.html',
+      controller: 'hotCtr'
     })
     .state('note', {
       url: '/note',
diff --git a/www/scripts/controllers/weixin-article-controller.js b/www/scripts/controllers/hot-controller.js
similarity index 95%
rename from www/scripts/controllers/weixin-article-controller.js
rename to www/scripts/controllers/hot-controller.js
index a23a855..5ddf3fc 100644
--- a/www/scripts/controllers/weixin-article-controller.js
+++ b/www/scripts/controllers/hot-controller.js
@@ -1,5 +1,5 @@
-app.controller('weixinArticleCtr', ['$scope', '$state', '$sce', '$filter', '$window', '$timeout', '$document', 'pubSubService', 'dataService', function ($scope, $state, $sce, $filter, $window, $timeout, $document, pubSubService, dataService) {
-  console.log("Hello weixinArticleCtr...");
+app.controller('hotCtr', ['$scope', '$state', '$sce', '$filter', '$window', '$timeout', '$document', 'pubSubService', 'dataService', function ($scope, $state, $sce, $filter, $window, $timeout, $document, pubSubService, dataService) {
+  console.log("Hello hotCtr...");
   if (dataService.smallDevice()) {
     $window.location = "http://m.mybookmark.cn/#/tags";
     return;
diff --git a/www/scripts/services/data-service.js b/www/scripts/services/data-service.js
index 51058cc..d30ec52 100644
--- a/www/scripts/services/data-service.js
+++ b/www/scripts/services/data-service.js
@@ -23,7 +23,7 @@ app.factory('dataService', [function () {
       uiSref: 'note',
       title: '备忘'
     }, {
-      uiSref: 'weixin-article',
+      uiSref: 'hot',
       title: '热门'
     }, {
       uiSref: 'settings',
@@ -39,7 +39,7 @@ app.factory('dataService', [function () {
       uiSref: 'login',
       title: '登录'
     }, {
-      uiSref: 'weixin-article',
+      uiSref: 'hot',
       title: '热门'
     }],
     animationIndex: 0,
diff --git a/www/views/weixin-article.html b/www/views/hot.html
similarity index 98%
rename from www/views/weixin-article.html
rename to www/views/hot.html
index 565dc88..ba24405 100644
--- a/www/views/weixin-article.html
+++ b/www/views/hot.html
@@ -1,76 +1,76 @@
-<!-- 高度至少要设置1000，元素少时才能触发滚动条事件 -->
-<div class="ui segment js-hot-card js-weixin-articles">
-  <div class="ui container" style="cursor: default;">
-    <div class="ui label" style="margin: 3px 15px 8px 0px; cursor: default;" ng-class="{green:channel.id===channelId}" ng-repeat="channel in channels" ng-click="getWeixinArticles(channel.id, 1)">{{ channel.name }}</div>
-  </div>
-
-  <div class="ui massive text centered inline loader js-hot-loader" style="margin: 50px 0px 120px 0px;" ng-class="{active:loading, disabled:!loading}">
-    正在加载中...
-  </div>
-
-  <div class="ui divider" style="margin: 3px 0px 8px 0px;"></div>
-  <div class="ui five stackable cards" ng-if="!loading">
-    <div class="card" ng-repeat="bookmark in bookmarks" ng-mouseover="setHoverBookmark(bookmark)" ng-mouseleave="setHoverBookmark(null)">
-      <div class="content" style="max-height: 70px; cursor: pointer;" ng-click="detailBookmark(bookmark)">
-        <div class="description bookmarkTitle" title="{{bookmark.title}}">
-          {{bookmark.title}}
-        </div>
-      </div>
-      <div class="image hot-image" href="{{ bookmark.url }}" style="cursor: pointer;" ng-click="detailBookmark(bookmark)">
-        <img ng-src="{{bookmark.snap}}" err-src="{{bookmark.snap.replace('https://', 'http://')}}" />
-      </div>
-      <div class="extra content" ng-show="!bookmark.edit">
-        <img class="ui avatar image" style="width: 16px; height: 16px;" ng-src="{{bookmark.icon}}" />
-        <span class="sourceName" title="{{ bookmark.tagName }}">{{ bookmark.tagName }}</span>
-        <span class="clickCount" ng-if="bookmark.clickCount">·{{ bookmark.clickCount }}人收藏</span>
-        <i class="ellipsis horizontal icon right floated" style="margin-top: 6px;" ng-mouseover="bookmark.edit=true;"></i>
-      </div>
-      <div class="extra content" ng-show="bookmark.edit" ng-mouseleave="bookmark.edit=false;">
-        <img class="ui mini spaced image" style="width: 16px; height: 16px; margin: 0 8px; margin-top: 4px;" ng-src="./images/favorite.png" ng-click="favoriteBookmark(bookmark)" title="一键收藏" />
-        <img class="ui mini spaced image" style="width: 16px; height: 16px; margin: 0 8px; margin-top: 4px;" ng-src="./images/store-bookmark.png" ng-click="storeBookmark(bookmark)" title="转存到我的书签" />
-        <img class="ui mini spaced image" style="width: 16px; height: 16px; margin: 0 8px; margin-top: 4px;" ng-src="./images/copy.png" ng-click="copy(bookmark.url)" title="复制链接" />
-        <img class="ui mini spaced image" style="width: 16px; height: 16px; margin: 0 8px; margin-top: 4px;" ng-src="./images/detail.png" ng-click="detailBookmark(bookmark)" title="书签详情" />
-      </div>
-    </div>
-  </div>
-  <div class="ui longer modal js-weixin-content">
-    <i class="close icon" ng-click="close()"></i>
-    <div class="header">{{ bookmark.title }}</div>
-    <div class="scrolling content js-main-content">
-      <div class="ui center aligned container" style="margin: 10px 0px;">
-        <span style="color: #4383bf;" title="公众号名称">{{bookmark.tagName}}</span>
-        &nbsp;&nbsp;
-        <span title="公众号账号">{{bookmark.account}}</span>
-        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-        <span>{{bookmark.createdAt}}</span>
-      </div>
-      <div class="ui divider"></div>
-      <p ng-bind-html="bookmark.content"></p>
-      <div class="ui divider"></div>
-      <div class="ui container">
-        <img class="ui middle aligned mini image" ng-src="{{bookmark.icon}}" style="width: 16px; height: 16px; padding: 0; cursor: pointer;" ng-click="jumpToUrl(bookmark.url, bookmark.id)" title="点击跳转到原页面(如果过期，需要在微信中才能打开)" />
-        <span title="点击复制链接" ng-click="copy(bookmark.url)" class="urlSpan">{{bookmark.url}} </span>
-      </div>
-      <div class="ui divider"></div>
-      <div class="ui grid" ng-if="bookmark.content">
-        <div class="eight wide column">
-          <div style="float: left; cursor: pointer;" ng-click="detailBookmark(bookmarks[bookmark.index-1])" ng-if="bookmarks[bookmark.index-1]"><i class="chevron left icon"></i> {{ bookmarks[bookmark.index-1].title }}</div>
-        </div>
-        <div class="eight wide column">
-          <div style="float: right; cursor: pointer;" ng-click="detailBookmark(bookmarks[bookmark.index+1])" ng-if="bookmarks[bookmark.index+1]">{{ bookmarks[bookmark.index+1].title }} <i class="chevron right icon"></i></div>
-        </div>
-      </div>
-    </div>
-    <div class="actions">
-      <div class="ui green button" ng-click="close()">已阅</div>
-    </div>
-  </div>
-  <div class="ui grid">
-    <div class="four wide column">
-      <div ng-if="count" style="margin-top: 14px;">共计 {{count}} 个</div>
-    </div>
-    <div class="twelve wide column">
-      <pagination></pagination>
-    </div>
-  </div>
-</div>
+<!-- 高度至少要设置1000，元素少时才能触发滚动条事件 -->
+<div class="ui segment js-hot-card js-weixin-articles">
+  <div class="ui container" style="cursor: default;">
+    <div class="ui label" style="margin: 3px 15px 8px 0px; cursor: default;" ng-class="{green:channel.id===channelId}" ng-repeat="channel in channels" ng-click="getWeixinArticles(channel.id, 1)">{{ channel.name }}</div>
+  </div>
+
+  <div class="ui massive text centered inline loader js-hot-loader" style="margin: 50px 0px 120px 0px;" ng-class="{active:loading, disabled:!loading}">
+    正在加载中...
+  </div>
+
+  <div class="ui divider" style="margin: 3px 0px 8px 0px;"></div>
+  <div class="ui five stackable cards" ng-if="!loading">
+    <div class="card" ng-repeat="bookmark in bookmarks" ng-mouseover="setHoverBookmark(bookmark)" ng-mouseleave="setHoverBookmark(null)">
+      <div class="content" style="max-height: 70px; cursor: pointer;" ng-click="detailBookmark(bookmark)">
+        <div class="description bookmarkTitle" title="{{bookmark.title}}">
+          {{bookmark.title}}
+        </div>
+      </div>
+      <div class="image hot-image" href="{{ bookmark.url }}" style="cursor: pointer;" ng-click="detailBookmark(bookmark)">
+        <img ng-src="{{bookmark.snap}}" err-src="{{bookmark.snap.replace('https://', 'http://')}}" />
+      </div>
+      <div class="extra content" ng-show="!bookmark.edit">
+        <img class="ui avatar image" style="width: 16px; height: 16px;" ng-src="{{bookmark.icon}}" />
+        <span class="sourceName" title="{{ bookmark.tagName }}">{{ bookmark.tagName }}</span>
+        <span class="clickCount" ng-if="bookmark.clickCount">·{{ bookmark.clickCount }}人收藏</span>
+        <i class="ellipsis horizontal icon right floated" style="margin-top: 6px;" ng-mouseover="bookmark.edit=true;"></i>
+      </div>
+      <div class="extra content" ng-show="bookmark.edit" ng-mouseleave="bookmark.edit=false;">
+        <img class="ui mini spaced image" style="width: 16px; height: 16px; margin: 0 8px; margin-top: 4px;" ng-src="./images/favorite.png" ng-click="favoriteBookmark(bookmark)" title="一键收藏" />
+        <img class="ui mini spaced image" style="width: 16px; height: 16px; margin: 0 8px; margin-top: 4px;" ng-src="./images/store-bookmark.png" ng-click="storeBookmark(bookmark)" title="转存到我的书签" />
+        <img class="ui mini spaced image" style="width: 16px; height: 16px; margin: 0 8px; margin-top: 4px;" ng-src="./images/copy.png" ng-click="copy(bookmark.url)" title="复制链接" />
+        <img class="ui mini spaced image" style="width: 16px; height: 16px; margin: 0 8px; margin-top: 4px;" ng-src="./images/detail.png" ng-click="detailBookmark(bookmark)" title="书签详情" />
+      </div>
+    </div>
+  </div>
+  <div class="ui longer modal js-weixin-content">
+    <i class="close icon" ng-click="close()"></i>
+    <div class="header">{{ bookmark.title }}</div>
+    <div class="scrolling content js-main-content">
+      <div class="ui center aligned container" style="margin: 10px 0px;">
+        <span style="color: #4383bf;" title="公众号名称">{{bookmark.tagName}}</span>
+        &nbsp;&nbsp;
+        <span title="公众号账号">{{bookmark.account}}</span>
+        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+        <span>{{bookmark.createdAt}}</span>
+      </div>
+      <div class="ui divider"></div>
+      <p ng-bind-html="bookmark.content"></p>
+      <div class="ui divider"></div>
+      <div class="ui container">
+        <img class="ui middle aligned mini image" ng-src="{{bookmark.icon}}" style="width: 16px; height: 16px; padding: 0; cursor: pointer;" ng-click="jumpToUrl(bookmark.url, bookmark.id)" title="点击跳转到原页面(如果过期，需要在微信中才能打开)" />
+        <span title="点击复制链接" ng-click="copy(bookmark.url)" class="urlSpan">{{bookmark.url}} </span>
+      </div>
+      <div class="ui divider"></div>
+      <div class="ui grid" ng-if="bookmark.content">
+        <div class="eight wide column">
+          <div style="float: left; cursor: pointer;" ng-click="detailBookmark(bookmarks[bookmark.index-1])" ng-if="bookmarks[bookmark.index-1]"><i class="chevron left icon"></i> {{ bookmarks[bookmark.index-1].title }}</div>
+        </div>
+        <div class="eight wide column">
+          <div style="float: right; cursor: pointer;" ng-click="detailBookmark(bookmarks[bookmark.index+1])" ng-if="bookmarks[bookmark.index+1]">{{ bookmarks[bookmark.index+1].title }} <i class="chevron right icon"></i></div>
+        </div>
+      </div>
+    </div>
+    <div class="actions">
+      <div class="ui green button" ng-click="close()">已阅</div>
+    </div>
+  </div>
+  <div class="ui grid">
+    <div class="four wide column">
+      <div ng-if="count" style="margin-top: 14px;">共计 {{count}} 个</div>
+    </div>
+    <div class="twelve wide column">
+      <pagination></pagination>
+    </div>
+  </div>
+</div>