[rg-router] Remove old way to go in taglist

global catalog var is now in registryUI global var
This commit is contained in:
Joxit 2016-06-04 16:41:18 +02:00
parent e45c107fe7
commit 7e677204d4
4 changed files with 18 additions and 23 deletions

View file

@ -30,12 +30,10 @@
} }
break; break;
case 'home': case 'home':
if (catalog.display) { if (registryUI.catalog.display) {
catalog.display(); registryUI.catalog.display();
} }
break; break;
default:
} }
}) })
this.router.start(); this.router.start();

View file

@ -21,9 +21,9 @@
<div class="mdl-card__title"> <div class="mdl-card__title">
<h2 class="mdl-card__title-text">Repositories of { registryUI.url() }</h2> <h2 class="mdl-card__title-text">Repositories of { registryUI.url() }</h2>
</div> </div>
<div id="catalog-spinner" style="{ catalog.loadend ? 'display:none;': '' }" class="mdl-spinner mdl-js-spinner is-active section-centerd"></div> <div id="catalog-spinner" style="{ registryUI.catalog.loadend ? 'display:none;': '' }" class="mdl-spinner mdl-js-spinner is-active section-centerd"></div>
<ul class="mdl-list"> <ul class="mdl-list">
<li class="mdl-list__item mdl-menu__item" style="opacity: 1;" each="{ item in catalog.repositories }" onclick="catalog.go('{item}');"> <li class="mdl-list__item mdl-menu__item" style="opacity: 1;" each="{ item in registryUI.catalog.repositories }" onclick="registryUI.catalog.go('{item}');">
<span class="mdl-list__item-primary-content"> <span class="mdl-list__item-primary-content">
<i class="material-icons mdl-list__item-icon">send</i> <i class="material-icons mdl-list__item-icon">send</i>
{ item } { item }
@ -38,16 +38,15 @@
</div> </div>
<script> <script>
catalog.instance = this; registryUI.catalog.instance = this;
this.mixin('rg.router'); this.mixin('rg.router');
catalog.display = function () { registryUI.catalog.display = function () {
registryUI.content = 'catalog';
var oReq = new XMLHttpRequest(); var oReq = new XMLHttpRequest();
catalog.createSnackbar = function (msg) { registryUI.catalog.createSnackbar = function (msg) {
var snackbar = document.querySelector('#error-snackbar'); var snackbar = document.querySelector('#error-snackbar');
catalog.error = msg; registryUI.catalog.error = msg;
var data = { var data = {
message: catalog.error, message: registryUI.catalog.error,
timeout: 100000, timeout: 100000,
actionHandler: function () { actionHandler: function () {
snackbar.classList.remove('mdl-snackbar--active'); snackbar.classList.remove('mdl-snackbar--active');
@ -58,19 +57,19 @@
}; };
oReq.addEventListener('load', function () { oReq.addEventListener('load', function () {
if (this.status == 200) { if (this.status == 200) {
catalog.repositories = JSON.parse(this.responseText).repositories.sort(); registryUI.catalog.repositories = JSON.parse(this.responseText).repositories.sort();
} else if (this.status == 404) { } else if (this.status == 404) {
catalog.createSnackbar('Server not found'); registryUI.catalog.createSnackbar('Server not found');
} else { } else {
catalog.createSnackbar(this.responseText); registryUI.catalog.createSnackbar(this.responseText);
} }
}); });
oReq.addEventListener('error', function () { oReq.addEventListener('error', function () {
catalog.createSnackbar('An error occured'); registryUI.catalog.createSnackbar('An error occured');
}); });
oReq.addEventListener('loadend', function () { oReq.addEventListener('loadend', function () {
catalog.loadend = true; registryUI.catalog.loadend = true;
catalog.instance.update(); registryUI.catalog.instance.update();
}); });
oReq.open('GET', registryUI.url() + '/v2/_catalog'); oReq.open('GET', registryUI.url() + '/v2/_catalog');
oReq.withCredentials = false; oReq.withCredentials = false;
@ -79,13 +78,13 @@
this.on('updated', function () { this.on('updated', function () {
componentHandler.upgradeElements(this['catalog-tag']); componentHandler.upgradeElements(this['catalog-tag']);
}); });
catalog.go = function (image) { registryUI.catalog.go = function (image) {
rg.router.go('taglist', { rg.router.go('taglist', {
repository: image.split('/')[0], repository: image.split('/')[0],
image: image.split('/')[1] image: image.split('/')[1]
}); });
}; };
catalog.display(); registryUI.catalog.display();
</script> </script>
<!-- End of tag --> <!-- End of tag -->
</catalog> </catalog>

View file

@ -46,10 +46,9 @@ registryUI.changeServer = function(url) {
} }
registryServer.splice(index, 1); registryServer.splice(index, 1);
registryServer = [url].concat(registryServer); registryServer = [url].concat(registryServer);
registryUI.registryServer.servers = registryServer;
localStorage.setItem('registryServer', JSON.stringify(registryServer)); localStorage.setItem('registryServer', JSON.stringify(registryServer));
} }
var catalog = {}; registryUI.catalog = {};
registryUI.taglist = {}; registryUI.taglist = {};
riot.mount('catalog'); riot.mount('catalog');

View file

@ -53,7 +53,6 @@
name = rg.router.current.params.repository + (rg.router.current.params.image name = rg.router.current.params.repository + (rg.router.current.params.image
? '/' + rg.router.current.params.image ? '/' + rg.router.current.params.image
: ''); : '');
registryUI.content = 'taglist';
var oReq = new XMLHttpRequest(); var oReq = new XMLHttpRequest();
registryUI.taglist.name = name; registryUI.taglist.name = name;
registryUI.taglist.createSnackbar = function (msg) { registryUI.taglist.createSnackbar = function (msg) {