1
0
mirror of https://github.com/BoostIo/Boostnote synced 2025-12-14 02:06:29 +00:00

clean up recipe

This commit is contained in:
Rokt33r
2015-06-25 19:28:36 +09:00
parent debfa6323b
commit c72b5449bd
9 changed files with 34 additions and 20 deletions

View File

@@ -89,7 +89,7 @@ angular.module('codexen')
} }
function searchRecipes () { function searchRecipes () {
vm.filtered = $filter('filter')(myRecipes, vm.search) vm.filtered = $filter('searchSnippets')(myRecipes, vm.search)
if (vm.search && vm.filtered && vm.filtered[0] && (!vm.recipeId || vm.recipeId !== vm.filtered[0].id)) { if (vm.search && vm.filtered && vm.filtered[0] && (!vm.recipeId || vm.recipeId !== vm.filtered[0].id)) {
$state.go('recipes.detail', {id: vm.filtered[0].id}) $state.go('recipes.detail', {id: vm.filtered[0].id})
} }

View File

@@ -51,23 +51,15 @@
<script src="directives/snippet-item.js"></script> <script src="directives/snippet-item.js"></script>
<script src="directives/tag-item.js"></script> <script src="directives/tag-item.js"></script>
<script src="directives/tag-list.js"></script> <script src="directives/tag-list.js"></script>
<script src="filters/from-now.js"></script>
<script src="filters/marked.js"></script>
<script src="filters/search-snippets.js"></script>
<script src="services/Modal.js"></script> <script src="services/Modal.js"></script>
<script src="services/Recipe.js"></script> <script src="services/Recipe.js"></script>
<script src="services/Settings.js"></script> <script src="services/Settings.js"></script>
<script src="services/Tag.js"></script> <script src="services/Tag.js"></script>
<script src="services/User.js"></script> <script src="services/User.js"></script>
<script src="filters/from-now.js"></script>
<script src="filters/marked.js"></script>
<script src="filters/search-snippets.js"></script>
<script src="controllers/directives/SideNavController.js"></script> <script src="controllers/directives/SideNavController.js"></script>
<script src="controllers/modals/DeleteRecipeModalController.js"></script>
<script src="controllers/modals/DeleteSnippetModalController.js"></script>
<script src="controllers/modals/EditRecipeModalController.js"></script>
<script src="controllers/modals/EditSnippetModalController.js"></script>
<script src="controllers/modals/ExpandRecipeModalController.js"></script>
<script src="controllers/modals/NewRecipeModalController.js"></script>
<script src="controllers/modals/NewSnippetModalController.js"></script>
<script src="controllers/modals/SelectSnippetModalController.js"></script>
<script src="controllers/states/AuthRegisterController.js"></script> <script src="controllers/states/AuthRegisterController.js"></script>
<script src="controllers/states/AuthSignInController.js"></script> <script src="controllers/states/AuthSignInController.js"></script>
<script src="controllers/states/HomeController.js"></script> <script src="controllers/states/HomeController.js"></script>
@@ -76,6 +68,14 @@
<script src="controllers/states/SettingsController.js"></script> <script src="controllers/states/SettingsController.js"></script>
<script src="controllers/states/SnippetsDetailController.js"></script> <script src="controllers/states/SnippetsDetailController.js"></script>
<script src="controllers/states/SnippetsListController.js"></script> <script src="controllers/states/SnippetsListController.js"></script>
<script src="controllers/modals/DeleteRecipeModalController.js"></script>
<script src="controllers/modals/DeleteSnippetModalController.js"></script>
<script src="controllers/modals/EditRecipeModalController.js"></script>
<script src="controllers/modals/EditSnippetModalController.js"></script>
<script src="controllers/modals/ExpandRecipeModalController.js"></script>
<script src="controllers/modals/NewRecipeModalController.js"></script>
<script src="controllers/modals/NewSnippetModalController.js"></script>
<script src="controllers/modals/SelectSnippetModalController.js"></script>
<script src="../shared/shared.js"></script> <script src="../shared/shared.js"></script>
<script src="../shared/config/ace.js"></script> <script src="../shared/config/ace.js"></script>
<script src="../shared/config/env.js"></script> <script src="../shared/config/env.js"></script>

View File

@@ -26,6 +26,12 @@
.select-snippet-modal .snippet-list li:hover { .select-snippet-modal .snippet-list li:hover {
background-color: #004b5f; background-color: #004b5f;
} }
.select-snippet-modal .snippet-list li .ace_editor {
height: 150px;
}
.select-snippet-modal .snippet-list li .call-sign {
color: #d5dfe2;
}
#side-view .nav-control-group { #side-view .nav-control-group {
margin: auto 10px; margin: auto 10px;
} }

View File

@@ -11,3 +11,7 @@
cursor pointer cursor pointer
&:hover &:hover
background-color $backgroundColorSelected background-color $backgroundColorSelected
.ace_editor
height 150px
.call-sign
color $textColorHighlight

View File

@@ -38,7 +38,6 @@
</tabset> </tabset>
<div class="form-group"> <div class="form-group">
<button ng-click="vm.insertSnippet()" class="btn btn-default">Add Snippet</button>
<button btn-expand-recipe="vm.recipe" class="btn btn-default">Expand Editor</button> <button btn-expand-recipe="vm.recipe" class="btn btn-default">Expand Editor</button>
</div> </div>

View File

@@ -38,7 +38,6 @@
</tabset> </tabset>
<div class="form-group"> <div class="form-group">
<button ng-click="vm.insertSnippet()" class="btn btn-default">Add Snippet</button>
<button btn-expand-recipe="vm.recipe" class="btn btn-default">Expand Editor</button> <button btn-expand-recipe="vm.recipe" class="btn btn-default">Expand Editor</button>
</div> </div>

View File

@@ -5,11 +5,17 @@
<div class="modal-body"> <div class="modal-body">
<ul class="snippet-list"> <ul class="snippet-list">
<li ng-repeat="snippet in vm.snippets" ng-click="vm.select(snippet)"> <li ng-repeat="snippet in vm.snippets" ng-click="vm.select(snippet)">
<p ng-bind="snippet.callSign"></p> <p><small>callsign</small> <span ng-bind="snippet.callSign"></span> <small ng-bind="snippet.updatedAt|fromNow" class="call-sign"></small></p>
<p ng-bind="snippet.description"></p> <p ng-bind="snippet.description"></p>
<p class="created-at">
<span ng-bind="snippet.updatedAt|fromNow"></span> <div ui-ace="{
</p> showGutter: true,
useWrapMode : true,
mode:snippet.mode.toLowerCase(),
theme:'solarized_dark'
}"
readonly
ng-model="snippet.content"></div>
</li> </li>
</ul> </ul>
</div> </div>

View File

@@ -57,10 +57,10 @@
<script src="popup.js"></script> <script src="popup.js"></script>
<script src="services/snippet.js"></script> <script src="services/snippet.js"></script>
<script src="../shared/shared.js"></script> <script src="../shared/shared.js"></script>
<script src="../shared/directives/ui-ace.js"></script>
<script src="../shared/config/ace.js"></script> <script src="../shared/config/ace.js"></script>
<script src="../shared/config/env.js"></script> <script src="../shared/config/env.js"></script>
<script src="../shared/config/satellizer.js"></script> <script src="../shared/config/satellizer.js"></script>
<script src="../shared/directives/ui-ace.js"></script>
<script src="../shared/services/Snippet.js"></script> <script src="../shared/services/Snippet.js"></script>
<!-- endinject --> <!-- endinject -->
</body> </body>

View File

@@ -374,7 +374,7 @@ angular.module('ui.ace', [])
var str = '' var str = ''
if (cursor.column > 0) str += '\n\n' if (cursor.column > 0) str += '\n\n'
acee.insert(str + '```\n' + snippet.content + '\n```\n[snippet:' + snippet.id + '](#/snippets/' + snippet.id + ')\n') acee.insert(str + '```\n' + snippet.content + '\n```\n> [snippet#' + snippet.id + '](#/snippets/' + snippet.id + ')\n\n')
scope.$evalAsync(function () { scope.$evalAsync(function () {
ngModel.$setViewValue(session.getValue()) ngModel.$setViewValue(session.getValue())