git://git.onelab.eu
/
myslice.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
43ad3b8
)
miscell cosmetic
author
Thierry Parmentelat
<thierry.parmentelat@inria.fr>
Tue, 3 Dec 2013 13:43:11 +0000
(14:43 +0100)
committer
Thierry Parmentelat
<thierry.parmentelat@inria.fr>
Tue, 3 Dec 2013 13:43:11 +0000
(14:43 +0100)
.gitignore
patch
|
blob
|
history
Makefile
patch
|
blob
|
history
manifold/static/js/manifold.js
patch
|
blob
|
history
plugins/querytable/static/js/querytable.js
patch
|
blob
|
history
plugins/tabs/static/js/tabs.js
patch
|
blob
|
history
diff --git
a/.gitignore
b/.gitignore
index
ed36fe7
..
52c5d5f
100644
(file)
--- a/
.gitignore
+++ b/
.gitignore
@@
-15,3
+15,4
@@
build/
plugins/*/*.css
plugins/*/*.js
plugins/*/*.html
plugins/*/*.css
plugins/*/*.js
plugins/*/*.html
+myslice.ini*
diff --git
a/Makefile
b/Makefile
index
e3449bb
..
ad27d39
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-91,7
+91,7
@@
redo-templates: clean-templates templates
#################### compute emacs tags
# list files under git but exclude third-party stuff like bootstrap and jquery
myfiles: force
#################### compute emacs tags
# list files under git but exclude third-party stuff like bootstrap and jquery
myfiles: force
- @git ls-files | egrep -v 'insert(_|-)above|third-party/|
play
/'
+ @git ls-files | egrep -v 'insert(_|-)above|third-party/|
to-be-integrated
/'
# in general it's right to rely on the contents as reported by git
tags: force
# in general it's right to rely on the contents as reported by git
tags: force
diff --git
a/manifold/static/js/manifold.js
b/manifold/static/js/manifold.js
index
e4b7db9
..
1bb5b97
100644
(file)
--- a/
manifold/static/js/manifold.js
+++ b/
manifold/static/js/manifold.js
@@
-356,7
+356,7
@@
var manifold = {
var publish_uuid=tuple.publish_uuid;
// by default we publish using the same uuid of course
if (publish_uuid==undefined) publish_uuid=query.query_uuid;
var publish_uuid=tuple.publish_uuid;
// by default we publish using the same uuid of course
if (publish_uuid==undefined) publish_uuid=query.query_uuid;
- if (manifold.
asynchroneous
_debug) {
+ if (manifold.
publish_result
_debug) {
messages.debug("sending POST on " + manifold.proxy_url + query.__repr());
}
messages.debug("sending POST on " + manifold.proxy_url + query.__repr());
}
diff --git
a/plugins/querytable/static/js/querytable.js
b/plugins/querytable/static/js/querytable.js
index
772ff7e
..
42dfee5
100644
(file)
--- a/
plugins/querytable/static/js/querytable.js
+++ b/
plugins/querytable/static/js/querytable.js
@@
-7,7
+7,7
@@
(function($) {
var debug=false;
(function($) {
var debug=false;
- debug=true
+
//
debug=true
var QueryTable = Plugin.extend({
var QueryTable = Plugin.extend({
diff --git
a/plugins/tabs/static/js/tabs.js
b/plugins/tabs/static/js/tabs.js
index
4612dd2
..
f9cd2a7
100644
(file)
--- a/
plugins/tabs/static/js/tabs.js
+++ b/
plugins/tabs/static/js/tabs.js
@@
-33,7
+33,6
@@
var tabs_helper = {
if (tabs_helper.debug) messages.debug ("setting active for " + domid + " to active_domid=" + active_domid);
// build something like "#uldomid a[href='#active_domid']"
var selector="#"+domid+" a[href='#"+active_domid+"']";
if (tabs_helper.debug) messages.debug ("setting active for " + domid + " to active_domid=" + active_domid);
// build something like "#uldomid a[href='#active_domid']"
var selector="#"+domid+" a[href='#"+active_domid+"']";
- console.log("selector="+selector);
$(selector).tab('show');
},
set_from_saved_active_domid : function (domid) {
$(selector).tab('show');
},
set_from_saved_active_domid : function (domid) {