liweichun
/
my-bookmark
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:luchenqun/my-bookmark

This commit is contained in:
luchenqun 2018-04-03 17:33:15 +08:00
parent 95858ee800 68118a2677
commit 17902fbb9b
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
public/scripts/controllers/tags-controller.js
View File

@ -239,21 +239,18 @@ app.controller('tagsCtr', ['$scope', '$filter', '$window', '$stateParams', '$tim
dataService.clipboard(url);
}
$scope.toggleMode = function () {
$scope.editMode = !$scope.editMode;
$scope.toggleMode = function (mode) {
$scope.editMode = mode;
if (!$scope.editMode) {
getTags({});
} else {
$('.js-edit').transition('hide'); // 没装完逼之前，不允许切换编辑模式，否则动画模式乱了。
$('.js-tags-table').transition('hide');
$('.js-tag-costomTag').transition('hide');
$('.stackable.cards .card').transition('hide');
$('.stackable.cards .card').transition({
animation: dataService.animation(),
reverse: 'auto', // default setting
interval: 50,
onComplete: function () {
$('.js-edit').transition('show');
}
interval: 50
});
}
}
@ -543,7 +540,7 @@ app.controller('tagsCtr', ['$scope', '$filter', '$window', '$stateParams', '$tim
getTags({});
}
});
setTimeout(() => {
$('.js-tag-label .ui.label .icon').popup();
}, 3000);

4
public/views/tags.html
View File

@ -19,7 +19,7 @@
<div class="two wide column js-tag-label">
<div class="ui small label">
<i class="plus icon" data-content="点击添加分类" data-position="top center" ng-click="showAddTag()"></i>
<i class="pencil alternate icon" data-content="点击进入分类编辑模式" data-position="top center" ng-click="toggleMode()"></i>
<i class="pencil alternate icon" data-content="点击进入分类编辑模式" data-position="top center" ng-click="toggleMode(true)"></i>
<i class="table icon" style="margin-right:0px;" data-content="点击以条目显示" data-position="top center" ng-show="showMode=='table'" ng-click="toggleShowMode('item')"></i>
<i class="list icon" style="margin-right:0px;" data-content="点击以表格显示" data-position="top center" ng-show="showMode=='item'" ng-click="toggleShowMode('table')"></i>
</div>
@ -34,7 +34,7 @@
<img src="./images/add-tag.png">
</div>
</div>
<div class="card" style="background-color:#F5F5F5;" ng-click="toggleMode()" data-tooltip="退出编辑模式">
<div class="card" style="background-color:#F5F5F5;" ng-click="toggleMode(false)" data-tooltip="退出编辑模式">
<div class="image">
<img src="./images/back-tag.png">
</div>