mirror of https://gitee.com/bigwinds/arangodb
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
This commit is contained in:
commit
a814860c3f
|
@ -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({
|
window.arangoCollection = Backbone.Model.extend({
|
||||||
initialize: function () {
|
initialize: function () {
|
||||||
|
'use strict';
|
||||||
},
|
},
|
||||||
|
|
||||||
urlRoot: "/_api/collection",
|
urlRoot: "/_api/collection",
|
||||||
|
|
|
@ -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({
|
window.arangoDocument = Backbone.Model.extend({
|
||||||
initialize: function () {
|
initialize: function () {
|
||||||
|
'use strict';
|
||||||
},
|
},
|
||||||
urlRoot: "/_api/document",
|
urlRoot: "/_api/document",
|
||||||
defaults: {
|
defaults: {
|
||||||
_id: "",
|
_id: "",
|
||||||
_rev: "",
|
_rev: ""
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
|
@ -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({
|
window.arangoLog = Backbone.Model.extend({
|
||||||
initialize: function () {
|
initialize: function () {
|
||||||
|
'use strict';
|
||||||
},
|
},
|
||||||
urlRoot: "/_admin/log",
|
urlRoot: "/_admin/log",
|
||||||
defaults: {
|
defaults: {
|
||||||
|
|
|
@ -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({
|
window.Statistics = Backbone.Model.extend({
|
||||||
defaults: {
|
defaults: {
|
||||||
},
|
},
|
||||||
|
|
||||||
url: function() {
|
url: function() {
|
||||||
|
'use strict';
|
||||||
|
|
||||||
return "../statistics";
|
return "../statistics";
|
||||||
},
|
}
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
|
@ -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({
|
window.StatisticsDescription = Backbone.Model.extend({
|
||||||
defaults: {
|
defaults: {
|
||||||
"figures" : "",
|
"figures" : "",
|
||||||
|
@ -5,7 +8,8 @@ window.StatisticsDescription = Backbone.Model.extend({
|
||||||
},
|
},
|
||||||
|
|
||||||
url: function() {
|
url: function() {
|
||||||
|
'use strict';
|
||||||
|
|
||||||
return "../statistics-description";
|
return "../statistics-description";
|
||||||
},
|
}
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
|
@ -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({
|
window.Foxx = Backbone.Model.extend({
|
||||||
defaults: {
|
defaults: {
|
||||||
"title": "",
|
"title": "",
|
||||||
|
@ -8,6 +11,8 @@ window.Foxx = Backbone.Model.extend({
|
||||||
},
|
},
|
||||||
|
|
||||||
url: function() {
|
url: function() {
|
||||||
|
'use strict';
|
||||||
|
|
||||||
if (this.get("_key")) {
|
if (this.get("_key")) {
|
||||||
return "../aardvark/foxxes/" + this.get("_key");
|
return "../aardvark/foxxes/" + this.get("_key");
|
||||||
}
|
}
|
||||||
|
@ -15,6 +20,8 @@ window.Foxx = Backbone.Model.extend({
|
||||||
},
|
},
|
||||||
|
|
||||||
isNew: function() {
|
isNew: function() {
|
||||||
|
'use strict';
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -48,6 +48,7 @@ JAVASCRIPT_JSLINT = \
|
||||||
`find @srcdir@/js/common/modules/org -name "*.js"` \
|
`find @srcdir@/js/common/modules/org -name "*.js"` \
|
||||||
`find @srcdir@/js/client/modules -name "*.js"` \
|
`find @srcdir@/js/client/modules -name "*.js"` \
|
||||||
`find @srcdir@/js/server/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/client/client.js \
|
||||||
@srcdir@/js/server/server.js \
|
@srcdir@/js/server/server.js \
|
||||||
|
|
Loading…
Reference in New Issue