hopfma/om
4
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/developer' into developer

Browse Source 
# Conflicts:
#	public/routes/msgCard.js
This commit is contained in:
Senta Mandutz 2019-07-23 21:42:14 +02:00
commit 285249254a
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
public/routes/home.js
View File

@ -26,25 +26,22 @@ const HomeRouter = {
messages();
},
goBackToDashboard: function() {
//Home neu rendern ...
//windows.history.go();
router.push('/files')
router.push('/home')
vueForceRender();
$("#escape-search-link").css("visibility", "hidden");
$("#subscribe-btn").css("visibility", "hidden");
},
changeSubscribtion: function(){
var btnString = $("#btn-text").text();
//console.log(btnString);
console.log(btnString);
if($("#btn-text").hasClass("subscribed")){
$("#btn-text").removeClass("subscribed");
var newBtnString = "#" + $("#btn-text").text(/deabonnieren/g, '') + "abonnieren";
var newBtnString = btnString.replace(/deabonnieren/g, '') + "abonnieren";
//console.log(btnString);
$("#btn-text").text(newBtnString);
}else{
$("#btn-text").addClass("subscribed");
var newBtnString = "#" + $("#btn-text").text(/abonnieren/g, '') + "deabonnieren";
var newBtnString = btnString.replace(/abonnieren/g, '') + "deabonnieren";
//console.log(newBtnString);
$("#btn-text").text(newBtnString);

4
public/routes/msgCard.js
View File

@ -68,7 +68,9 @@ Vue.component('MsgCard', {
}*/
},
filterForTag: function (tag) {
var btnString = "#" + tag + " abonnieren";
$("#btn-text").text(btnString);
$("#subscribe-btn").css("visibility", "visible");
//console.log("link: " + tag);
searching(tag);
var btnString = "#" + tag + " abonnieren";