Skip to content

U
ulakbus-ui
Commit e718c1fc authored by Vladimir Baranov's avatar Vladimir Baranov
Browse files
Options

Fix build

parent edad2093
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 11 deletions
Gruntfile.js
View file @ e718c1fc
...@@ -142,8 +142,10 @@ module.exports = function (grunt) { ...@@ -142,8 +142,10 @@ module.exports = function (grunt) {
"app/components/version/version.js", "app/components/version/version.js",
"app/components/version/interpolate-filter.js", "app/components/version/interpolate-filter.js",
"app/components/version/version-directive.js", "app/components/version/version-directive.js",
"app/components/messaging/*.js" "app/components/messaging/messaging_service.js",
"app/components/messaging/messaging.js"
], ],
nonull: true,
dest: 'dist/app.js' dest: 'dist/app.js'
}, },
components: { components: {
...@@ -199,7 +201,8 @@ module.exports = function (grunt) { ...@@ -199,7 +201,8 @@ module.exports = function (grunt) {
'app/shared/directives.js', 'app/shared/directives.js',
'app/components/**/*controller.js', 'app/components/**/*controller.js',
'app/components/**/*service.js', 'app/components/**/*service.js',
'app/components/messaging/*.js', "app/components/messaging/messaging_service.js",
"app/components/messaging/messaging.js"
], ],
dest: 'dist/<%= grunt.branchname %>/app.js' dest: 'dist/<%= grunt.branchname %>/app.js'
}, },
...@@ -323,7 +326,7 @@ module.exports = function (grunt) { ...@@ -323,7 +326,7 @@ module.exports = function (grunt) {
dev: { dev: {
files: { files: {
'app/index.html': 'app/main.html', 'app/index.html': 'app/main.html',
'app/app.js': 'app/main.js', 'app/app.js': 'app/main.js'
} }
}, },
prod: { prod: {
......
app/components/messaging/messaging.js
View file @ e718c1fc
...@@ -126,7 +126,7 @@ angular.module("ulakbus.messaging") ...@@ -126,7 +126,7 @@ angular.module("ulakbus.messaging")
}); });
} }
this.createDirectChannel = function(user){ iScope.createDirectChannel = function (user){
// user format is ['username', 'key', 'avatarUrl'] // user format is ['username', 'key', 'avatarUrl']
var key = user[1]; var key = user[1];
MessagingService.create_direct_channel(key) MessagingService.create_direct_channel(key)
...@@ -135,8 +135,6 @@ angular.module("ulakbus.messaging") ...@@ -135,8 +135,6 @@ angular.module("ulakbus.messaging")
}) })
}; };
iScope.createDirectChannel = this.createDirectChannel;
iScope.hideApp = function(){ iScope.hideApp = function(){
iScope.chatAppIsHidden = true; iScope.chatAppIsHidden = true;
MessagingService.toggle_messaging_window_visibility(false); MessagingService.toggle_messaging_window_visibility(false);
......
app/main.html
View file @ e718c1fc
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
<!-- @if NODE_ENV == 'PRODUCTION' --> <!-- @if NODE_ENV == 'PRODUCTION' -->
<link rel="stylesheet" href="css/app.css"> <link rel="stylesheet" href="css/app.css">
<link rel="stylesheet" href="css/roboto/roboto.css"> <link rel="stylesheet" href="css/roboto/roboto.css">
<link rel="stylesheet" href="css/jquery-ui.min.css">
<!-- @endif --> <!-- @endif -->
</head> </head>
<body ng-controller="KeyListenController" ng-keydown="down($event)"> <body ng-controller="KeyListenController" ng-keydown="down($event)">
...@@ -147,7 +146,6 @@ ...@@ -147,7 +146,6 @@
<!-- @if NODE_ENV == 'PRODUCTION' --> <!-- @if NODE_ENV == 'PRODUCTION' -->
<script src="bower_components/jquery.min.js"></script> <script src="bower_components/jquery.min.js"></script>
<script src="bower_components/jquery-ui.min.js"></script>
<script src="bower_components/angular.js"></script> <script src="bower_components/angular.js"></script>
<script src="bower_components/components.js"></script> <script src="bower_components/components.js"></script>
<script src="shared/translations.js"></script> <script src="shared/translations.js"></script>
......
app/zetalib/form_service.js
View file @ e718c1fc
...@@ -1552,12 +1552,11 @@ angular.module('ulakbus.formService', ['ui.bootstrap']) ...@@ -1552,12 +1552,11 @@ angular.module('ulakbus.formService', ['ui.bootstrap'])
angular.forEach(childmodel.form, function (v, k) { angular.forEach(childmodel.form, function (v, k) {
if (v.formName === key) { if (v.formName === key) {
//if (!childmodel.model[key].key) { //if (!childmodel.model[key].key) {
function indexInTitleMap(element, index, array) { var unicodeValue = v.titleMap.find(function (element, index, array) {
if (element['value'] === value) { if (element['value'] === value) {
return element; return element;
} }
} });
var unicodeValue = v.titleMap.find(indexInTitleMap);
if (unicodeValue){ if (unicodeValue){
unicodeValue = unicodeValue.name; unicodeValue = unicodeValue.name;
reformattedModel[key] = { reformattedModel[key] = {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment