projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/master' into 4084-log-pane-refresh
[arvados.git]
/
apps
/
workbench
/
app
/
assets
/
javascripts
/
editable.js
diff --git
a/apps/workbench/app/assets/javascripts/editable.js
b/apps/workbench/app/assets/javascripts/editable.js
index 76a129b2bfbb0b895b66484c2214a2dc7f23131e..dc54bda7af79a17f7a7eae3ec1aa9d059ac9851d 100644
(file)
--- a/
apps/workbench/app/assets/javascripts/editable.js
+++ b/
apps/workbench/app/assets/javascripts/editable.js
@@
-55,6
+55,12
@@
$(document).
if (response.href) {
$(this).editable('option', 'url', response.href);
}
if (response.href) {
$(this).editable('option', 'url', response.href);
}
+ if ($(this).attr('data-name')) {
+ var textileAttr = $(this).attr('data-name') + 'Textile';
+ if (response[textileAttr]) {
+ $(this).attr('data-textile', response[textileAttr]);
+ }
+ }
return;
},
error: function(response, newValue) {
return;
},
error: function(response, newValue) {
@@
-75,6
+81,10
@@
$(document).
// information if it appears elsewhere on the page.
if (reason != 'save') return;
var html = $(this).html();
// information if it appears elsewhere on the page.
if (reason != 'save') return;
var html = $(this).html();
+ if( $(this).attr('data-textile') ) {
+ html = $(this).attr('data-textile');
+ $(this).html(html);
+ }
var uuid = $(this).attr('data-object-uuid');
var attr = $(this).attr('data-name');
var edited = this;
var uuid = $(this).attr('data-object-uuid');
var attr = $(this).attr('data-name');
var edited = this;