Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel

GNUmakefile

@@ -246,6 +246,8 @@ pack-winXX-cmake:
 	cd Build$(BITS) && cmake --build . --config Release
 
 	cd Build$(BITS) && cpack -G NSIS
+          
+	./installer-generator.sh $(BITS) 
 
 ################################################################################
 ### @brief Windows Vista 64-bit bundle

Installation/Windows/Templates/arango-packer-template.nsi

@@ -0,0 +1,52 @@
+; arango-packer-template.nsi
+;
+; this script copies  the installation program
+; for arango and the corresponding window runtime
+; libraries which the arango installation program needs
+;
+; The installation program and the runtimes are
+; copied to the TEMP directory and then the arango
+; installer is started
+;--------------------------------
+
+; !include "Library.nsh"
+
+; The name of the installer
+Name "arango-unpacker"
+
+; The file to write
+OutFile "arango-unpacker-@BITS@.exe"
+
+; The default installation directory
+!define APPNAME "Unpacker"
+!define COMPANYNAME "Triagens"
+InstallDir $TEMP\${COMPANYNAME}\${APPNAME}
+
+
+
+; Request application privileges for Windows Vista
+RequestExecutionLevel user
+
+;--------------------------------
+
+; Pages
+Page instfiles
+
+;--------------------------------
+
+; The stuff to install
+Section "" ;No components page, name is not important
+
+
+  ; Set output path to the installation directory.
+  SetOutPath $INSTDIR
+  ; Put file there
+; !insertmacro InstallLib DLL SHARED NOREBOOT_PROTECTED "exdll.dll" $INSTDIR $TEMP
+	file "..\Installation\Windows\Plugins\SharedMemory\Plugins\@BITS@\msvcr120.dll"
+	file "@INSTALLERNAME@.exe"
+        Rename "$INSTDIR\Installation\Windows\Plugins\SharedMemory\Plugins\@BITS@\msvcr120.dll" "$INSTDIR\msvcr120.dll"
+;        Rename "$INSTDIR\Build@BITS@\@INSTALLERNAME@.exe" "$INSTDIR\@INSTALLERNAME@.exe"
+        Exec "$INSTDIR\@INSTALLERNAME@.exe"
+        Quit
+  
+SectionEnd ; end the section

installer-generator.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+NSIS_PATH="/cygdrive/c/Program Files (x86)/NSIS"
+
+bits=$1
+INSTALLERNAME=`grep CPACK_PACKAGE_FILE_NAME Build$bits/CPackConfig.cmake | grep -o '".*"' | awk -F\" '{print $2}'`
+cat Installation/Windows/Templates/arango-packer-template.nsi | sed -e "s/@BITS@/$bits/g" | sed -e  "s/@INSTALLERNAME@/${INSTALLERNAME}/g" > Build$bits/arango-packer-$bits.nsi
+
+"$NSIS_PATH"/bin/makensis.exe   Build$bits/arango-packer-$bits.nsi
+

js/apps/system/aardvark/frontend/js/views/modalView.js

@@ -78,17 +78,20 @@
     },
 
     createModalHotkeys: function() {
-      var self = this;
       //submit modal
       $(this.el).bind('keydown', 'ctrl+return', function(){
         $('.button-success').click();
       });
-      $("#modalPlaceholder input").bind('keydown', 'return', function(){
+      $("input", $(this.el)).bind('keydown', 'return', function(){
         $('.button-success').click();
       });
-      $("#modalPlaceholder select").bind('keydown', 'return', function(){
+      $("select", $(this.el)).bind('keydown', 'return', function(){
         $('.button-success').click();
       });
+    },
+
+    createInitModalHotkeys: function() {
+      var self = this;
       //navigate through modal buttons
       //left cursor
       $(this.el).bind('keydown', 'left', function(){
@@ -98,6 +101,7 @@
       $(this.el).bind('keydown', 'right', function(){
         self.navigateThroughButtons('right');
       });
+
     },
 
     navigateThroughButtons: function(direction) {
@@ -275,9 +279,10 @@
 
       //enable modal hotkeys after rendering is complete
       if (this.enabledHotkey === false) {
-        this.createModalHotkeys();
+        this.createInitModalHotkeys();
         this.enabledHotkey = true;
       }
+      this.createModalHotkeys();
     },
 
     hide: function() {

js/apps/system/aardvark/test/specs/views/modalViewSpec.js

@@ -7,7 +7,7 @@
   "use strict";
 
   describe("The Modal view Singleton", function() {
-    
+
     var testee, div, jQueryDummy;
 
     beforeEach(function() {
@@ -392,17 +392,21 @@
 
     it("should call keyboard bind function", function() {
       spyOn(testee, "createModalHotkeys");
+      spyOn(testee, "createInitModalHotkeys");
       testee.enabledHotkey = false;
       testee.show("modalTable.ejs", "Delegate Events", undefined, undefined, undefined, undefined);
       expect(testee.createModalHotkeys).toHaveBeenCalled();
+      expect(testee.createInitModalHotkeys).toHaveBeenCalled();
 
     });
 
     it("should not call keyboard bind function", function() {
       spyOn(testee, "createModalHotkeys");
+      spyOn(testee, "createInitModalHotkeys");
       testee.enabledHotkey = true;
       testee.show("modalTable.ejs", "Delegate Events", undefined, undefined, undefined, undefined);
-      expect(testee.createModalHotkeys).not.toHaveBeenCalled();
+      expect(testee.createModalHotkeys).toHaveBeenCalled();
+      expect(testee.createInitModalHotkeys).not.toHaveBeenCalled();
     });
 
     it("should call function bind function for view.el", function() {