Fix for DFL-2892, JS Error on opening Dragonfly.

Author: Chris K

src/ui-scripts/actions/actionbroker.js

@@ -277,8 +277,17 @@ var ActionBroker = function()
       var shortcuts_hash = window.settings.general.get("shortcuts-hash");
       if (this._hash_shortcuts(default_shortcuts) != shortcuts_hash)
       {
-        stored_shortcuts = this._sync_shortcuts(default_shortcuts, stored_shortcuts);
-        this._store_shortcuts(stored_shortcuts);
+        try
+        {
+          stored_shortcuts = this._sync_shortcuts(default_shortcuts, stored_shortcuts);
+          this._store_shortcuts(stored_shortcuts);
+        }
+        catch(e)
+        {
+          stored_shortcuts = null;
+          window.settings.general.set("shortcuts", null);
+          window.settings.general.set("shortcuts-hash", "");
+        }
       }
     }
     return stored_shortcuts || default_shortcuts;

src/ui-scripts/dialog.js

@@ -126,3 +126,27 @@ function ConfirmDialogPrototype()
 ConfirmDialogPrototype.prototype = new BaseDialog();
 ConfirmDialog.prototype = new ConfirmDialogPrototype();
 
+/**
+ * @constructor
+ */
+function AlertDialog(template, ok_callback) {
+  this._init(template, ok_callback || function() {});
+};
+
+function AlertDialogPrototype()
+{
+  this._init = function(template, ok_callback)
+  {
+    var buttons = [
+      {
+        label: ui_strings.S_BUTTON_OK,
+        handler: ok_callback,
+      }
+    ];
+    BaseDialog.prototype._init.call(this, template, buttons);
+  };
+};
+
+AlertDialogPrototype.prototype = new BaseDialog();
+AlertDialog.prototype = new AlertDialogPrototype();
+

src/ui-strings/ui_strings-en.js

@@ -1694,3 +1694,6 @@ ui_strings.S_SCRIPT_TYPE_EXTENSIONJS = "Extension";
 
 /* DESC: Script type for events in the profiler */
 ui_strings.S_SCRIPT_TYPE_DEBUGGER = "Debugger";
+
+/* DESC: Alert dialog that updating of the custom shortcuts with new ones has failed. */
+ui_strings.D_SHORTCUTS_UPDATE_FAILED = "We could not update your custom keyboard shortcuts with the new ones.";