fix hotkeys replication problem

weih · Mar 18, 2012 · a6a3db6 · a6a3db6
1 parent dfc0682
commit a6a3db6
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 10 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/app/.DS_Store b/app/.DS_Store
diff --git a/app/assets/.DS_Store b/app/assets/.DS_Store
diff --git a/app/assets/images/.DS_Store b/app/assets/images/.DS_Store
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
@@ -27,6 +27,9 @@ jQuery.fn.submitWithAjax = function() {
 };
 
 $(document).ready(function() {
+  $('#done_btn').click(function() {
+    $('#done_btn').val('Adding...');
+  });
 	$('#new_geekdoor').submitWithAjax();
 	$('.delete_door').click(function(){
 		$.get(this.href, null, null, "script");
@@ -62,7 +65,7 @@ $(document).ready(function() {
 	}
 	);
 	$('#done_btn').click(function() {
-		// $('#new_geekdoor').hide('slow');
+		//$('#done_btn').text('Adding..');
 		//$('#add_btn').fadeIn('slow');
 		//$('#edit_btn').fadeIn('slow');
 	});
@@ -77,6 +80,8 @@ $(document).ready(function() {
 	  $('#background_colorSelector').fadeOut('slow');
 	  $('#foreground_colorSelector').fadeOut('slow');
 	});
+
+  $('.default').dropkick();
 })
 
 // jQuery.ajaxSetup({ 

diff --git a/app/assets/stylesheets/home.css.scss b/app/assets/stylesheets/home.css.scss
@@ -55,9 +55,6 @@ ul {
   font-family: "Comic Sans MS",Verdana,Helvetica,Arial;
 }
 
-#main #three_man {
-}
-
 #main h1 {
 	font-family: "LiHei Pro", Verdana, Helvetica, Arial;
 }

diff --git a/app/models/geekdoor.rb b/app/models/geekdoor.rb
@@ -30,6 +30,9 @@ def set_key_to_used
   end
 
   def set_key_to_unused
-    self.user.set(:unused_hotkeys, self.user.unused_hotkeys << self.hotkey)
+    unless self.user.unused_hotkeys.include?(self.hotkey)
+      self.user.unused_hotkeys << self.hotkey
+      self.user.set(:unused_hotkeys, self.user.unused_hotkeys)
+    end
   end
 end
diff --git a/app/views/geekdoors/create.js.erb b/app/views/geekdoors/create.js.erb
@@ -1,7 +1,7 @@
 $("#doors").html("<%= escape_javascript(render("home/door")) %>");
 $(".avaiable_keys").html("<%= escape_javascript(render("home/unused_hotkeys")) %>");
 $('#new_geekdoor')[0].reset();
-// $('#add_btn').text('Add a new door');
+$('#done_btn').val('Add');
 $('.delete_door').click(function(){
 	$.get(this.href, null, null, "script");
 	return false;

diff --git a/app/views/home/_add.html.erb b/app/views/home/_add.html.erb
@@ -1,6 +1,6 @@
 <center>
   <% if !@user.has_door? %>
-    <p>你还没有自己的搜索条呢，点击下面的按钮添加吧！添加规则看<%= link_to "这里", about_path, :target => "_blank" %></p>
+    <p>新来的同学？点击下面的按钮添加吧！添加规则看<%= link_to "这里", about_path, :target => "_blank" %></p>
   <% end %>
 
   <div id="add_btn" class="btn success">

diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb
@@ -5,9 +5,9 @@
 <div id="menu">
   <% if current_user %>
     <strong>Welcome <%= get_name_from_email(current_user.email) %></strong>
-    <%= link_to "ChangeColor", '#', :id => "colorSelector" %>      
-    <%= link_to "Background Color", '#', :id => "background_colorSelector",  :style => "display:none" %>      
-    <%= link_to "Foreground Color", '#', :id => "foreground_colorSelector",  :style => "display:none" %>      
+    <%= link_to "ChangeColor", '#', :id => "colorSelector" %>            
+    <%= link_to "Background Color", '#', :id => "background_colorSelector",  :style => "display:none" %>
+    <%= link_to "Foreground Color", '#', :id => "foreground_colorSelector",  :style => "display:none" %>
   <% end %>
   <%= link_to "Readme", about_path, :target => '_blank' %>
   <% if current_user %>

diff --git a/vendor/.DS_Store b/vendor/.DS_Store