Revision d08866b6
Added by Sam Kottler almost 11 years ago
- ID d08866b6afc93056474cb6ad0e568d604fd236d4
| app/assets/javascripts/config_template.js | ||
|---|---|---|
|
session.setValue(patch);
|
||
|
}
|
||
|
|
||
|
function submit_code() {
|
||
|
if($('.template_text').hasClass('diffMode')) {
|
||
|
set_code();
|
||
|
}
|
||
|
}
|
||
|
|
||
|
function IE_diff_mode(item){
|
||
|
var patch = JsDiff.createPatch(item.attr('data-file-name'), $('#old').contents().text() , $('#new').contents().text());
|
||
|
item.val(patch);
|
||
| app/views/config_templates/_form.html.erb | ||
|---|---|---|
|
<%= javascript 'config_template', 'ace/ace',
|
||
|
'ace/theme-twilight', 'ace/theme-dawn', 'ace/theme-clouds', 'ace/theme-textmate',
|
||
|
'ace/mode-diff', 'diff', 'ace/mode-ruby', 'ace/keybinding-vim', 'ace/keybinding-emacs' %>
|
||
|
<%= form_for @config_template, :html => { :multipart => true, :onsubmit => 'set_code();' } do |f| %>
|
||
|
<%= form_for @config_template, :html => { :multipart => true, :onsubmit => 'submit_code();' } do |f| %>
|
||
|
<%= base_errors_for @config_template %>
|
||
|
<ul class="nav nav-tabs" data-tabs="tabs">
|
||
|
<li class="active"><a id="primary_tab" href="#primary" data-toggle="tab"><%= _("Provisioning Template") %></a></li>
|
||
Also available in: Unified diff
Fixes #2826: only run set_code() on submit if the config template editor is already in diff mode
(cherry picked from commit ceabd2b37d1924a45ee20de100d0e5cb8f39845d)