Skip to content

Commit

Permalink
qa report 처리
Browse files Browse the repository at this point in the history
  • Loading branch information
@kimorkim
kimorkim committed May 31, 2016
1 parent 1d098b8 commit e5d966b
Show file tree
Hide file tree
Showing 5 changed files with 35 additions and 19 deletions.
5 changes: 5 additions & 0 deletions app/css/developer.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,4 +139,9 @@ body {
transform: scaleY(1.0);
-webkit-transform: scaleY(1.0);
}
}


.tab-content .tab-pane .upload_wrap {
width: 85%;
}
8 changes: 4 additions & 4 deletions app/src/sound.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ angular.module('common').controller('SoundController',

$scope.upload = function() {
var uploadFile = document.getElementById("uploadFile").files;
console.log("upload file : " + uploadFile);
// console.log("upload file : " + uploadFile);

if (!uploadFile) {
alert(Lang.Menus.file_required);
Expand Down Expand Up @@ -201,16 +201,16 @@ angular.module('common').controller('SoundController',

$scope.uploadSoundFile = function(files) {
//Sound 파일을 로컬 디렉토리에 저장
console.log('files number : ' + JSON.stringify(files));
// console.log('files number : ' + JSON.stringify(files));

Entry.plugin.uploadTempSoundFile(files, function(soundList) {

console.log("sound : " + JSON.stringify(soundList));
// console.log("sound : " + JSON.stringify(soundList));

//Sound 파일을 로컬 디렉토리에 저장 후 메타 정보 업데이트
$scope.$apply(function() {
soundList.forEach(function(item) {
console.log("item check : " + JSON.stringify(item));
// console.log("item check : " + JSON.stringify(item));
// var path = '/temp/' + item.filename.substring(0,2)+'/'+
// item.filename.substring(2,4)+'/'+'sound'+'/'+item.filename+'.'+item.ext;

Expand Down
37 changes: 24 additions & 13 deletions app/src/workspace.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,9 @@ angular.module('workspace').controller("WorkspaceController",
} else {
e.preventDefault();
e.returnValue = false;
$scope.doPopupControl({
'type':'hide'
});
}
};

Expand Down Expand Up @@ -165,19 +168,23 @@ angular.module('workspace').controller("WorkspaceController",
var sprite = object.sprite;
sprite.pictures.forEach(function (picture) {
if(picture.fileurl) {
picture.fileurl = picture.fileurl.replace(/\\/gi, path.sep);
picture.fileurl = picture.fileurl.replace(/%5C/gi, path.sep);
picture.fileurl = picture.fileurl.replace(/\\/gi, '%5C');
if(isOsx) {
picture.fileurl = picture.fileurl.replace(/%5C/gi, path.sep);
}
if(picture.fileurl && picture.fileurl.indexOf('bower_components') === -1) {
picture.fileurl = path.join('.', picture.fileurl.substr(picture.fileurl.lastIndexOf('temp')))
}
picture.fileurl = picture.fileurl.substr(picture.fileurl.lastIndexOf('temp'));
}
}
});
sprite.sounds.forEach(function (sound) {
if(sound.fileurl) {
sound.fileurl = sound.fileurl.replace(/\\/gi, path.sep);
sound.fileurl = sound.fileurl.replace(/%5C/gi, path.sep);
sound.fileurl = sound.fileurl.replace(/\\/gi, '%5C');
if(isOsx) {
sound.fileurl = sound.fileurl.replace(/%5C/gi, path.sep);
}
if(sound.fileurl && sound.fileurl.indexOf('bower_components') === -1) {
sound.fileurl = path.join('.', sound.fileurl.substr(sound.fileurl.lastIndexOf('temp')))
sound.fileurl = sound.fileurl.substr(sound.fileurl.lastIndexOf('temp'));
}
}
});
Expand Down Expand Up @@ -494,19 +501,23 @@ angular.module('workspace').controller("WorkspaceController",
var sprite = object.sprite;
sprite.pictures.forEach(function (picture) {
if(picture.fileurl) {
picture.fileurl = picture.fileurl.replace(/\\/gi, path.sep);
picture.fileurl = picture.fileurl.replace(/%5C/gi, path.sep);
picture.fileurl = picture.fileurl.replace(/\\/gi, '%5C');
if(isOsx) {
picture.fileurl = picture.fileurl.replace(/%5C/gi, path.sep);
}
if(picture.fileurl && picture.fileurl.indexOf('bower_components') === -1) {
picture.fileurl = path.join('.', picture.fileurl.substr(picture.fileurl.lastIndexOf('temp')))
picture.fileurl = picture.fileurl.substr(picture.fileurl.lastIndexOf('temp'));
}
}
});
sprite.sounds.forEach(function (sound) {
if(sound.fileurl) {
sound.fileurl = sound.fileurl.replace(/\\/gi, path.sep);
sound.fileurl = sound.fileurl.replace(/%5C/gi, path.sep);
sound.fileurl = sound.fileurl.replace(/\\/gi, '%5C');
if(isOsx) {
sound.fileurl = sound.fileurl.replace(/%5C/gi, path.sep);
}
if(sound.fileurl && sound.fileurl.indexOf('bower_components') === -1) {
sound.fileurl = path.join('.', sound.fileurl.substr(sound.fileurl.lastIndexOf('temp')))
sound.fileurl = sound.fileurl.substr(sound.fileurl.lastIndexOf('temp'));
}
}
});
Expand Down
2 changes: 1 addition & 1 deletion app/views/modal/picture_upload.html
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div class="row">
<div class="wrap">
<div class="wrap upload_wrap">
<div class="spinner" ng-show="isUploading">
<div class="rect1"></div>
<div class="rect2"></div>
Expand Down
2 changes: 1 addition & 1 deletion app/views/modal/sound.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ <h4 class="modal-title">{{'Workspace.sound_add'|text}}</h4>
<div class='modal_tab_bottom'></div>
</tab-heading>
<div class="row">
<div class="wrap">
<div class="wrap upload_wrap">
<div class="spinner" ng-show="isUploading">
<div class="rect1"></div>
<div class="rect2"></div>
Expand Down

0 comments on commit e5d966b

Please sign in to comment.