Merge branch 'master' into move-gl-dropdownmove-gl-dropdown

1 files changed, 4 insertions, 2 deletions

diff --git a/app/assets/javascripts/init_notes.js b/app/assets/javascripts/init_notes.js
index 3a8b4360cb6..882aedfcc76 100644
--- a/app/assets/javascripts/init_notes.js
+++ b/app/assets/javascripts/init_notes.js
@@ -1,4 +1,4 @@
-/* global Notes */
+import Notes from './notes';
 
 export default () => {
   const dataEl = document.querySelector('.js-notes-data');
@@ -10,5 +10,7 @@ export default () => {
     autocomplete,
   } = JSON.parse(dataEl.innerHTML);
 
-  window.notes = new Notes(notesUrl, notesIds, now, diffView, autocomplete);
+  // Create a singleton so that we don't need to assign
+  // into the window object, we can just access the current isntance with Notes.instance
+  Notes.initialize(notesUrl, notesIds, now, diffView, autocomplete);
 };