Compare commits

..

No commits in common. "285249254a07c20cb24d8462e2055f39ff5b4217" and "9a16ed0480665816fe3cee2505fdc4ae3d201e69" have entirely different histories.

5 changed files with 7 additions and 20 deletions

View File

@ -6,7 +6,6 @@ const BookmarkRouter = {
v-for="id in msgDisplay"
:key="id"
:msg="messages[id] || {}"
:isBookmark="bookmarkArray[id]"
></MsgCard>
</div>
@ -22,7 +21,6 @@ const BookmarkRouter = {
messages: _messages,
isActive: true,
messageId: '',
bookmarkArray: auth.bookmarks,
}
},
computed:{
@ -52,7 +50,6 @@ const BookmarkRouter = {
/*var _usrid = auth.user;
$.ajax({
url: "api/usr/id/" + _usrid,
@ -78,12 +75,8 @@ const BookmarkRouter = {
console.log(err);
}*/
}
},
beforeMount: function(){
},
mounted: function (){
this.getMessages();
},
}
};

View File

@ -3,7 +3,7 @@ const HomeRouter = {
<div>
<div id="om-msg-cards" class="column pull-right-sm is-four-fifths-desktop">
<a id="escape-search-link" @click="goBackToDashboard">< zurück zu allen Einträgen</a>
<b-button id="subscribe-btn" type="is-primary" @click="changeSubscribtion"><div id="btn-text"></div></b-button><br><br>
<b-button id="subscribe-btn" type="is-primary" @click="changeSubscribtion"><div id="btn-text"></div></b-button>
<MsgCard
v-for="id in messagelist.slice().reverse()"
:key="id"

View File

@ -8,7 +8,7 @@ var auth = {},
_messages = {},
// Tag
_taglist = [],
_taglist = ["efi","wichtig"],
_tags = [],
tagArray = [],

View File

@ -14,8 +14,8 @@ Vue.component('MsgCard', {
<i class="material-icons">account_circle</i>
Erstellt von {{ msg.user }}
</div>
<i id="bockmark-not-active" class="material-icons" :key="vueRender.key" @click="myFilter(msg._id)" v-if="!isActive">bookmark_border</i>
<i id="bockmark-active" class="material-icons" :key="vueRender.key" @click="myFilter(msg._id)" v-else>bookmark</i>
<i id="bockmark-not-active" class="material-icons" :key="isActive" @click="myFilter(msg._id)" v-if="!isActive">bookmark_border</i>
<i id="bockmark-active" class="material-icons" :key="isActive" @click="myFilter(msg._id)" v-else>bookmark</i>
</div>
</div>`,
props: ['msg', 'isBookmark'],
@ -23,9 +23,9 @@ Vue.component('MsgCard', {
data: function () {
return {
isActive: this.isBookmark,
isActive_: 0,
msgid: this.msg._id,
bookmarkArray: auth.bookmarks,
vueRender: vueRender,
};
},
@ -73,9 +73,6 @@ Vue.component('MsgCard', {
$("#subscribe-btn").css("visibility", "visible");
//console.log("link: " + tag);
searching(tag);
var btnString = "#" + tag + " abonnieren";
$("#btn-text").text(btnString);
$("#subscribe-btn").css("visibility", "visible");
},
isBookmarkActive: function (msgid) {
//console.log("isBookmarkActive(): " + msgid);

View File

@ -99,10 +99,7 @@ function get_insert_tag(id) {
function searching(searchtext) {
_isSearchActiv = true;
$("#escape-search-link").css("visibility", "visible");
//console.log(_tags);
console.log(data);
if(data.indexOf(searchtext) > -1){
if(_taglist.indexOf(searchtext.replace(/#/g, '')) > -1){
var btnString = "#" + searchtext.replace(/#/g, '') + " abonnieren";
$("#btn-text").text(btnString);
$("#subscribe-btn").css("visibility", "visible");