Skip to content

Commit

Permalink
Issue #SB-000 merge: Merge pull request #3368 from swayangjit/release…
Browse files Browse the repository at this point in the history
…-5.1.2

Issue #SB-000 merge: Merge branch 'release-5.1.0.9' into release-5.1.2
  • Loading branch information
swayangjit authored Mar 15, 2023
2 parents 49d7ab9 + 2460868 commit 51ad101
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@ export class AttachmentService {
"FRMELEMNTS_LBL_FILE_SIZE_EXCEEDED",
"FRMELEMENTS_LBL_CAMERA",
"FRMELEMENTS_LBL_UPLOAD_IMAGE",
"FRMELEMENTS_LBL_UPLOAD_FILE"
"FRMELEMENTS_LBL_UPLOAD_FILE",
"FRMELEMENTS_LBL_UPLOAD_VIDEO"
])
.subscribe((data) => {
this.texts = data;
Expand All @@ -69,6 +70,7 @@ export class AttachmentService {
},
{
text: this.texts["FRMELEMNTS_MSG_USE_CAMERA"],
icon: "camera",
handler: () => {
this.takePicture(this.camera.PictureSourceType.CAMERA);
return false;
Expand Down Expand Up @@ -103,23 +105,34 @@ export class AttachmentService {
buttons: [
{
text: this.texts["FRMELEMENTS_LBL_CAMERA"],
icon: "camera",
handler: () => {
this.takePicture(this.camera.PictureSourceType.CAMERA);
return false;
},
},
{
text: this.texts["FRMELEMENTS_LBL_UPLOAD_IMAGE"],
icon: "cloud-upload",
handler: () => {
this.openLocalLibrary()
return false;
},
},
{
text: this.texts["FRMELEMENTS_LBL_UPLOAD_VIDEO"],
icon: "videocam",
handler: () => {
this.takePicture(this.camera.PictureSourceType.PHOTOLIBRARY, this.camera.MediaType.VIDEO);
return false;
},
},
{
text: this.texts["FRMELEMENTS_LBL_UPLOAD_FILE"],
icon: "document",
handler: () => {
// this.openAllFile()
this.takePicture(this.camera.PictureSourceType.PHOTOLIBRARY);
this.openFile();
return false;
},
},
Expand All @@ -139,7 +152,7 @@ export class AttachmentService {
saveToPhotoAlbum: false,
correctOrientation: true,
mediaType: mediaType,
destinationType: this.camera.DestinationType.FILE_URI,
destinationType: this.camera.DestinationType.FILE_URI
};

this.camera
Expand Down
1 change: 1 addition & 0 deletions src/assets/i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -1023,6 +1023,7 @@
"FRMELEMENTS_LBL_CAMERA": "Camera",
"FRMELEMENTS_LBL_UPLOAD_FILE": "Upload file",
"FRMELEMENTS_LBL_UPLOAD_IMAGE": "Upload image",
"FRMELEMENTS_LBL_UPLOAD_VIDEO":"Upload video",
"FRMELEMENTS_LBL_DATE": "Date",
"FRMELEMENTS_LBL_CAPTURE": "Capture",
"FRMELEMNTS_LBL_ENTITIES": "Entities",
Expand Down

0 comments on commit 51ad101

Please sign in to comment.