Update iframe width and height for embed image code

ucsdlib · Jan 26, 2019 · c213e0a · c213e0a
1 parent 7a5571f
commit c213e0a
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/app/helpers/dams_objects_helper.rb b/app/helpers/dams_objects_helper.rb
@@ -410,6 +410,10 @@ def file_data(parameters)
     fieldData = @document["#{prefix}files_tesim"]
   end
 
+  def grabFileSize(parameters={})
+    file_use(parameters,"quality")
+  end
+
 	#---
 	# Get the source file id value from the component's 'files_tesim' value.
 	#

diff --git a/app/views/dams_objects/_admin_download.html.erb b/app/views/dams_objects/_admin_download.html.erb
@@ -1,12 +1,18 @@
 <%
-	component_id = (defined?(cmpID)) ? "#{cmpID}" : ''
-	embed_url = (defined?(embedURL)) ? "#{embedURL}" : ''
+	component_id = (defined?(cmpID)) ? "#{cmpID}" : nil
+	embed_url = (defined?(embedURL)) ? "#{embedURL}" : nil
 	etc_menu_item_class = 'pull-right'
 	embed_glyph =  '<i class="glyphicon glyphicon-share-alt"></i> Embed'.html_safe
 	adl_glyph =  '<i class="glyphicon glyphicon-download-alt"></i> Download File'.html_safe
   file_format = (defined?(format)) ? "#{format.capitalize}" : ''
   embed_width = (format == 'audio') ? '629' : '560'
   embed_height = (format == 'audio') ? '46' : '315'
+  file_size = (format == 'image') ? grabFileSize(:componentIndex=>component_id) : nil
+  if file_size
+    dim = file_size.split("x")
+    embed_width = dim[0]
+    embed_height = dim[1]
+  end
 %>
 
 <div class="etc-menu">

diff --git a/app/views/dams_objects/_complex_object_viewer.html.erb b/app/views/dams_objects/_complex_object_viewer.html.erb
@@ -70,7 +70,7 @@
 				<div data='<%=dataForDynamicLoad%>'></div>
                             <% end %>
 		    <%= render :partial => 'metadata_component', :locals => {:componentIndex => i} %>
-		    <%= render :partial => 'admin_download', :locals => {:embedURL => embed_url, :downloadFilePath => download_file_path, :downloadDerivativePath => service_file_path, :format => fileType  } if access_notice.nil?%>
+		    <%= render :partial => 'admin_download', :locals => {:cmpID => i, :embedURL => embed_url, :downloadFilePath => download_file_path, :downloadDerivativePath => service_file_path, :format => fileType  } if access_notice.nil?%>
 
 		  <% elsif fileType == 'audio' %>
 		    <%= render :partial => 'audio_viewer_complex', :locals => {:access_notice => access_notice, :componentIndex => i, :downloadFilePath => download_file_path, :downloadDerivativePath => nil  } %>

diff --git a/spec/features/dams_object_spec.rb b/spec/features/dams_object_spec.rb
@@ -1410,7 +1410,6 @@
       expect(page).to have_content('Embed URL')
       expect(page).to have_content('Embed Image')
       expect(page.body).to match(/embed\/#{@localObj.id}\/2/)
-      expect(page).to have_selector('textarea', text: 'width="560" height="315"')
     end
   end
 end
@@ -1667,7 +1666,6 @@
       expect(page).to have_content('Embed URL')
       expect(page).to have_content('Embed Image')
       expect(page.body).to match(/embed\/#{@obj.id}\/0/)
-      expect(page).to have_selector('textarea', text: 'width="560" height="315"')
     end
   end
 end