fix(content-entry): fix dropdown during scroll in related files and u…

…pload list
kaltura · Oct 15, 2017 · 6a3b57f · 6a3b57f
1 parent b95b7e5
commit 6a3b57f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 14 deletions.
diff --git a/src/applications/content-entries-app/entry/entry-related/entry-related.component.html b/src/applications/content-entries-app/entry/entry-related/entry-related.component.html
@@ -1,19 +1,17 @@
 <k-area-blocker [showLoader]="_handler.showSectionLoader" [message]="_handler.sectionBlockerMessage">
 	<kFileDialog #fileDialog [allowMultiple]="true" (onFileSelected)="_handler._onFileSelected($event)"></kFileDialog>
-	<div class="kRelated" #related>
+	<div class="kRelated">
 		<p class="kTitle">{{'applications.content.entryDetails.related.related' | translate}}</p>
 		<button type="button" class="kButtonDefault" (click)="fileDialog.open($event)" pButton label="{{'applications.content.entryDetails.related.add' | translate}}"></button>
 		<div class="kTable">
 			<p-dataTable [value]="(_handler._relatedFiles$ | async)?.items" scrollable="true" scrollHeight="100%" [rowStyleClass]="_relatedTableRowStyle" >
 				<p-column field="filename" header="{{'applications.content.entryDetails.related.name' | translate}}">
 				</p-column>
-				<p-column header="{{'applications.content.entryDetails.related.type' | translate}}" [style]="{'width':'140px'}">
+				<p-column header="{{'applications.content.entryDetails.related.type' | translate}}" [style]="{'width':'140px', 'overflow':'visible'}">
 					<ng-template let-col let-file="rowData" pTemplate="body">
-						<p-dropdown kDropdownCloseOnScroll
+						<p-dropdown
                         [disabled]="file.uploading || file.uploadFailure"
-                        [scrollTarget]="related"
                         [options]="_fileTypes"
-                        [appendTo]="'body'"
                         [autoWidth]="false"
                         [placeholder]="'applications.content.entryDetails.related.select' | translate"
                         [(ngModel)]="file.format"
@@ -51,7 +49,7 @@
 					</ng-template>
 				</p-column>
 			</p-dataTable>
-			<p-menu kMenuCloseOnScroll [scrollTarget]="related" #actionsmenu popup="popup" [model]="_actions" [appendTo]="'body'"></p-menu>
+			<p-menu kMenuCloseOnScroll #actionsmenu popup="popup" [model]="_actions" [appendTo]="'body'"></p-menu>
 		</div>
 	</div>
 	<kPopupWidget #editPopup [popupWidth]="380" [popupHeight]="300" [modal]="true">

diff --git a/src/applications/kmc-upload-app/upload-button/upload-button.component.html b/src/applications/kmc-upload-app/upload-button/upload-button.component.html
@@ -3,13 +3,13 @@
         class="kButtonDefault kUploadBtn"
         (click)="uploadmenu.open()"></button>
 
-<kPopupWidget #uploadmenu [popupWidth]="315" [popupHeight]="385" [closeBtn]="true" [modal]="true" [transparent]="true">
+<kPopupWidget #uploadmenu [popupWidth]="315" [popupHeight]="385" [closeBtn]="true" [modal]="true" [transparent]="true" [preventPageScroll]="true">
   <ng-template>
     <kKMCUploadMenu (onItemSelected)="_onMenuItemSelected($event)"></kKMCUploadMenu>
   </ng-template>
 </kPopupWidget>
 
-<kPopupWidget #uploadsettings [popupWidth]="791" [popupHeight]="607" [closeBtn]="true" [modal]="true">
+<kPopupWidget #uploadsettings [popupWidth]="791" [popupHeight]="607" [closeBtn]="true" [modal]="true" [preventPageScroll]="true">
   <ng-template>
     <kKMCUploadSettings [parentPopupWidget]="uploadsettings"></kKMCUploadSettings>
   </ng-template>

diff --git a/src/applications/kmc-upload-app/upload-settings/upload-settings.component.html b/src/applications/kmc-upload-app/upload-settings/upload-settings.component.html
@@ -9,9 +9,7 @@ <h1>{{ 'applications.upload.uploadSettings.title' | translate }}</h1>
       <form [formGroup]="_profileForm" class="kProfile">
         <span>{{ 'applications.upload.uploadSettings.profile' | translate }}</span>
         <p-dropdown class="kTranscodingProfile"
-                    kDropdownCloseOnScroll
                     [options]="_transcodingProfiles"
-                    [appendTo]="'body'"
                     [autoWidth]="false"
                     [placeholder]="'applications.upload.uploadSettings.profilePlaceholder' | translate"
                     [formControl]="_transcodingProfileField">
@@ -55,12 +53,10 @@ <h1>{{ 'applications.upload.uploadSettings.title' | translate }}</h1>
           </p-column>
           <p-column field="type"
                     [sortable]="false"
-                    [style]="{ 'width': '150px' }"
+                    [style]="{ 'width': '150px', 'overflow':'visible' }"
                     [header]="'applications.upload.uploadSettings.table.header.mediaType' | translate">
             <ng-template let-col let-file="rowData" pTemplate="body">
-              <p-dropdown kDropdownCloseOnScroll
-                          [options]="_fileTypes"
-                          [appendTo]="'body'"
+              <p-dropdown [options]="_fileTypes"
                           [autoWidth]="false"
                           [(ngModel)]="file.mediaType"
                           placeholder="{{'applications.content.entryDetails.related.select' | translate}}"></p-dropdown>