-
Notifications
You must be signed in to change notification settings - Fork 3.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
44 changed files
with
2,138 additions
and
2,012 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,5 @@ | ||
| { | ||
| "singleQuote": true, | ||
| "useTabs": true | ||
| "useTabs": false, | ||
| "tabWidth": 4 | ||
| } |
14 changes: 7 additions & 7 deletions
14
modules/account/src/Volo.Abp.Account.Web/Pages/Account/LoggedOut.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| document.addEventListener('DOMContentLoaded', function (event) { | ||
| setTimeout(function () { | ||
| window.location = document | ||
| .getElementById('redirectButton') | ||
| .getAttribute('href'); | ||
| }, 3000); | ||
| }); | ||
| document.addEventListener('DOMContentLoaded', function (event) { | ||
| setTimeout(function () { | ||
| window.location = document | ||
| .getElementById('redirectButton') | ||
| .getAttribute('href'); | ||
| }, 3000); | ||
| }); |
68 changes: 34 additions & 34 deletions
68
modules/account/src/Volo.Abp.Account.Web/Pages/Account/Manage.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,47 +1,47 @@ | ||
| (function ($) { | ||
| var l = abp.localization.getResource('AbpAccount'); | ||
| var l = abp.localization.getResource('AbpAccount'); | ||
|
|
||
| var _profileService = volo.abp.identity.profile; | ||
| var _profileService = volo.abp.identity.profile; | ||
|
|
||
| $('#ChangePasswordForm').submit(function (e) { | ||
| e.preventDefault(); | ||
| $('#ChangePasswordForm').submit(function (e) { | ||
| e.preventDefault(); | ||
|
|
||
| if (!$('#ChangePasswordForm').valid()) { | ||
| return false; | ||
| } | ||
| if (!$('#ChangePasswordForm').valid()) { | ||
| return false; | ||
| } | ||
|
|
||
| var input = $('#ChangePasswordForm').serializeFormToObject() | ||
| .changePasswordInfoModel; | ||
| var input = $('#ChangePasswordForm').serializeFormToObject() | ||
| .changePasswordInfoModel; | ||
|
|
||
| if ( | ||
| input.newPassword != input.newPasswordConfirm || | ||
| input.currentPassword == '' | ||
| ) { | ||
| abp.message.error(l('NewPasswordConfirmFailed')); | ||
| return; | ||
| } | ||
| if ( | ||
| input.newPassword != input.newPasswordConfirm || | ||
| input.currentPassword == '' | ||
| ) { | ||
| abp.message.error(l('NewPasswordConfirmFailed')); | ||
| return; | ||
| } | ||
|
|
||
| if (input.currentPassword == '') { | ||
| return; | ||
| } | ||
| if (input.currentPassword == '') { | ||
| return; | ||
| } | ||
|
|
||
| _profileService.changePassword(input).then(function (result) { | ||
| abp.message.success(l('PasswordChanged')); | ||
| }); | ||
| }); | ||
| _profileService.changePassword(input).then(function (result) { | ||
| abp.message.success(l('PasswordChanged')); | ||
| }); | ||
| }); | ||
|
|
||
| $('#PersonalSettingsForm').submit(function (e) { | ||
| e.preventDefault(); | ||
| $('#PersonalSettingsForm').submit(function (e) { | ||
| e.preventDefault(); | ||
|
|
||
| if (!$('#PersonalSettingsForm').valid()) { | ||
| return false; | ||
| } | ||
| if (!$('#PersonalSettingsForm').valid()) { | ||
| return false; | ||
| } | ||
|
|
||
| var input = $('#PersonalSettingsForm').serializeFormToObject() | ||
| .personalSettingsInfoModel; | ||
| var input = $('#PersonalSettingsForm').serializeFormToObject() | ||
| .personalSettingsInfoModel; | ||
|
|
||
| _profileService.update(input).then(function (result) { | ||
| abp.notify.success(l('PersonalSettingsSaved')); | ||
| }); | ||
| }); | ||
| _profileService.update(input).then(function (result) { | ||
| abp.notify.success(l('PersonalSettingsSaved')); | ||
| }); | ||
| }); | ||
| })(jQuery); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| { | ||
| "singleQuote": true, | ||
| "useTabs": false, | ||
| "tabWidth": 4 | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| { | ||
| "singleQuote": true, | ||
| "useTabs": false, | ||
| "tabWidth": 4 | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| { | ||
| "singleQuote": true, | ||
| "useTabs": false, | ||
| "tabWidth": 4 | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,5 @@ | ||
| { | ||
| "singleQuote": true, | ||
| "useTabs": true | ||
| "useTabs": false, | ||
| "tabWidth": 4 | ||
| } |
16 changes: 8 additions & 8 deletions
16
modules/blogging/src/Volo.Blogging.Admin.Web/Pages/Blogging/Admin/Blogs/create.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,12 @@ | ||
| var abp = abp || {}; | ||
| $(function () { | ||
| abp.modals.blogCreate = function () { | ||
| var initModal = function (publicApi, args) { | ||
| var $form = publicApi.getForm(); | ||
| }; | ||
| abp.modals.blogCreate = function () { | ||
| var initModal = function (publicApi, args) { | ||
| var $form = publicApi.getForm(); | ||
| }; | ||
|
|
||
| return { | ||
| initModal: initModal, | ||
| }; | ||
| }; | ||
| return { | ||
| initModal: initModal, | ||
| }; | ||
| }; | ||
| }); |
16 changes: 8 additions & 8 deletions
16
modules/blogging/src/Volo.Blogging.Admin.Web/Pages/Blogging/Admin/Blogs/edit.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,12 @@ | ||
| var abp = abp || {}; | ||
| $(function () { | ||
| abp.modals.blogEdit = function () { | ||
| var initModal = function (publicApi, args) { | ||
| var $form = publicApi.getForm(); | ||
| }; | ||
| abp.modals.blogEdit = function () { | ||
| var initModal = function (publicApi, args) { | ||
| var $form = publicApi.getForm(); | ||
| }; | ||
|
|
||
| return { | ||
| initModal: initModal, | ||
| }; | ||
| }; | ||
| return { | ||
| initModal: initModal, | ||
| }; | ||
| }; | ||
| }); |
168 changes: 86 additions & 82 deletions
168
modules/blogging/src/Volo.Blogging.Admin.Web/Pages/Blogging/Admin/Blogs/index.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,88 +1,92 @@ | ||
| $(function () { | ||
| var l = abp.localization.getResource('Blogging'); | ||
| var _createModal = new abp.ModalManager( | ||
| abp.appPath + 'Blogging/Admin/Blogs/Create' | ||
| ); | ||
| var _editModal = new abp.ModalManager( | ||
| abp.appPath + 'Blogging/Admin/Blogs/Edit' | ||
| ); | ||
| var l = abp.localization.getResource('Blogging'); | ||
| var _createModal = new abp.ModalManager( | ||
| abp.appPath + 'Blogging/Admin/Blogs/Create' | ||
| ); | ||
| var _editModal = new abp.ModalManager( | ||
| abp.appPath + 'Blogging/Admin/Blogs/Edit' | ||
| ); | ||
|
|
||
| var _dataTable = $('#BlogsTable').DataTable( | ||
| abp.libs.datatables.normalizeConfiguration({ | ||
| processing: true, | ||
| serverSide: true, | ||
| paging: false, | ||
| info: false, | ||
| scrollX: true, | ||
| searching: false, | ||
| autoWidth: false, | ||
| scrollCollapse: true, | ||
| order: [[3, 'desc']], | ||
| ajax: abp.libs.datatables.createAjax( | ||
| volo.blogging.admin.blogManagement.getList | ||
| ), | ||
| columnDefs: [ | ||
| { | ||
| rowAction: { | ||
| items: [ | ||
| { | ||
| text: l('Edit'), | ||
| visible: abp.auth.isGranted('Blogging.Blog.Update'), | ||
| action: function (data) { | ||
| _editModal.open({ | ||
| blogId: data.record.id, | ||
| }); | ||
| }, | ||
| }, | ||
| { | ||
| text: l('Delete'), | ||
| visible: abp.auth.isGranted('Blogging.Blog.Delete'), | ||
| confirmMessage: function (data) { | ||
| return l('BlogDeletionWarningMessage'); | ||
| }, | ||
| action: function (data) { | ||
| volo.blogging.admin.blogManagement | ||
| .delete(data.record.id) | ||
| .then(function () { | ||
| _dataTable.ajax.reload(); | ||
| }); | ||
| }, | ||
| }, | ||
| ], | ||
| }, | ||
| }, | ||
| { | ||
| target: 1, | ||
| data: 'name', | ||
| }, | ||
| { | ||
| target: 2, | ||
| data: 'shortName', | ||
| }, | ||
| { | ||
| target: 3, | ||
| data: 'creationTime', | ||
| render: function (date) { | ||
| return date; | ||
| }, | ||
| }, | ||
| { | ||
| target: 4, | ||
| data: 'description', | ||
| }, | ||
| ], | ||
| }) | ||
| ); | ||
| var _dataTable = $('#BlogsTable').DataTable( | ||
| abp.libs.datatables.normalizeConfiguration({ | ||
| processing: true, | ||
| serverSide: true, | ||
| paging: false, | ||
| info: false, | ||
| scrollX: true, | ||
| searching: false, | ||
| autoWidth: false, | ||
| scrollCollapse: true, | ||
| order: [[3, 'desc']], | ||
| ajax: abp.libs.datatables.createAjax( | ||
| volo.blogging.admin.blogManagement.getList | ||
| ), | ||
| columnDefs: [ | ||
| { | ||
| rowAction: { | ||
| items: [ | ||
| { | ||
| text: l('Edit'), | ||
| visible: abp.auth.isGranted( | ||
| 'Blogging.Blog.Update' | ||
| ), | ||
| action: function (data) { | ||
| _editModal.open({ | ||
| blogId: data.record.id, | ||
| }); | ||
| }, | ||
| }, | ||
| { | ||
| text: l('Delete'), | ||
| visible: abp.auth.isGranted( | ||
| 'Blogging.Blog.Delete' | ||
| ), | ||
| confirmMessage: function (data) { | ||
| return l('BlogDeletionWarningMessage'); | ||
| }, | ||
| action: function (data) { | ||
| volo.blogging.admin.blogManagement | ||
| .delete(data.record.id) | ||
| .then(function () { | ||
| _dataTable.ajax.reload(); | ||
| }); | ||
| }, | ||
| }, | ||
| ], | ||
| }, | ||
| }, | ||
| { | ||
| target: 1, | ||
| data: 'name', | ||
| }, | ||
| { | ||
| target: 2, | ||
| data: 'shortName', | ||
| }, | ||
| { | ||
| target: 3, | ||
| data: 'creationTime', | ||
| render: function (date) { | ||
| return date; | ||
| }, | ||
| }, | ||
| { | ||
| target: 4, | ||
| data: 'description', | ||
| }, | ||
| ], | ||
| }) | ||
| ); | ||
|
|
||
| $('#CreateNewBlogButtonId').click(function () { | ||
| _createModal.open(); | ||
| }); | ||
| $('#CreateNewBlogButtonId').click(function () { | ||
| _createModal.open(); | ||
| }); | ||
|
|
||
| _createModal.onClose(function () { | ||
| _dataTable.ajax.reload(); | ||
| }); | ||
| _createModal.onClose(function () { | ||
| _dataTable.ajax.reload(); | ||
| }); | ||
|
|
||
| _editModal.onResult(function () { | ||
| _dataTable.ajax.reload(); | ||
| }); | ||
| _editModal.onResult(function () { | ||
| _dataTable.ajax.reload(); | ||
| }); | ||
| }); |
Oops, something went wrong.