Renaming var flash to flashData

[Abdulwahaab710]

Previously in this PR #695 I moved the flash message script block to a separate file to make it play well with Content Security Policy. When I moved them to a separate file I had to pass the data for the flash through data attribute.

shopify_app/lib/generators/shopify_app/install/templates/_flash_messages.html.erb

Lines 1 to 3 in 32af7ac

	<% content_for :javascript do %>
	<%= content_tag(:div, nil, id: 'shopify-app-flash', data: { flash: { notice: flash[:notice], error: flash[:error] } }) %>
	<% end %>

In flash_message.js I fetch the data and store them in a variable called flash

shopify_app/lib/generators/shopify_app/install/templates/flash_messages.js

Line 5 in 32af7ac

var flash = JSON.parse(document.getElementById('shopify-app-flash').dataset.flash);

The issue is that there is already a function called flash in the same file

shopify_app/lib/generators/shopify_app/install/templates/flash_messages.js

Line 4 in 32af7ac

document.addEventListener(eventName, function flash() {

So there is a conflict with the names, and that's what I am trying to accomplish in this PR, which is renaming the variable flash to flashData.

[tiffanytse]

Could you provide more context why you think these need to be renamed?

[Abdulwahaab710]

👋 Hey @tiffanytse,
In this PR #695 I moved the flash message script block to a separate file to make it play well with Content Security Policy. When I moved them to a separate file I had to pass the data for the flash through data attribute.

shopify_app/lib/generators/shopify_app/install/templates/_flash_messages.html.erb

Lines 1 to 3 in 32af7ac

	<% content_for :javascript do %>
	<%= content_tag(:div, nil, id: 'shopify-app-flash', data: { flash: { notice: flash[:notice], error: flash[:error] } }) %>
	<% end %>

In flash_message.js I fetch the data and store them in a variable called flash

shopify_app/lib/generators/shopify_app/install/templates/flash_messages.js

Line 5 in 32af7ac

var flash = JSON.parse(document.getElementById('shopify-app-flash').dataset.flash);

The issue is that there is already a function called flash in the same file

shopify_app/lib/generators/shopify_app/install/templates/flash_messages.js

Line 4 in 32af7ac

document.addEventListener(eventName, function flash() {

So there is a conflict with the names, that's why I want to rename the variable flash to flashData.

[katiedavis]

LG2M

[clayton-shopify]

Looks correct. 👍