From efd99344eb238ccb8dfbd251782583048a5f0d42 Mon Sep 17 00:00:00 2001 From: Dennis Collinson Date: Tue, 7 Feb 2012 18:29:51 -0800 Subject: [PATCH] git status --- app/views/status_messages/new.html.haml | 2 +- config/assets.yml | 2 +- public/javascripts/app/views/publisher_view.js | 2 +- public/javascripts/publisher.js | 2 ++ public/javascripts/{ => vendor}/jquery.textchange.min.js | 0 5 files changed, 5 insertions(+), 3 deletions(-) rename public/javascripts/{ => vendor}/jquery.textchange.min.js (100%) diff --git a/app/views/status_messages/new.html.haml b/app/views/status_messages/new.html.haml index e1cc91f31..c816c5af1 100644 --- a/app/views/status_messages/new.html.haml +++ b/app/views/status_messages/new.html.haml @@ -1,7 +1,7 @@ -# Copyright (c) 2010-2011, Diaspora Inc. This file is -# licensed under the Affero General Public License version 3 or later. See -# the COPYRIGHT file. -= javascript_include_tag "publisher.js" += javascript_include_tag 'vendor/jquery.textchange.min.js', "publisher.js" :javascript $(function() { diff --git a/config/assets.yml b/config/assets.yml index 0fdc85f91..5db5219a9 100644 --- a/config/assets.yml +++ b/config/assets.yml @@ -80,7 +80,7 @@ javascripts: - public/javascripts/friend-finder.js home: - public/javascripts/publisher.js - - public/javascripts/jquery.textchange.min.js + - public/javascripts/vendor/jquery.textchange.min.js - public/javascripts/aspect-edit-pane.js - public/javascripts/fileuploader-custom.js people: diff --git a/public/javascripts/app/views/publisher_view.js b/public/javascripts/app/views/publisher_view.js index 79eba2a07..6955c7cda 100644 --- a/public/javascripts/app/views/publisher_view.js +++ b/public/javascripts/app/views/publisher_view.js @@ -1,6 +1,6 @@ //this file is the scary no-no-zone bad-touch of our backbone code. //after re-writing/eliminating the existing Publisher let's re-write -//this with PANACHE! +//this with PANACHE! <333 Dennis app.views.Publisher = Backbone.View.extend({ diff --git a/public/javascripts/publisher.js b/public/javascripts/publisher.js index c4b15b530..ab7815832 100644 --- a/public/javascripts/publisher.js +++ b/public/javascripts/publisher.js @@ -152,6 +152,7 @@ var Publisher = { }, textChange : function(){ + console.log("yohoho") Publisher.determineSubmitAvailability(); Publisher.input().mentionsInput("val", function(value) { Publisher.hiddenInput().val(value); @@ -190,6 +191,7 @@ var Publisher = { }, initialize: function() { + console.log("OHHHHH MY GAWD") Publisher.cachedForm = Publisher.cachedSubmit = Publisher.cachedInput = Publisher.cachedHiddenInput = false; diff --git a/public/javascripts/jquery.textchange.min.js b/public/javascripts/vendor/jquery.textchange.min.js similarity index 100% rename from public/javascripts/jquery.textchange.min.js rename to public/javascripts/vendor/jquery.textchange.min.js