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

Conflicts:
	CHANGELOG

CHANGELOG

@@ -140,6 +140,8 @@ v1.1.2 (XXXX-XX-XX)
 
 * fixed issue #332: arangoimp --use-ids parameter seems to have no impact
 
+* fixed issue #337: "WaitForSync" on new collection does not work on Win/X64
+
 * fixed issue #336: Collections REST API docs
 
 * fixed issue #335: mmap errors due to wrong memory address calculation 

arangosh/V8Client/arangosh.cpp

@@ -843,6 +843,12 @@ static void RunShell (v8::Handle<v8::Context> context, bool promptError) {
   string goodPrompt;
   string badPrompt;
   
+#ifdef __APPLE__
+  // MacOS uses libedit, which does not support ignoring of non-printable characters in the prompt
+  // using non-printable characters in the prompt will lead to wrong prompt lengths being calculated
+  // we will therefore disable colorful prompts for MacOS.
+  goodPrompt = badPrompt = string("arangosh> ");
+#else
   if (BaseClient.colors()) {
     goodPrompt = string(ArangoClient::PROMPT_IGNORE_START) + string(ArangoClient::COLOR_BOLD_GREEN) + string(ArangoClient::PROMPT_IGNORE_END) + 
                  string("arangosh>") + 
@@ -857,7 +863,8 @@ static void RunShell (v8::Handle<v8::Context> context, bool promptError) {
   else {
     goodPrompt = badPrompt = string("arangosh> ");
   }
-  
+#endif
+   
   cout << endl;
 
   while (true) {

html/admin/js/master.js

@@ -1348,7 +1348,7 @@ var lastFormatQuestion = true;
         type: "PUT",
         async: false, // sequential calls!
         url: "/_api/collection/" + newColName + "/properties",
-        data: '{"waitForSync":' + JSON.stringify(wfs) + ',"journalSize":' + JSON.stringify(journalSize) + '}',  
+        data: '{"waitForSync":' + (wfs ? "true" : "false") + ',"journalSize":' + JSON.stringify(journalSize) + '}',  
         contentType: "application/json",
         processData: false, 
         success: function(data) {