Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Removed not needed class.

Browse source
This commit is contained in:
Martin Edenhofer 2014-09-27 11:39:38 +02:00
parent e43c91840d
commit 7b8723575f
5 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/assets/javascripts/app/lib/base/jquery.contenteditable.js
View file

@ -80,9 +80,9 @@
// maxlength check // maxlength check
if ( options.maxlength ) { if ( options.maxlength ) {
this.bind('keydown', function (e) { this.bind('keydown', function (e) {
// check maxlength // check maxlength
length = $(e.target).text().length var field = $(e.target)
var length = $(e.target).text().length
if ( length >= options.maxlength ) { if ( length >= options.maxlength ) {
switch ( e.keyCode ) { switch ( e.keyCode ) {
case 8: // backspace case 8: // backspace
@ -111,13 +111,13 @@
break; break;
} }
default: default:
$(e.target).addClass('invalid') field.addClass('invalid')
e.preventDefault() e.preventDefault()
} }
} }
else { else {
if ( $(e.target).hasClass('invalid') ) { if ( field.hasClass('invalid') ) {
$(e.target).removeClass('invalid') field.removeClass('invalid')
} }
} }
}) })

2
app/assets/javascripts/app/views/ticket_zoom/title.jst.eco
View file

@ -1,4 +1,4 @@
<h1><span contenteditable="true" class="ticket-title-update textbox"><%= @P( @ticket.title ) %></span></h1> <h1><span contenteditable="true" class="ticket-title-update"><%= @P( @ticket.title ) %></span></h1>
<small class="task-subline"> <small class="task-subline">
<%- @C('ticket_hook') %> <span class="ticket-number"><%- @ticket.number %></span> - <%- @T('created') %> <span class="humanTimeFromNow" data-time="<%- @ticket.created_at %>">?</span> <% if !@isCustomer && @ticket.escalation_time: %> - <%- @T('escalation') %> <span class="humanTimeFromNow escalation" data-time="<%- @ticket.escalation_time %>">?</span><% end %> <%- @C('ticket_hook') %> <span class="ticket-number"><%- @ticket.number %></span> - <%- @T('created') %> <span class="humanTimeFromNow" data-time="<%- @ticket.created_at %>">?</span> <% if !@isCustomer && @ticket.escalation_time: %> - <%- @T('escalation') %> <span class="humanTimeFromNow escalation" data-time="<%- @ticket.escalation_time %>">?</span><% end %>

2
app/assets/javascripts/app/views/widget/organization.jst.eco
View file

@ -8,7 +8,7 @@
<div class="customer-info" title="<%- @Ti( row.display ) %>"><%- @L( @P( @organization[row.name] ) ) %></div> <div class="customer-info" title="<%- @Ti( row.display ) %>"><%- @L( @P( @organization[row.name] ) ) %></div>
<% else: %> <% else: %>
<div class="customer-info" title="<%- @Ti( row.display ) %>"> <div class="customer-info" title="<%- @Ti( row.display ) %>">
<div contenteditable="true" class="textbox" data-name="<%= row.name %>" data-type="update-org" data-placeholder="<%- @T('Add a Note') %>"><%= @organization[row.name] %></div> <div contenteditable="true" data-name="<%= row.name %>" data-type="update-org" data-placeholder="<%- @T('Add a Note') %>"><%= @organization[row.name] %></div>
</div> </div>
<% end %> <% end %>
<% end %> <% end %>

2
app/assets/javascripts/app/views/widget/user.jst.eco
View file

@ -17,7 +17,7 @@
<% else: %> <% else: %>
<div class="userInfo-label"><%- @Ti( row.display ) %></div> <div class="userInfo-label"><%- @Ti( row.display ) %></div>
<div class="userInfo-value"> <div class="userInfo-value">
<div contenteditable="true" class="textbox" data-name="<%= row.name %>" data-type="update" data-placeholder="<%- @T('Add a Note') %>"><%= @user[row.name] %></div> <div contenteditable="true" data-name="<%= row.name %>" data-type="update" data-placeholder="<%- @T('Add a Note') %>"><%= @user[row.name] %></div>
</div> </div>
<% end %> <% end %>
</div> </div>

8
app/assets/stylesheets/zzz.css.erb
View file

@ -3429,23 +3429,23 @@ footer {
margin-top: 1px; margin-top: 1px;
} }
.textbox[contenteditable] { [contenteditable] {
display: block; display: block;
white-space: pre; white-space: pre;
padding: 1px; padding: 1px;
outline-style: none; outline-style: none;
} }
.textbox[contenteditable]:hover, .textbox[contenteditable]:focus { [contenteditable]:hover, [contenteditable]:focus {
padding: 0; padding: 0;
border: 1px dotted hsl(145,51%,45%); border: 1px dotted hsl(145,51%,45%);
border-radius: 3px; border-radius: 3px;
} }
.textbox[contenteditable].invalid { [contenteditable].invalid {
padding: 0; padding: 0;
border: 1px dotted #F92; border: 1px dotted #F92;
border-radius: 3px; border-radius: 3px;
} }
.textbox > .placeholder { [contenteditable] > .placeholder {
color: #999; color: #999;
} }
/* /*