Commit c28865e0 authored by Jonne Haß's avatar Jonne Haß Committed by GitHub
Browse files

Merge pull request #6977 from svbergerem/fix-char-counter-position 

Fix charcounter position in publisher
parents 16618e10 da5aef2b

app/assets/javascripts/app/views/publisher/services_view.js

+8 −2
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ app.views.PublisherServices = Backbone.View.extend({ 
  // keep track of character count

  _createCounter: function() {

    // remove any obsolete counters

    this.input.siblings('.counter').remove();

    $("#publisher .counter").remove();



    // create new counter

    var min = 40000;
@@ -47,7 +47,13 @@ app.views.PublisherServices = Backbone.View.extend({ 
        var num = parseInt($(value).attr('maxchar'));

        if (min > num) { min = num; }

      });

      this.input.charCount({allowed: min, warning: min/10 });

      var counter = $("<div class='counter pull-right'></div>");

      $("#publisher-images").after(counter);

      this.input.charCount({

        allowed: min,

        warning: min / 10,

        counter: counter

      });

    }

  },

app/assets/javascripts/main.js

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
//= require backbone

//= require jquery.remotipart

//= require autosize

//= require jquery.charcount

//= require charcount

//= require jquery-placeholder

//= require rails-timeago

//= require jquery.events.input

app/assets/javascripts/mobile/mobile.js

+2 −1
Original line number Diff line number Diff line
@@ -4,7 +4,8 @@ 
 *   licensed under the Affero General Public License version 3 or later.  See

 *   the COPYRIGHT file.

 */

//= require jquery.charcount

//= require jquery-textchange

//= require charcount

//= require js-routes

//= require autosize

//= require keycodes

app/assets/javascripts/mobile/publisher.js

+9 −1
Original line number Diff line number Diff line
@@ -20,7 +20,15 @@ $(document).ready(function(){ 
      }

    });



    $("#status_message_text").charCount({allowed: publisherMaxChars, warning: publisherMaxChars/10 });

    if (selectedServices.length > 0) {

      var counter = $("<span class='counter'></span>");

      $("#status_message_text").after(counter);

      $("#status_message_text").charCount({

        allowed: publisherMaxChars,

        warning: publisherMaxChars / 10,

        counter: counter

      });

    }



    if(hiddenField.length > 0) { hiddenField.remove(); }

    else {

app/assets/stylesheets/publisher.scss

+1 −14
Original line number Diff line number Diff line
@@ -187,12 +187,6 @@ 
        text-align: center;

      }



      .warning {

        color: orange;

      }

      .exceeded {

        color: red;

      }

    }

  }
@@ -235,16 +229,9 @@ 
    }

  }



  &.with-location .counter {

    bottom: -62px;

  }



  .counter {

    bottom: -25px;

    height: 30px;

    line-height: 30px;

    position: absolute;

    right: 10px;

    margin-right: 10px;

  }



  &:not(.with-location) .publisher-buttonbar {