Skip to content

Commit

Permalink
Fix update tag on contact page (#1089)
Browse files Browse the repository at this point in the history
  • Loading branch information
asbiin authored Apr 2, 2018
1 parent fcc139e commit 18f63df
Show file tree
Hide file tree
Showing 12 changed files with 34 additions and 22 deletions.
2 changes: 1 addition & 1 deletion public/css/app.css.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/js/app.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/js/app.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/js/langs/en.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/js/manifest.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion public/js/manifest.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion public/js/vendor.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/js/vendor.js.map

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions public/mix-manifest.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"/js/app.js": "/js/app.js?id=0b2709332206e1865cbd",
"/js/app.js": "/js/app.js?id=c01cb545c68d9fda7aee",
"/css/app.css": "/css/app.css?id=ce61f35432352117b85f",
"/css/stripe.css": "/css/stripe.css?id=956554a2e96db30fafa3",
"/js/app.js.map": "/js/app.js.map?id=e50c0a8e6f3c9fd4e7d4",
"/css/app.css.map": "/css/app.css.map?id=f513aaf12454dcc19379",
"/js/app.js.map": "/js/app.js.map?id=7755fb0b0f28538e6336",
"/css/app.css.map": "/css/app.css.map?id=68f4f4b1e73b2fab974b",
"/css/stripe.css.map": "/css/stripe.css.map?id=80d7af9d49b0922d35e6",
"/js/vendor.js": "/js/vendor.js?id=27d50887c20a5b335d52",
"/js/vendor.js.map": "/js/vendor.js.map?id=3fb51c262c8efe3582c1",
"/js/vendor.js": "/js/vendor.js?id=a49a2fa050af3f4fa573",
"/js/vendor.js.map": "/js/vendor.js.map?id=edb69044ca60083c254e",
"/js/stripe.js": "/js/stripe.js?id=53bdff9014c2f8618542",
"/js/stripe.js.map": "/js/stripe.js.map?id=f0f557c67621a3a7e628",
"/js/manifest.js": "/js/manifest.js?id=986277f41177e12a72bd",
"/js/manifest.js.map": "/js/manifest.js.map?id=24f04fbf0e7bfbcf1d9c"
"/js/manifest.js": "/js/manifest.js?id=762d9e2e684fedba1433",
"/js/manifest.js.map": "/js/manifest.js.map?id=b50074e66422fde96590"
}
20 changes: 14 additions & 6 deletions resources/assets/js/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -199,8 +199,11 @@ export function loadLanguageAsync (lang, set) {
}

const app = null;
const me = this;
loadLanguageAsync(window.Laravel.locale, true).then((lang) => {
this.app = new Vue({

// the Vue appplication
me.app = new Vue({
i18n,
data: {
activities_description_show: false,
Expand All @@ -210,13 +213,18 @@ loadLanguageAsync(window.Laravel.locale, true).then((lang) => {
},
methods: {
},
mounted: function() {

// required modules
require('./tags');
require('./search');
require('./contacts');

}
}).$mount('#app');
return lang;
});

require('./tags');
require('./search');
require('./contacts');
return app;
});

// jQuery-Tags-Input for the tags on the contact
$(document).ready(function() {
Expand Down
5 changes: 4 additions & 1 deletion resources/assets/js/tags.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
// Code to manage tags in the contact view

var vue = $('#app')[0].__vue__;

$('#tags').tagsInput({
'maxChars' : 255,
maxChars : 255,
defaultText : vue.$t('people.tag_add')
});

$('#tagsForm').hide();
Expand Down
1 change: 1 addition & 0 deletions resources/lang/en/people.php
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,7 @@

// tags
'tag_edit' => 'Edit tag',
'tag_add' => 'add a tag',

// Introductions
'introductions_sidebar_title' => 'How you met',
Expand Down

0 comments on commit 18f63df

Please sign in to comment.