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 @@
+
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 @@
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 @@
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 @@
-