summaryrefslogtreecommitdiff
path: root/app/assets/javascripts
diff options
context:
space:
mode:
Diffstat (limited to 'app/assets/javascripts')
-rw-r--r--app/assets/javascripts/application.js1
-rw-r--r--app/assets/javascripts/backbone/views/cakes/index_view.js.coffee5
-rw-r--r--app/assets/javascripts/backbone/views/cakes/no_cakes_view.js.coffee5
-rw-r--r--app/assets/javascripts/creations.js4
-rw-r--r--app/assets/javascripts/masonry.js.coffee1
-rw-r--r--app/assets/javascripts/users_edit.js37
-rw-r--r--app/assets/javascripts/utility/greeting.js.coffee8
7 files changed, 6 insertions, 55 deletions
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 1bee516a..2d87213c 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -16,7 +16,6 @@
//= require jquery.ui.all
//= require jquery.validate
//= require jquery.masonry
-//= require jquery-fileupload
//= require jquery.embedly
//= require tag-it
//= require bootstrap
diff --git a/app/assets/javascripts/backbone/views/cakes/index_view.js.coffee b/app/assets/javascripts/backbone/views/cakes/index_view.js.coffee
index 527ab960..b410fb06 100644
--- a/app/assets/javascripts/backbone/views/cakes/index_view.js.coffee
+++ b/app/assets/javascripts/backbone/views/cakes/index_view.js.coffee
@@ -1,9 +1,6 @@
+#= require backbone/views/cakes/no_cakes_view
CakeSide.Views.Cakes ||= {}
-class CakeSide.Views.Cakes.NoCakesView extends Marionette.ItemView
- template: JST["backbone/templates/cakes/no_cakes"]
- tagName: 'li'
-
class CakeSide.Views.Cakes.IndexView extends Marionette.CollectionView
childView: CakeSide.Views.Cakes.CakeView
emptyView: CakeSide.Views.Cakes.NoCakesView
diff --git a/app/assets/javascripts/backbone/views/cakes/no_cakes_view.js.coffee b/app/assets/javascripts/backbone/views/cakes/no_cakes_view.js.coffee
new file mode 100644
index 00000000..278d7d37
--- /dev/null
+++ b/app/assets/javascripts/backbone/views/cakes/no_cakes_view.js.coffee
@@ -0,0 +1,5 @@
+CakeSide.Views.Cakes ||= {}
+
+class CakeSide.Views.Cakes.NoCakesView extends Marionette.ItemView
+ template: JST["backbone/templates/cakes/no_cakes"]
+ tagName: 'li'
diff --git a/app/assets/javascripts/creations.js b/app/assets/javascripts/creations.js
deleted file mode 100644
index e91b76f1..00000000
--- a/app/assets/javascripts/creations.js
+++ /dev/null
@@ -1,4 +0,0 @@
-var Creations = Creations || {};
-Creations.Show = {
- initialize: function(){ }
-};
diff --git a/app/assets/javascripts/masonry.js.coffee b/app/assets/javascripts/masonry.js.coffee
index 539f3cb4..491769db 100644
--- a/app/assets/javascripts/masonry.js.coffee
+++ b/app/assets/javascripts/masonry.js.coffee
@@ -4,7 +4,6 @@ class window.Masonry
load: ->
$(@container).imagesLoaded =>
- console.log("load masonry.")
$(@container).masonry
itemSelector : '.span4'
isResizable: true
diff --git a/app/assets/javascripts/users_edit.js b/app/assets/javascripts/users_edit.js
deleted file mode 100644
index 493283c4..00000000
--- a/app/assets/javascripts/users_edit.js
+++ /dev/null
@@ -1,37 +0,0 @@
-var DeviseUsers = DeviseUsers || {};
-
-DeviseUsers.Edit = {
- initialize: function($){
- $('#edit_user').validate();
- $('#user_city').autocomplete({
- source: function(request, response){
- $.ajax({
- url: 'http://ws.geonames.org/searchJSON',
- dataType: "jsonp",
- data: {
- featureClass: "P",
- style: 'full',
- maxRows: 12,
- name_startsWith: request.term
- },
- success: function(data){
- response( $.map(data.geonames, function(item){
- return {
- label: item.name + (item.adminName1 ? ", " + item.adminName1 : "") + ", " + item.countryName,
- value: item.name + (item.adminName1 ? ", " + item.adminName1 : "") + ", " + item.countryName,
- latitude: item.lat,
- longitude: item.lng
- }
- }));
- }
- });
- },
- minlength:2,
- select:function(event, ui){
- var item = ui.item;
- $('#user_latitude').val(item.latitude);
- $('#user_longitude').val(item.longitude);
- }
- });
- }
-};
diff --git a/app/assets/javascripts/utility/greeting.js.coffee b/app/assets/javascripts/utility/greeting.js.coffee
deleted file mode 100644
index cea58c7f..00000000
--- a/app/assets/javascripts/utility/greeting.js.coffee
+++ /dev/null
@@ -1,8 +0,0 @@
-class window.Greeting
- constructor:(@name) ->
-
- greet: () ->
- 'hi ' + @name
-
- goodbye: () ->
- 'goodbye ' + @name