Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
Jan Steemann 2014-08-01 17:08:31 +02:00
parent e733e3e83b 5700394a69
commit e207d60455
5 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/apps/system/aardvark/frontend/js/templates/dbSelectionView.ejs
View File

@ -18,11 +18,13 @@ if (list.length > 1) {
<%
});
%>
<li class="divider"></li>
<%
}
%>
<% if (current === "_system") { %>
<% if (list.length >= 2) { %>
<li class="divider"></li>
<% } %>
<li class="dropdown-header">Manager</li>
<li id="databaseNavi" class="dropdown-item">
<a id="databases" class="tab" href="#databases">Manage DBs</a>

4
js/apps/system/aardvark/frontend/js/views/documentsView.js
View File

@ -560,10 +560,6 @@
$("[data-toggle=tooltip]").tooltip();
$('.modalImportTooltips').tooltip({
placement: "left"
});
arangoHelper.fixTooltips(".icon_arangodb, .arangoicon", "top");
this.drawTable();
this.renderPaginationElements();

5
js/apps/system/aardvark/frontend/js/views/modalView.js
View File

@ -276,7 +276,10 @@
model.advancedContent = advancedContent || false;
$(".modal-body").html(template.render(model));
$('.modalTooltips').tooltip({
placement: "left"
position: {
my: "left top",
at: "right+55 top-1"
}
});
var ind = buttons.indexOf(this.closeButton);
buttons.splice(ind, 1);

2
js/apps/system/aardvark/test/specs/views/dbSelectionViewSpec.js
View File

@ -54,7 +54,7 @@
expect(div.childElementCount).toEqual(2);
childs = $(dbList).children();
expect(childs.length).toEqual(4);
expect(childs.length).toEqual(3);
expect($("a", $(childs[1])).attr("id")).toEqual(list[0]);
expect($("a", $(childs[2])).attr("id")).toEqual(list[1]);

6
js/apps/system/aardvark/test/specs/views/documentsViewSpec.js
View File

@ -1738,11 +1738,9 @@
expect(jQueryDummy.addClass).toHaveBeenCalledWith('disabledPag');
expect(jQueryDummy.html).toHaveBeenCalledWith('tmp');
expect(jQueryDummy.tooltip).toHaveBeenCalled();
expect(jQueryDummy.tooltip).toHaveBeenCalledWith({placement: "left"});
expect(window.$).toHaveBeenCalledWith("#collectionPrev");
expect(window.$).toHaveBeenCalledWith("#collectionNext");
expect(window.$).toHaveBeenCalledWith("[data-toggle=tooltip]");
expect(window.$).toHaveBeenCalledWith('.modalImportTooltips');
expect(window.$).toHaveBeenCalledWith(1);
expect(arangoHelper.fixTooltips).toHaveBeenCalledWith(
@ -1765,11 +1763,9 @@
expect(jQueryDummy.addClass).toHaveBeenCalledWith('disabledPag');
expect(jQueryDummy.html).toHaveBeenCalledWith('tmp');
expect(jQueryDummy.tooltip).toHaveBeenCalled();
expect(jQueryDummy.tooltip).toHaveBeenCalledWith({placement: "left"});
expect(window.$).toHaveBeenCalledWith("#collectionPrev");
expect(window.$).not.toHaveBeenCalledWith("#collectionNext");
expect(window.$).toHaveBeenCalledWith("[data-toggle=tooltip]");
expect(window.$).toHaveBeenCalledWith('.modalImportTooltips');
expect(window.$).toHaveBeenCalledWith(1);
expect(arangoHelper.fixTooltips).toHaveBeenCalledWith(
@ -1792,11 +1788,9 @@
expect(jQueryDummy.addClass).toHaveBeenCalledWith('disabledPag');
expect(jQueryDummy.html).toHaveBeenCalledWith('tmp');
expect(jQueryDummy.tooltip).toHaveBeenCalled();
expect(jQueryDummy.tooltip).toHaveBeenCalledWith({placement: "left"});
expect(window.$).not.toHaveBeenCalledWith("#collectionPrev");
expect(window.$).toHaveBeenCalledWith("#collectionNext");
expect(window.$).toHaveBeenCalledWith("[data-toggle=tooltip]");
expect(window.$).toHaveBeenCalledWith('.modalImportTooltips');
expect(window.$).toHaveBeenCalledWith(1);
expect(arangoHelper.fixTooltips).toHaveBeenCalledWith(