Refactored samples.

aspnetboilerplate · Nov 2, 2014 · 4d40933 · 4d40933
1 parent 994a0a8
commit 4d40933
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 28 deletions.
diff --git a/SimpleTaskSystem/SimpleTaskSystem.WebSpaAngular/App/Main/images/abp-logo.png b/SimpleTaskSystem/SimpleTaskSystem.WebSpaAngular/App/Main/images/abp-logo.png
diff --git a/SimpleTaskSystem/SimpleTaskSystem.WebSpaAngular/App/Main/views/task/new.js b/SimpleTaskSystem/SimpleTaskSystem.WebSpaAngular/App/Main/views/task/new.js
@@ -21,15 +21,16 @@
             });
 
             vm.saveTask = function() {
-                abp.ui.setBusy(null, {
-                    promise: taskService.createTask(vm.task)
-                        .success(function() {
-                            abp.notify.info(abp.utils.formatString(localize("TaskCreatedMessage"), vm.task.description));
-                            $location.path('/');
-                        })
-                });
+                abp.ui.setBusy(
+                    null,
+                    taskService.createTask(
+                        vm.task
+                    ).success(function() {
+                        abp.notify.info(abp.utils.formatString(localize("TaskCreatedMessage"), vm.task.description));
+                        $location.path('/');
+                    })
+                );
             };
-
         }
     ]);
 })();
diff --git a/SimpleTaskSystem/SimpleTaskSystem.WebSpaAngular/SimpleTaskSystem.WebSpaAngular.csproj b/SimpleTaskSystem/SimpleTaskSystem.WebSpaAngular/SimpleTaskSystem.WebSpaAngular.csproj
@@ -179,7 +179,6 @@
     <Content Include="Abp\Framework\styles\utils\ie10fix.css" />
     <Content Include="App\Main\app.js" />
     <Content Include="App\Main\filters\moment_filters.js" />
-    <Content Include="App\Main\images\abp-logo.png" />
     <Content Include="App\Main\main.css">
       <DependentUpon>main.less</DependentUpon>
     </Content>

diff --git a/SimpleTaskSystem/SimpleTaskSystem.WebSpaDurandal/App/Main/viewmodels/newtask.js b/SimpleTaskSystem/SimpleTaskSystem.WebSpaDurandal/App/Main/viewmodels/newtask.js
@@ -33,13 +33,14 @@
                     return;
                 }
 
-                abp.ui.setBusy(_$view, {
-                    promise: taskService.createTask(ko.mapping.toJS(that.task))
-                        .done(function () {
-                            abp.notify.info(abp.utils.formatString(localize("TaskCreatedMessage"), that.task.description()));
-                            history.navigate('');
-                        })
-                });
+                abp.ui.setBusy(_$view,
+                    taskService.createTask(
+                        ko.mapping.toJS(that.task)
+                    ).done(function() {
+                        abp.notify.info(abp.utils.formatString(localize("TaskCreatedMessage"), that.task.description()));
+                        history.navigate('');
+                    })
+                );
             };
         };
     });
diff --git a/SimpleTaskSystem/SimpleTaskSystem.WebSpaDurandal/App/Main/views/newtask.cshtml b/SimpleTaskSystem/SimpleTaskSystem.WebSpaDurandal/App/Main/views/newtask.cshtml
@@ -1,11 +1,13 @@
-<form id="NewTaskForm" role="form">
-    <div class="form-group">
-        <label for="TaskDescription">@L("TaskDescription")</label>
-        <textarea id="TaskDescription" data-bind="value: task.description" class="form-control" rows="3" placeholder="@L("EnterDescriptionHere")" required></textarea>
-    </div>
-    <div class="form-group">
-        <label for="TaskAssignedPerson">@L("AssignTo")</label>
-        <select id="TaskAssignedPerson" data-bind="options: people, optionsText: 'name', optionsValue: 'id', value: task.assignedPersonId, optionsCaption: '@L("SelectPerson")'" class="form-control"></select>
-    </div>
-    <button data-bind="click: saveTask" type="submit" class="btn btn-primary">@L("CreateTheTask")</button>
-</form>
+<div>
+    <form id="NewTaskForm" role="form">
+        <div class="form-group">
+            <label for="TaskDescription">@L("TaskDescription")</label>
+            <textarea id="TaskDescription" data-bind="value: task.description" class="form-control" rows="3" placeholder="@L("EnterDescriptionHere")" required></textarea>
+        </div>
+        <div class="form-group">
+            <label for="TaskAssignedPerson">@L("AssignTo")</label>
+            <select id="TaskAssignedPerson" data-bind="options: people, optionsText: 'name', optionsValue: 'id', value: task.assignedPersonId, optionsCaption: '@L("SelectPerson")'" class="form-control"></select>
+        </div>
+        <button data-bind="click: saveTask" type="submit" class="btn btn-primary">@L("CreateTheTask")</button>
+    </form>
+</div>
diff --git a/SimpleTaskSystem/SimpleTaskSystem.WebSpaDurandal/SimpleTaskSystem.WebSpaDurandal.csproj b/SimpleTaskSystem/SimpleTaskSystem.WebSpaDurandal/SimpleTaskSystem.WebSpaDurandal.csproj
@@ -364,7 +364,6 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="App\Main\images\" />
     <Folder Include="Models\" />
   </ItemGroup>
   <ItemGroup>