From 6b45702f8c403a7f5b37393ae26b9cb8cbf664d0 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Tue, 28 Jul 2015 11:20:21 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E7=82=B9=E5=87=BB=E7=A9=BA=E7=99=BD?=
 =?UTF-8?q?=E5=A4=84=E5=8F=AF=E4=BB=A5=E8=AE=A9=E5=BC=B9=E5=87=BA=E6=A1=86?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/poll/_poll_form.html.erb | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/app/views/poll/_poll_form.html.erb b/app/views/poll/_poll_form.html.erb
index 0a15143fb..b081f4d18 100644
--- a/app/views/poll/_poll_form.html.erb
+++ b/app/views/poll/_poll_form.html.erb
@@ -2,11 +2,24 @@
 
 <script type="text/javascript">
 //编辑问卷描述之后
+var popWindow ; //弹出框的引用
 function edit_head(){
     $("#polls_description").val($("#polls_description_div").html());
 }
+$(function(){
+    $(document).bind('click',function(e){
+        if(popWindow && e.target.nodeName != 'A' && !popWindow.is(e.target) && popWindow.has(e.target).length === 0){ // Mark 1
+            popWindow.css('display', 'none');
+        }
+        //$("#div_"+quest_type+"_"+quest_id).css('display', 'none');
+    });
+})
 
 function chooseQuestionType(quest_type,quest_id){
+    popWindow = $("#div_"+quest_type+"_"+quest_id);
+    $("#div_"+quest_type+"_"+quest_id).click(function(e){
+        e.stopPropagation();
+    });
     $("#div_"+quest_type+"_"+quest_id).css("position", "absolute");
 
     $("#div_"+quest_type+"_"+quest_id).css("top", $("#add_"+quest_type+"_"+quest_id).offset().top+30);

From b22f9b221b6ca12c7b07c63d880906606d799da6 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Tue, 28 Jul 2015 11:34:50 +0800
Subject: [PATCH 2/3] db_schema.rb

---
 db/schema.rb | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/db/schema.rb b/db/schema.rb
index 9f9bbc33c..0e8cde619 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -454,6 +454,13 @@ ActiveRecord::Schema.define(:version => 20150722015428) do
 
   add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority"
 
+  create_table "discuss_demos", :force => true do |t|
+    t.string   "title"
+    t.text     "body"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
   create_table "documents", :force => true do |t|
     t.integer  "project_id",                :default => 0,  :null => false
     t.integer  "category_id",               :default => 0,  :null => false
@@ -864,7 +871,6 @@ ActiveRecord::Schema.define(:version => 20150722015428) do
     t.datetime "created_on"
     t.integer  "comments_count",               :default => 0,  :null => false
     t.integer  "course_id"
-    t.datetime "updated_on"
   end
 
   add_index "news", ["author_id"], :name => "index_news_on_author_id"

From 90a416fb2f3d571d860b67725972fef4713a5811 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Tue, 28 Jul 2015 16:01:16 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E7=82=B9=E5=87=BB=E7=A9=BA=E7=99=BD?=
 =?UTF-8?q?=E5=A4=84=E5=8F=AF=E4=BB=A5=E8=AE=A9=E5=BC=B9=E5=87=BA=E6=A1=86?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/poll/_poll_form.html.erb | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/views/poll/_poll_form.html.erb b/app/views/poll/_poll_form.html.erb
index b081f4d18..6d1f3b6bb 100644
--- a/app/views/poll/_poll_form.html.erb
+++ b/app/views/poll/_poll_form.html.erb
@@ -7,18 +7,25 @@ function edit_head(){
     $("#polls_description").val($("#polls_description_div").html());
 }
 $(function(){
+    //点击空白处
     $(document).bind('click',function(e){
+        //弹出框非空 不是a标签 点击的不是弹出框 ，那么弹出框就会隐藏
         if(popWindow && e.target.nodeName != 'A' && !popWindow.is(e.target) && popWindow.has(e.target).length === 0){ // Mark 1
             popWindow.css('display', 'none');
         }
-        //$("#div_"+quest_type+"_"+quest_id).css('display', 'none');
     });
 })
 
+
 function chooseQuestionType(quest_type,quest_id){
+    //quest_type 分为 mc mcq single multi
+    //quest_id 是quetion的id  下同
+    if(popWindow){
+        popWindow.css('display', 'none');
+    }
     popWindow = $("#div_"+quest_type+"_"+quest_id);
     $("#div_"+quest_type+"_"+quest_id).click(function(e){
-        e.stopPropagation();
+        e.stopPropagation(); //组织冒泡到document.body中去
     });
     $("#div_"+quest_type+"_"+quest_id).css("position", "absolute");