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

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

This commit is contained in:
Michael Hackstein 2013-05-24 15:21:54 +02:00
parent 866b74d4b6 f3bf3281a3
commit a814860c3f
7 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
html/admin/js/models/arangoCollection.js
View File

@ -1,5 +1,9 @@
/*jslint indent: 2, nomen: true, maxlen: 120, vars: true, white: true, plusplus: true, nonpropdel: true, continue: true, regexp: true */
/*global require, window, Backbone */
window.arangoCollection = Backbone.Model.extend({
initialize: function () {
'use strict';
},
urlRoot: "/_api/collection",

6
html/admin/js/models/arangoDocument.js
View File

@ -1,9 +1,13 @@
/*jslint indent: 2, nomen: true, maxlen: 120, vars: true, white: true, plusplus: true, nonpropdel: true, continue: true, regexp: true */
/*global require, window, Backbone */
window.arangoDocument = Backbone.Model.extend({
initialize: function () {
'use strict';
},
urlRoot: "/_api/document",
defaults: {
_id: "",
_rev: "",
_rev: ""
}
});

4
html/admin/js/models/arangoLog.js
View File

@ -1,5 +1,9 @@
/*jslint indent: 2, nomen: true, maxlen: 120, vars: true, white: true, plusplus: true, nonpropdel: true, continue: true, regexp: true */
/*global require, window, Backbone */
window.arangoLog = Backbone.Model.extend({
initialize: function () {
'use strict';
},
urlRoot: "/_admin/log",
defaults: {

7
html/admin/js/models/arangoStatistics.js
View File

@ -1,9 +1,14 @@
/*jslint indent: 2, nomen: true, maxlen: 120, vars: true, white: true, plusplus: true, nonpropdel: true, continue: true, regexp: true */
/*global require, window, Backbone */
window.Statistics = Backbone.Model.extend({
defaults: {
},
url: function() {
'use strict';
return "../statistics";
},
}
});

8
html/admin/js/models/arangoStatisticsDescription.js
View File

@ -1,3 +1,6 @@
/*jslint indent: 2, nomen: true, maxlen: 120, vars: true, white: true, plusplus: true, nonpropdel: true, continue: true, regexp: true */
/*global require, window, Backbone */
window.StatisticsDescription = Backbone.Model.extend({
defaults: {
"figures" : "",
@ -5,7 +8,8 @@ window.StatisticsDescription = Backbone.Model.extend({
},
url: function() {
'use strict';
return "../statistics-description";
},
}
});

7
html/admin/js/models/foxx.js
View File

@ -1,3 +1,6 @@
/*jslint indent: 2, nomen: true, maxlen: 120, vars: true, white: true, plusplus: true, nonpropdel: true, continue: true, regexp: true */
/*global require, window, Backbone */
window.Foxx = Backbone.Model.extend({
defaults: {
"title": "",
@ -8,6 +11,8 @@ window.Foxx = Backbone.Model.extend({
},
url: function() {
'use strict';
if (this.get("_key")) {
return "../aardvark/foxxes/" + this.get("_key");
}
@ -15,6 +20,8 @@ window.Foxx = Backbone.Model.extend({
},
isNew: function() {
'use strict';
return false;
}

1
js/Makefile.files
View File

@ -48,6 +48,7 @@ JAVASCRIPT_JSLINT = \
`find @srcdir@/js/common/modules/org -name "*.js"` \
`find @srcdir@/js/client/modules -name "*.js"` \
`find @srcdir@/js/server/modules -name "*.js"` \
`find @srcdir@/html/admin/js/models -name "*.js"` \
\
@srcdir@/js/client/client.js \
@srcdir@/js/server/server.js \