update third dependencies
This commit is contained in:
parent
41d2d65526
commit
43cba9f123
27
bower.json
27
bower.json
|
@ -31,28 +31,27 @@
|
||||||
"sweetalert": "^1.1.3",
|
"sweetalert": "^1.1.3",
|
||||||
"awesome-bootstrap-checkbox": "^0.3.7",
|
"awesome-bootstrap-checkbox": "^0.3.7",
|
||||||
"jquery-slimscroll": "^1.3.8",
|
"jquery-slimscroll": "^1.3.8",
|
||||||
"angular": "1.4.10",
|
"angular": "1.6.4",
|
||||||
"angular-route": "1.4.10",
|
"angular-route": "1.6.4",
|
||||||
"angular-sanitize": "1.4.10",
|
"angular-sanitize": "1.6.4",
|
||||||
"angular-touch": "1.4.10",
|
"angular-touch": "1.6.4",
|
||||||
"angular-messages": "1.4.10",
|
"angular-messages": "1.6.4",
|
||||||
"angular-cookies": "1.4.10",
|
"angular-cookies": "1.6.4",
|
||||||
"angular-animate": "1.4.10",
|
"angular-animate": "1.6.4",
|
||||||
"angular-translate": "^2.15.1",
|
"angular-translate": "^2.15.1",
|
||||||
"angular-moment": "1.0.0-beta.6",
|
"angular-moment": "1.0.1",
|
||||||
"angular-websocket": "^1.1.0",
|
"angular-websocket": "^2.0.0",
|
||||||
"angular-utf8-base64": "^0.0.5",
|
"angular-utf8-base64": "^0.0.5",
|
||||||
"angular-local-storage": "^0.2.7",
|
"angular-local-storage": "^0.6.0",
|
||||||
"angular-notification": "775ee861c1737b284588bcb878ba1f4e43c70c97",
|
"angular-notification": "775ee861c1737b284588bcb878ba1f4e43c70c97",
|
||||||
"angular-ui-notification": "^0.3.6",
|
"angular-ui-notification": "^0.3.6",
|
||||||
"angular-bittorrent-peerid": "^1.2.0",
|
"angular-bittorrent-peerid": "^1.2.0",
|
||||||
"angular-busy": "^4.1.4",
|
"angular-busy": "^4.1.4",
|
||||||
"angular-promise-buttons": "^0.1.20",
|
"angular-promise-buttons": "^0.1.20",
|
||||||
"angular-dragula": "^1.2.7",
|
"angular-dragula": "^1.2.8",
|
||||||
"ngSweetAlert": "8df6c30b0996f09cb4cf5e90a41115a6c09fa852"
|
"ngSweetAlert": "^1.1.2"
|
||||||
},
|
},
|
||||||
"resolutions": {
|
"resolutions": {
|
||||||
"angular": "1.4.10",
|
"angular": "1.6.4"
|
||||||
"angular-animate": "1.4.10"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -64,7 +64,7 @@
|
||||||
<div class="navbar-toolbar">
|
<div class="navbar-toolbar">
|
||||||
<ul class="nav navbar-nav">
|
<ul class="nav navbar-nav">
|
||||||
<li>
|
<li>
|
||||||
<a class="toolbar" title="{{'New' | translate}}" ng-href="#/new">
|
<a class="toolbar" title="{{'New' | translate}}" ng-href="#!/new">
|
||||||
<i class="fa fa-plus"></i>
|
<i class="fa fa-plus"></i>
|
||||||
<span translate>New</span>
|
<span translate>New</span>
|
||||||
</a>
|
</a>
|
||||||
|
@ -181,17 +181,17 @@
|
||||||
<ul id="siderbar-menu" class="sidebar-menu">
|
<ul id="siderbar-menu" class="sidebar-menu">
|
||||||
<li class="header" translate>Download</li>
|
<li class="header" translate>Download</li>
|
||||||
<li data-href-match="/downloading">
|
<li data-href-match="/downloading">
|
||||||
<a href="#/downloading"><i class="fa fa-arrow-circle-o-down"></i> <span ng-bind="('Downloading' | translate) + (globalStat && globalStat.numActive > 0 ? ' (' + globalStat.numActive + ')' : '')">Downloading</span></a>
|
<a href="#!/downloading"><i class="fa fa-arrow-circle-o-down"></i> <span ng-bind="('Downloading' | translate) + (globalStat && globalStat.numActive > 0 ? ' (' + globalStat.numActive + ')' : '')">Downloading</span></a>
|
||||||
</li>
|
</li>
|
||||||
<li data-href-match="/waiting">
|
<li data-href-match="/waiting">
|
||||||
<a href="#/waiting"><i class="fa fa-clock-o"></i> <span ng-bind="('Waiting' | translate) + (globalStat && globalStat.numWaiting > 0 ? ' (' + globalStat.numWaiting + ')' : '')">Waiting</span></a>
|
<a href="#!/waiting"><i class="fa fa-clock-o"></i> <span ng-bind="('Waiting' | translate) + (globalStat && globalStat.numWaiting > 0 ? ' (' + globalStat.numWaiting + ')' : '')">Waiting</span></a>
|
||||||
</li>
|
</li>
|
||||||
<li data-href-match="/stopped">
|
<li data-href-match="/stopped">
|
||||||
<a href="#/stopped"><i class="fa fa-check-circle-o"></i> <span ng-bind="('Finished / Stopped' | translate) + (globalStat && globalStat.numStopped > 0 ? ' (' + globalStat.numStopped + ')' : '')">Finished / Stopped</span></a>
|
<a href="#!/stopped"><i class="fa fa-check-circle-o"></i> <span ng-bind="('Finished / Stopped' | translate) + (globalStat && globalStat.numStopped > 0 ? ' (' + globalStat.numStopped + ')' : '')">Finished / Stopped</span></a>
|
||||||
</li>
|
</li>
|
||||||
<li class="header" translate>Settings</li>
|
<li class="header" translate>Settings</li>
|
||||||
<li data-href-match="/settings/ariang">
|
<li data-href-match="/settings/ariang">
|
||||||
<a href="#/settings/ariang"><i class="fa fa-cog"></i> <span translate>AriaNg Settings</span></a>
|
<a href="#!/settings/ariang"><i class="fa fa-cog"></i> <span translate>AriaNg Settings</span></a>
|
||||||
</li>
|
</li>
|
||||||
<li class="treeview">
|
<li class="treeview">
|
||||||
<a href="javascript:void(0);">
|
<a href="javascript:void(0);">
|
||||||
|
@ -203,33 +203,33 @@
|
||||||
</a>
|
</a>
|
||||||
<ul class="treeview-menu">
|
<ul class="treeview-menu">
|
||||||
<li data-href-match="/settings/aria2/basic">
|
<li data-href-match="/settings/aria2/basic">
|
||||||
<a href="#/settings/aria2/basic"> <span translate>Basic Settings</span></a>
|
<a href="#!/settings/aria2/basic"> <span translate>Basic Settings</span></a>
|
||||||
</li>
|
</li>
|
||||||
<li data-href-match="/settings/aria2/http-ftp-sftp">
|
<li data-href-match="/settings/aria2/http-ftp-sftp">
|
||||||
<a href="#/settings/aria2/http-ftp-sftp"> <span translate>HTTP/FTP/SFTP Settings</span></a>
|
<a href="#!/settings/aria2/http-ftp-sftp"> <span translate>HTTP/FTP/SFTP Settings</span></a>
|
||||||
</li>
|
</li>
|
||||||
<li data-href-match="/settings/aria2/http">
|
<li data-href-match="/settings/aria2/http">
|
||||||
<a href="#/settings/aria2/http"> <span translate>HTTP Settings</span></a>
|
<a href="#!/settings/aria2/http"> <span translate>HTTP Settings</span></a>
|
||||||
</li>
|
</li>
|
||||||
<li data-href-match="/settings/aria2/ftp-sftp">
|
<li data-href-match="/settings/aria2/ftp-sftp">
|
||||||
<a href="#/settings/aria2/ftp-sftp"> <span translate>FTP/SFTP Settings</span></a>
|
<a href="#!/settings/aria2/ftp-sftp"> <span translate>FTP/SFTP Settings</span></a>
|
||||||
</li>
|
</li>
|
||||||
<li data-href-match="/settings/aria2/bt">
|
<li data-href-match="/settings/aria2/bt">
|
||||||
<a href="#/settings/aria2/bt"> <span translate>BitTorrent Settings</span></a>
|
<a href="#!/settings/aria2/bt"> <span translate>BitTorrent Settings</span></a>
|
||||||
</li>
|
</li>
|
||||||
<li data-href-match="/settings/aria2/metalink">
|
<li data-href-match="/settings/aria2/metalink">
|
||||||
<a href="#/settings/aria2/metalink"> <span translate>Metalink Settings</span></a>
|
<a href="#!/settings/aria2/metalink"> <span translate>Metalink Settings</span></a>
|
||||||
</li>
|
</li>
|
||||||
<li data-href-match="/settings/aria2/rpc">
|
<li data-href-match="/settings/aria2/rpc">
|
||||||
<a href="#/settings/aria2/rpc"> <span translate>RPC Settings</span></a>
|
<a href="#!/settings/aria2/rpc"> <span translate>RPC Settings</span></a>
|
||||||
</li>
|
</li>
|
||||||
<li data-href-match="/settings/aria2/advanced">
|
<li data-href-match="/settings/aria2/advanced">
|
||||||
<a href="#/settings/aria2/advanced"> <span translate>Advanced Settings</span></a>
|
<a href="#!/settings/aria2/advanced"> <span translate>Advanced Settings</span></a>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
</li>
|
</li>
|
||||||
<li data-href-match="/status">
|
<li data-href-match="/status">
|
||||||
<a href="#/status"><i class="fa fa-server"></i> <span translate>Aria2 Status</span> <span class="label pull-right" ng-if="globalStatusContext.isEnabled" ng-class="{'label-primary': taskContext.rpcStatus === 'Connecting', 'label-success': taskContext.rpcStatus === 'Connected', 'label-danger': taskContext.rpcStatus === 'Not Connected'}" ng-bind="taskContext.rpcStatus | translate"></span></a>
|
<a href="#!/status"><i class="fa fa-server"></i> <span translate>Aria2 Status</span> <span class="label pull-right" ng-if="globalStatusContext.isEnabled" ng-class="{'label-primary': taskContext.rpcStatus === 'Connecting', 'label-success': taskContext.rpcStatus === 'Connected', 'label-danger': taskContext.rpcStatus === 'Not Connected'}" ng-bind="taskContext.rpcStatus | translate"></span></a>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
</section>
|
</section>
|
||||||
|
@ -290,7 +290,7 @@
|
||||||
<!-- build:js js/jquery-2.2.4.min.js -->
|
<!-- build:js js/jquery-2.2.4.min.js -->
|
||||||
<script src="../bower_components/jquery/dist/jquery.min.js"></script>
|
<script src="../bower_components/jquery/dist/jquery.min.js"></script>
|
||||||
<!-- endbuild -->
|
<!-- endbuild -->
|
||||||
<!-- build:js js/angular-packages-1.4.10.min.js -->
|
<!-- build:js js/angular-packages-1.6.4.min.js -->
|
||||||
<script src="../bower_components/angular/angular.min.js"></script>
|
<script src="../bower_components/angular/angular.min.js"></script>
|
||||||
<script src="../bower_components/angular-route/angular-route.min.js"></script>
|
<script src="../bower_components/angular-route/angular-route.min.js"></script>
|
||||||
<script src="../bower_components/angular-sanitize/angular-sanitize.min.js"></script>
|
<script src="../bower_components/angular-sanitize/angular-sanitize.min.js"></script>
|
||||||
|
@ -317,7 +317,7 @@
|
||||||
<script src="../bower_components/sweetalert/dist/sweetalert.min.js"></script>
|
<script src="../bower_components/sweetalert/dist/sweetalert.min.js"></script>
|
||||||
<script src="../bower_components/angular-translate/angular-translate.min.js"></script>
|
<script src="../bower_components/angular-translate/angular-translate.min.js"></script>
|
||||||
<script src="../bower_components/angular-moment/angular-moment.min.js"></script>
|
<script src="../bower_components/angular-moment/angular-moment.min.js"></script>
|
||||||
<script src="../bower_components/angular-websocket/angular-websocket.min.js"></script>
|
<script src="../bower_components/angular-websocket/dist/angular-websocket.min.js"></script>
|
||||||
<script src="../bower_components/angular-utf8-base64/angular-utf8-base64.min.js"></script>
|
<script src="../bower_components/angular-utf8-base64/angular-utf8-base64.min.js"></script>
|
||||||
<script src="../bower_components/angular-local-storage/dist/angular-local-storage.min.js"></script>
|
<script src="../bower_components/angular-local-storage/dist/angular-local-storage.min.js"></script>
|
||||||
<script src="../bower_components/angular-notification/angular-notification.js"></script>
|
<script src="../bower_components/angular-notification/angular-notification.js"></script>
|
||||||
|
|
|
@ -68,7 +68,9 @@
|
||||||
|
|
||||||
ariaNgLogService.debug('[aria2HttpRpcService.request] request start', requestContext);
|
ariaNgLogService.debug('[aria2HttpRpcService.request] request start', requestContext);
|
||||||
|
|
||||||
return $http(requestContext).success(function (data) {
|
return $http(requestContext).then(function onSuccess(response) {
|
||||||
|
var data = response.data;
|
||||||
|
|
||||||
ariaNgLogService.debug('[aria2HttpRpcService.request] response success', data);
|
ariaNgLogService.debug('[aria2HttpRpcService.request] response success', data);
|
||||||
|
|
||||||
if (!data) {
|
if (!data) {
|
||||||
|
@ -78,7 +80,9 @@
|
||||||
if (context.successCallback) {
|
if (context.successCallback) {
|
||||||
context.successCallback(data.id, data.result);
|
context.successCallback(data.id, data.result);
|
||||||
}
|
}
|
||||||
}).error(function (data) {
|
}).catch(function onError(response) {
|
||||||
|
var data = response.data;
|
||||||
|
|
||||||
ariaNgLogService.debug('[aria2HttpRpcService.request] response error', data);
|
ariaNgLogService.debug('[aria2HttpRpcService.request] response error', data);
|
||||||
|
|
||||||
if (!data) {
|
if (!data) {
|
||||||
|
|
|
@ -101,11 +101,11 @@
|
||||||
$http({
|
$http({
|
||||||
url: languagePath,
|
url: languagePath,
|
||||||
method: 'GET'
|
method: 'GET'
|
||||||
}).success(function (data) {
|
}).then(function onSuccess(response) {
|
||||||
var languageObject = getLanguageObject(data);
|
var languageObject = getLanguageObject(response.data);
|
||||||
localStorageService.set(languageKey, languageObject);
|
localStorageService.set(languageKey, languageObject);
|
||||||
return deferred.resolve(languageObject);
|
return deferred.resolve(languageObject);
|
||||||
}).error(function (data) {
|
}).catch(function onError(response) {
|
||||||
return deferred.reject(options.key);
|
return deferred.reject(options.key);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -111,7 +111,3 @@
|
||||||
margin-left: 5px;
|
margin-left: 5px;
|
||||||
opacity: 1;
|
opacity: 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
.btn[promise-btn] {
|
|
||||||
text-align: left;
|
|
||||||
}
|
|
||||||
|
|
|
@ -43,7 +43,7 @@
|
||||||
</div>
|
</div>
|
||||||
<div class="task-files">
|
<div class="task-files">
|
||||||
<span ng-bind="task.totalLength | readableVolume"></span>
|
<span ng-bind="task.totalLength | readableVolume"></span>
|
||||||
<a ng-href="#/task/detail/{{task.gid}}" title="{{'Click to view task detail' | translate}}">
|
<a ng-href="#!/task/detail/{{task.gid}}" title="{{'Click to view task detail' | translate}}">
|
||||||
<span ng-if="task.files" ng-bind="('format.settings.file-count' | translate: {count: task.selectedFileCount})"></span>
|
<span ng-if="task.files" ng-bind="('format.settings.file-count' | translate: {count: task.selectedFileCount})"></span>
|
||||||
</a><i class="icon-error fa fa-times" ng-if="task && task.status == 'error' && task.errorDescription" title="{{task.errorDescription | translate}}"></i><i class="icon-seeder fa fa-arrow-up" ng-if="task && task.status == 'active' && task.seeder" title="{{'Seeding' | translate}}"></i>
|
</a><i class="icon-error fa fa-times" ng-if="task && task.status == 'error' && task.errorDescription" title="{{task.errorDescription | translate}}"></i><i class="icon-seeder fa fa-arrow-up" ng-if="task && task.status == 'active' && task.seeder" title="{{'Seeding' | translate}}"></i>
|
||||||
<a class="pointer-cursor" ng-if="task && task.status == 'error' && task.errorDescription && !task.bittorrent" ng-click="restart(task)" title="{{'Restart' | translate}}" translate>Restart</a>
|
<a class="pointer-cursor" ng-if="task && task.status == 'error' && task.errorDescription && !task.bittorrent" ng-click="restart(task)" title="{{'Restart' | translate}}" translate>Restart</a>
|
||||||
|
|
Reference in a new issue