Merge branch 'devel' of github.com:arangodb/arangodb into devel

Documentation/Books/Users/Foxx/Nutshell/README.mdpp

@@ -23,6 +23,7 @@ Start the interface from <a href="http://localhost:8529" target="_blank">http://
   <dt>Note</dt>
   <dd>Before we start: Please <a href="https://www.arangodb.com/download" target="_blank">Install and run ArangoDB</a> in version 2.5 or newer</dd>
 </dl>
+
 ![ArangoDB WebInterface](applications-tab.png)
 
 <a id="new-application" />
@@ -54,7 +55,6 @@ Whenever we modify something in the app during this tutorial it should be visibl
 So you can directly test if your modification has worked or not.
 
 ![Swagger Documentation](foxx_documentation.png)
-![TODO](foxx_create.png)
 
 <a id="developing" />
 !SUBSECTION Developing in Foxx
@@ -153,9 +153,6 @@ Some details you should know about the code:
 * `res.json()` creates a JSON response for the client.
 * The comment on top of the function will generate a nice documentation.
 
-<img src="/wp-content/themes/triagens/tutorials/foxx/foxx_readDocuments.png" width="100%">
-
-
 <a id="create-document" />
 !SUBSECTION  Create a new document
 This code-snippet defines the route to create a new document in our collection:
@@ -183,10 +180,6 @@ Some details you should know about the code:
 * `forClient()` will create JSON output for the client
 * `bodyParam` defines that there is an body expected in each request and the body should correspond to a valid FirstCollection object. All other bodies will be rejected and a documentation will be generated for this body. It can be accessed in the request parameters via it's name 'firstCollection'
 
-<div class="tutorialViewer">
-<img src="/wp-content/themes/triagens/tutorials/foxx/foxx_createNewDoc.png" width="100%">
-</div>
-
 <a id="read-document" />
 !SUBSECTION  Read a single document
 This route allows to read a specific document in our collection, identified by Id:
@@ -214,10 +207,6 @@ controller.get('/firstCollection/:id', function (req, res) {
 * `byId` fetches a document from the collection by it's unique identifier: `_key`
 * `pathParam` documents the path parameter `id` as described in the path. It also restricts it to be a string.
 
-<div class="tutorialViewer">
-<img src="/wp-content/themes/triagens/tutorials/foxx/foxx_readDocument.png" width="100%">
-</div>
-
 <a id="update-document">
 !SUBSECTION  Update a document
 This code shows how to update a specific document in our collection. The API call is:
@@ -247,10 +236,6 @@ Some details you should now about the code:
 * `controller.put(path, callback)` creates a `PUT` request on `path`. It will call `callback` whenever triggered.
 * `replaceById` overwrites a document from the collection with a newer version.
 
-<div class="tutorialViewer">
-<img src="/wp-content/themes/triagens/tutorials/foxx/foxx_updateDocument.png" width="100%">
-</div>
-
 <a id="delete-document">
 !SUBSECTION  Delete a document
 This call allows to delete a specific document in our collection:
@@ -281,10 +266,6 @@ Some details you should now about the code:
 * `errorResponse` defines the message that should be delivered to the client whenever there was an error. In this case the user will get a classical `404`.
 * If no `errorResponse` is given a internal `500` will be returned by the server.
 
-<div class="tutorialViewer">
-<img src="/wp-content/themes/triagens/tutorials/foxx/foxx_removeDocument.png" width="100%">
-</div>
-
 <a id="execute-query">
 !SUBSECTION  Adding a new route / execute a query
 We now want to add some functionality, a simple search query. First we create an endpoint that allows to execute a simple AQL query.
@@ -323,6 +304,3 @@ Some details you should know about the code:
   <dt>Note</dt>
   <dd>This part of the code is not generated.</dd>
 </dl>
-<div class="tutorialViewer">
-<img src="/wp-content/themes/triagens/tutorials/foxx/foxx_searchByName.png" width="100%">
-</div>

js/apps/system/_admin/aardvark/APP/test/specs/router/routerSpec.js

@@ -33,6 +33,8 @@
 
     // Spy on all views that are initialized by startup
     beforeEach(function () {
+      // Disable the binding of resize event. Causes tests to occasionally fail
+      spyOn($.fn, "resize");
       window.CreateDummyForObject(window, "FoxxInstallView");
       naviDummy = {
         id: "navi",
@@ -324,6 +326,7 @@
 
       beforeEach(function () {
         r = new window.Router();
+        spyOn(r, "handleResize");
         simpleNavigationCheck = function (url, viewName, navTo, initObject,
           funcList, shouldNotRender, shouldNotCache) {
           var route,
@@ -676,6 +679,7 @@
       beforeEach(function () {
         spyOn(jQueryDummy, "ajax").andCallFake(function() { });
         r = new window.Router();
+        spyOn(r, "handleResize");
       });
 
       it("checkUser logged in", function () {