diff --git a/src/css/resting.css b/src/css/resting.css index 909957b..420c862 100644 --- a/src/css/resting.css +++ b/src/css/resting.css @@ -225,26 +225,6 @@ a.donate-link:hover { display: none; } -.animate-progress { - animation: progress 1s 1; -} -@keyframes progress { - from { - width: 1%; - } - to { - width: 100%; - } -} -@-webkit-keyframes progress { - from { - width: 1%; - } - to { - width: 100%; - } -} - #plus-tab:hover { background-color: #286090; } diff --git a/src/index.html b/src/index.html index 5afc731..7ae2451 100644 --- a/src/index.html +++ b/src/index.html @@ -157,16 +157,6 @@

❤️ Support the project

class="form-control" placeholder="http://" data-bind="textInput: request.url, event: { keyup: callSendOnEnter}" /> -
-
-
-
-
@@ -178,6 +168,10 @@

❤️ Support the project

class="btn btn-primary" data-bind="click: send"> Send + + + Loading... +
diff --git a/src/js/app.js b/src/js/app.js index b97ee30..79b6618 100644 --- a/src/js/app.js +++ b/src/js/app.js @@ -44,10 +44,8 @@ requirejs( 'app/storage', 'knockout', 'knockout-secure-binding', - 'hjls', 'app/request', 'app/bookmark', - 'app/clipboard', 'app/bacheca', 'bootstrap', 'app/contextVm', @@ -59,17 +57,14 @@ requirejs( 'component/bookmarks/bookmarkVm', 'vuecomp/dialogs-app.umd', 'vuecomp/add-folder-button.umd', - 'json-viewer', ], function ( $, storage, ko, ksb, - hjls, requestSrv, makeBookmarkProvider, - clipboard, bacheca, bootstrap, ContextVm, @@ -80,27 +75,8 @@ requirejs( EntryItemVm, BookmarkVm, DialogsApp, - AddFolderButton, - jsonViewer + AddFolderButton ) { - const REQUEST_STATE_MAP = { - NOT_STARTED: { - ariaText: 'No request sent', - value: 'NOT_STARTED', - progressWidth: '0.01%', - }, - IN_PROGRESS: { - ariaText: 'request in progress', - value: 'IN_PROGRESS', - progressWidth: '100%', - }, - COMPLETE: { - ariaText: 'Request complete', - value: 'COMPLETE', - progressWidth: '100%', - }, - } - function AppVm() { const contexts = ko.observableArray() const selectedCtx = new ContextVm() @@ -142,8 +118,7 @@ requirejs( const showCreateContextDialog = ko.observable(false) const showConfirmDialog = ko.observable(false) - const requestState = ko.observable(REQUEST_STATE_MAP.NOT_STARTED) - + const executionInProgress = ko.observable(false) const saveAsNewBookmark = ko.observable(false) const dialogConfirmMessage = ko.observable() @@ -546,12 +521,12 @@ requirejs( _authentication(mapping), _manageResponse ) - requestState(REQUEST_STATE_MAP.IN_PROGRESS) + executionInProgress(true) } const _manageResponse = (response) => { activeTab.response = response - requestState(REQUEST_STATE_MAP.COMPLETE) + executionInProgress(false) _displayResponse(response) } @@ -922,8 +897,7 @@ requirejs( showCreateContextDialog, showConfirmDialog, - requestState, - + executionInProgress, saveAsNewBookmark, dialogConfirmMessage,