verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 64 Releases Wiki Activity

Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev

This commit is contained in:
Gerard 2019-02-13 09:27:13 +01:00
parent 5063bd8137 3bd137a435
commit bfaf9b1ed4
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
e2e/helpers/extensions.js
View File

@ -266,11 +266,11 @@ let actions = {
}); });
}, },
waitForTextInElement: function(selector, name, done) { waitForTextInElement: function(selector, text, done) {
this.wait(selector) this.wait(selector)
.wait((selector, name) => { .wait((selector, text) => {
return document.querySelector(selector).innerText.toLowerCase().includes(name.toLowerCase()); return document.querySelector(selector).innerText.toLowerCase().includes(text.toLowerCase());
}, selector, name) }, selector, text)
.then(done) .then(done)
.catch(done); .catch(done);
}, },

2
front/core/lib/module-loader.js
View File

@ -20,8 +20,6 @@ export function factory($http, $window, $ocLazyLoad, $translatePartialLoader, $t
return loaded[moduleName]; return loaded[moduleName];
if (loaded[moduleName] === false) if (loaded[moduleName] === false)
return Promise.resolve(true); return Promise.resolve(true);
// TODO task #1134 look for a better way to handle dependency loop
// return $q.reject(new Error(`Module dependency loop detected: ${moduleName}`));
loaded[moduleName] = false; loaded[moduleName] = false;