From f7f483b9915de7785c1272315715074b41c525fc Mon Sep 17 00:00:00 2001
From: luchenqun <luchenqun@qq.com>
Date: Wed, 16 Nov 2016 23:06:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=A7=8B=E5=86=99=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=8C=E5=B0=86javascript=E5=88=9D?=
 =?UTF-8?q?=E5=A7=8B=E5=8C=96=E7=9A=84=E9=83=BD=E8=BD=AC=E4=B8=BA=E4=BA=86?=
 =?UTF-8?q?=E6=8C=87=E4=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/index.html                             |  1 +
 .../controllers/bookmarks-controller.js       |  3 +-
 public/scripts/controllers/edit-controller.js |  4 +-
 .../scripts/controllers/menus-controller.js   |  5 +-
 .../scripts/controllers/search-controller.js  |  2 +-
 .../scripts/directives/js-init-directive.js   | 51 +++++++++++
 public/views/edit.html                        |  2 +-
 public/views/menus.html                       |  4 +-
 public/views/search.html                      | 85 +++++++++++++++++--
 9 files changed, 143 insertions(+), 14 deletions(-)
 create mode 100644 public/scripts/directives/js-init-directive.js

diff --git a/public/index.html b/public/index.html
index f73a264..07b2e68 100644
--- a/public/index.html
+++ b/public/index.html
@@ -35,6 +35,7 @@
         <script src="/scripts/directives/edit-directive.js"></script>
         <script src="/scripts/directives/menus-directive.js"></script>
         <script src="/scripts/directives/element-render-finish-directive.js"></script>
+        <script src="/scripts/directives/js-init-directive.js"></script>
         <script src="/scripts/controllers/bookmarks-controller.js"></script>
         <script src="/scripts/controllers/home-controller.js"></script>
         <script src="/scripts/controllers/login-controller.js"></script>
diff --git a/public/scripts/controllers/bookmarks-controller.js b/public/scripts/controllers/bookmarks-controller.js
index 45b52fb..15b12e8 100644
--- a/public/scripts/controllers/bookmarks-controller.js
+++ b/public/scripts/controllers/bookmarks-controller.js
@@ -58,6 +58,7 @@ app.controller('bookmarksCtr', ['$scope', '$state', '$stateParams', '$filter', '
     });
 
     pubSubService.subscribe('EditCtr.inserBookmarsSuccess', $scope, function(event, params) {
+        params.showStyle = $scope.showStyle;
         console.log('subscribe EditCtr.inserBookmarsSuccess', params);
         getBookmarks(params);
     });
@@ -74,7 +75,7 @@ app.controller('bookmarksCtr', ['$scope', '$state', '$stateParams', '$filter', '
             .catch((err) => console.log('getBookmarks err', err));
     }
 
-    $scope.$on('elementRenderFinished', function(elementRenderFinishedEvent) {
+    $scope.$on('viewContentLoaded', function(elementRenderFinishedEvent) {
         $('.ui.dropdown').dropdown();
         $('.ui.calendar.js-date-begin').calendar({
             type: 'date',
diff --git a/public/scripts/controllers/edit-controller.js b/public/scripts/controllers/edit-controller.js
index e3292de..841782a 100644
--- a/public/scripts/controllers/edit-controller.js
+++ b/public/scripts/controllers/edit-controller.js
@@ -153,8 +153,8 @@ app.controller('editCtr', ['$scope', '$state', '$timeout', 'bookmarkService', 'p
     }
 
     // 元素构造完成之后，开始使用jquery初始化
-    $scope.$on('elementRenderFinished', function(elementRenderFinishedEvent) {
-        console.log('edit ui dropdown elementRenderFinished')
+    $scope.$on('viewContentLoaded', function(elementRenderFinishedEvent) {
+        console.log('edit ui dropdown viewContentLoaded')
         $('.ui.modal.js-add-bookmark .ui.dropdown').removeClass('loading');
         $('.ui.dropdown').dropdown({
             forceSelection: false,
diff --git a/public/scripts/controllers/menus-controller.js b/public/scripts/controllers/menus-controller.js
index 9bbaded..f7cef79 100644
--- a/public/scripts/controllers/menus-controller.js
+++ b/public/scripts/controllers/menus-controller.js
@@ -74,8 +74,9 @@ app.controller('menuCtr', ['$scope', '$stateParams', '$state', 'pubSubService',
     }
 
     // 元素构造完成之后，开始使用jquery初始化
-    $scope.$on('elementRenderFinished', function(elementRenderFinishedEvent) {
-        console.log('menus elementRenderFinished')
+
+    $scope.$on('viewContentLoaded', function(elementRenderFinishedEvent) {
+        console.log('menus viewContentLoaded')
         $('.js-bookmark-dropdown').dropdown({
             action: 'hide',
         });
diff --git a/public/scripts/controllers/search-controller.js b/public/scripts/controllers/search-controller.js
index 1148d8d..707daa5 100644
--- a/public/scripts/controllers/search-controller.js
+++ b/public/scripts/controllers/search-controller.js
@@ -47,7 +47,7 @@ app.controller('searchCtr', ['$scope', '$state', '$stateParams', '$filter', '$wi
             .catch((err) => console.log('getBookmarks err', err));
     }
 
-    $scope.$on('elementRenderFinished', function(elementRenderFinishedEvent) {
+    $scope.$on('viewContentLoaded', function(elementRenderFinishedEvent) {
         $('.ui.dropdown').dropdown();
         $('.ui.calendar.js-date-begin').calendar({
             type: 'date',
diff --git a/public/scripts/directives/js-init-directive.js b/public/scripts/directives/js-init-directive.js
new file mode 100644
index 0000000..bb175d3
--- /dev/null
+++ b/public/scripts/directives/js-init-directive.js
@@ -0,0 +1,51 @@
+app.directive('jsDataBeginInit', function($compile) {
+    return {
+        restrict: 'A',
+        link: function($scope, $element, $attrs) {
+            $('.ui.calendar.js-date-begin').calendar({
+                type: 'date',
+                formatter: {
+                    date: function(date, settings) {
+                        if (!date) return '';
+                        var day = date.getDate();
+                        var month = date.getMonth() + 1;
+                        var year = date.getFullYear();
+                        return year + '/' + month + '/' + day;
+                    }
+                },
+                endCalendar: $('.ui.calendar.js-date-end')
+            });
+        },
+    };
+});
+
+
+app.directive('jsDataEndInit', function($compile) {
+    return {
+        restrict: 'A',
+        link: function($scope, $element, $attrs) {
+            $('.ui.calendar.js-date-end').calendar({
+                type: 'date',
+                formatter: {
+                    date: function(date, settings) {
+                        if (!date) return '';
+                        var day = date.getDate();
+                        var month = date.getMonth() + 1;
+                        var year = date.getFullYear();
+                        return year + '/' + month + '/' + day;
+                    }
+                },
+                startCalendar: $('.ui.calendar.js-date-begin')
+            });
+        },
+    };
+});
+
+app.directive('jsDropdownInit', function($compile) {
+    return {
+        restrict: 'A',
+        link: function($scope, $element, $attrs) {
+            $('.ui.dropdown').dropdown();
+        },
+    };
+});
diff --git a/public/views/edit.html b/public/views/edit.html
index 13acdaa..ffff8f8 100644
--- a/public/views/edit.html
+++ b/public/views/edit.html
@@ -19,7 +19,7 @@
                     <div class="eight wide field" ng-class="{error:tagsError }">
                         <select class="ui fluid search dropdown js-tags" multiple="">
                             <option value="">选择已有分类，可以搜索已有标签，最多选择三个</option>
-                            <option value="{{ tag.id }}" ng-repeat="tag in tags" on-finish-render-filters>{{ tag.name }}</option>
+                            <option value="{{ tag.id }}" ng-repeat="tag in tags">{{ tag.name }}</option>
                         </select>
                     </div>
                     <div class="eight wide field">
diff --git a/public/views/menus.html b/public/views/menus.html
index 8a62f46..cf88082 100644
--- a/public/views/menus.html
+++ b/public/views/menus.html
@@ -1,6 +1,6 @@
 <div class="js-menu" ng-controller="menuCtr">
     <div class="ui large menu js-login-in" ng-if="login">
-        <a class="item" ng-class="{selected:$index===selectLoginIndex}" ui-sref="{{ menu.uiSref }}" ui-sref-opts="{reload: true}" ng-repeat="menu in loginMenus" on-finish-render-filters>
+        <a class="item" ng-class="{selected:$index===selectLoginIndex}" ui-sref="{{ menu.uiSref }}" ui-sref-opts="{reload: true}" ng-repeat="menu in loginMenus">
             <div>{{ menu.title }}</div>
             <div class="ui floating simple dropdown icon js-bookmark-dropdown" ng-if="$index==0" ng-click="$event.stopPropagation();">
                 <i class="dropdown icon"></i>
@@ -45,6 +45,6 @@
         </div>
     </div>
     <div class="ui large menu js-not-login-in" ng-if="!login">
-        <a class="item" ng-class="{selected:$index==selectNotLoginIndex}" ui-sref="{{ menu.uiSref}}" ui-sref-opts="{reload: true}" ng-click="selectMenu($index, login)" ng-repeat="menu in notLoginMenus" on-finish-render-filters>{{ menu.title}}</a>
+        <a class="item" ng-class="{selected:$index==selectNotLoginIndex}" ui-sref="{{ menu.uiSref}}" ui-sref-opts="{reload: true}" ng-click="selectMenu($index, login)" ng-repeat="menu in notLoginMenus">{{ menu.title}}</a>
     </div>
 </div>
diff --git a/public/views/search.html b/public/views/search.html
index 01b1eb7..114dca9 100644
--- a/public/views/search.html
+++ b/public/views/search.html
@@ -1,5 +1,80 @@
-<div class="ui small menu js-search-detail" ng-show="showSearch" ng-repeat="justSureRendered in [1]" on-finish-render-filters>
-    <div class="ui dropdown item">
+<div class="ui grid">
+    <div class="two wide column">
+        <div class="ui dropdown" js-dropdown-init>
+            <div class="text">自己书签</div>
+            <i class="dropdown icon"></i>
+            <div class="menu">
+                <div class="item">自己书签</div>
+                <div class="item">全站书签</div>
+            </div>
+        </div>
+    </div>
+    <div class="two wide column">
+        <div class="ui dropdown item" js-dropdown-init>
+            <div class="text">创建时间不限</div>
+            <i class="dropdown icon"></i>
+            <div class="menu">
+                <div class="item">时间不限</div>
+                <div class="item">一天内</div>
+                <div class="item">一周内</div>
+                <div class="item">一月内</div>
+                <div class="item">一年内</div>
+                <div class="divider"></div>
+                <div class="header">自定义</div>
+                <div class="ui calendar js-date-begin" js-data-begin-init>
+                    <div class="ui transparent input left icon">
+                        <i class="calendar icon"></i>
+                        <input type="text" placeholder="开始日期" ng-model="dateBegin">
+                    </div>
+                </div>
+                <div class="ui calendar js-date-end" js-data-end-init>
+                    <div class="ui transparent input left icon">
+                        <i class="calendar icon"></i>
+                        <input type="text" placeholder="结束日期" ng-model="dateEnd">
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="two wide column">
+        <div class="ui dropdown item" js-dropdown-init>
+            <div class="text">点击次数不限</div>
+            <i class="dropdown icon"></i>
+            <div class="menu">
+                <div class="item">自己书签</div>
+                <div class="item">全站书签</div>
+            </div>
+        </div>
+    </div>
+    <div class="three wide column">
+        <div class="ui dropdown item" js-dropdown-init>
+            <div class="text">点击时间不限</div>
+            <i class="dropdown icon"></i>
+            <div class="menu">
+                <div class="item">自己书签</div>
+                <div class="item">全站书签</div>
+            </div>
+        </div>
+    </div>
+    <div class="three wide column">
+        <div class="ui transparent icon input">
+            <input class="prompt" type="text" placeholder="用户账号" ng-model="username">
+        </div>
+    </div>
+    <div class="two wide column">
+        <div class="ui transparent input">
+            <input type="text" placeholder="标题，链接，分类" ng-model="searchWord">
+        </div>
+    </div>
+    <div class="one wide column">
+        <i class="search icon" title="搜索" ng-click="search()"></i>
+    </div>
+    <div class="one wide column">
+        <i class="space shuttle icon" title="隐藏搜索工具"></i>
+    </div>
+</div>
+<div class="ui small menu js-search-detail" ng-show="false">
+    <div class="ui dropdown item" js-dropdown-init>
         <div class="text">搜索范围</div>
         <i class="dropdown icon"></i>
         <div class="menu">
@@ -8,7 +83,7 @@
         </div>
     </div>
     <div class="item" style="width:136px;">
-        <div class="ui calendar js-date-begin">
+        <div class="ui calendar js-date-begin" js-data-begin-init>
             <div class="ui transparent input left icon">
                 <i class="calendar icon"></i>
                 <input type="text" placeholder="开始日期" ng-model="dateBegin">
@@ -16,14 +91,14 @@
         </div>
     </div>
     <div class="item" style="width:136px;">
-        <div class="ui calendar js-date-end">
+        <div class="ui calendar js-date-end" js-data-end-init>
             <div class="ui transparent input left icon">
                 <i class="calendar icon"></i>
                 <input type="text" placeholder="结束日期" ng-model="dateEnd">
             </div>
         </div>
     </div>
-    <div class="ui dropdown item">
+    <div class="ui dropdown item" js-dropdown-init>
         <div class="text">点击次数</div>
         <i class="dropdown icon"></i>
         <div class="menu">