From 22ee674e345917d9ee11c0d6dd5a4e4ab702506b Mon Sep 17 00:00:00 2001 From: Rania Abdel Fattah Date: Sun, 13 Apr 2014 14:36:46 +0200 Subject: [PATCH 001/938] create from existing --- .../app/assets/javascripts/courses.js.coffee | 3 ++ tutor/app/assets/stylesheets/courses.css.scss | 3 ++ tutor/app/controllers/courses_controller.rb | 31 +++++++++++++++++++ tutor/app/helpers/courses_helper.rb | 2 ++ tutor/app/views/courses/existing.html.erb | 10 ++++++ tutor/config/routes.rb | 1 + .../controllers/courses_controller_test.rb | 9 ++++++ tutor/test/helpers/courses_helper_test.rb | 4 +++ 8 files changed, 63 insertions(+) create mode 100644 tutor/app/assets/javascripts/courses.js.coffee create mode 100644 tutor/app/assets/stylesheets/courses.css.scss create mode 100644 tutor/app/controllers/courses_controller.rb create mode 100644 tutor/app/helpers/courses_helper.rb create mode 100644 tutor/app/views/courses/existing.html.erb create mode 100644 tutor/test/controllers/courses_controller_test.rb create mode 100644 tutor/test/helpers/courses_helper_test.rb diff --git a/tutor/app/assets/javascripts/courses.js.coffee b/tutor/app/assets/javascripts/courses.js.coffee new file mode 100644 index 00000000..24f83d18 --- /dev/null +++ b/tutor/app/assets/javascripts/courses.js.coffee @@ -0,0 +1,3 @@ +# Place all the behaviors and hooks related to the matching controller here. +# All this logic will automatically be available in application.js. +# You can use CoffeeScript in this file: http://coffeescript.org/ diff --git a/tutor/app/assets/stylesheets/courses.css.scss b/tutor/app/assets/stylesheets/courses.css.scss new file mode 100644 index 00000000..0cae8cc9 --- /dev/null +++ b/tutor/app/assets/stylesheets/courses.css.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the courses controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/tutor/app/controllers/courses_controller.rb b/tutor/app/controllers/courses_controller.rb new file mode 100644 index 00000000..3b92bfed --- /dev/null +++ b/tutor/app/controllers/courses_controller.rb @@ -0,0 +1,31 @@ +class CoursesController < ApplicationController + def show + @courses = [] + if(params[:id]) + course = Course.find_by_id(params[:id]) + @courses << course + else + @courses = Course.all + end + + end + + # This method get all the existing courses + def existing + @courses = Course.all + end + + # This method duplicate the courses that it is found and save it in a new course + def duplicate + permit + course = Course.find_by_id(params[:Course][:id]) + newCourse = course.dup + newCourse.save + redirect_to newCourse + end + + # This method choose with parameter should be listed + def permit + params.require(:Course).permit(:id) + end +end \ No newline at end of file diff --git a/tutor/app/helpers/courses_helper.rb b/tutor/app/helpers/courses_helper.rb new file mode 100644 index 00000000..c159f1e1 --- /dev/null +++ b/tutor/app/helpers/courses_helper.rb @@ -0,0 +1,2 @@ +module CoursesHelper +end diff --git a/tutor/app/views/courses/existing.html.erb b/tutor/app/views/courses/existing.html.erb new file mode 100644 index 00000000..a9ec4c76 --- /dev/null +++ b/tutor/app/views/courses/existing.html.erb @@ -0,0 +1,10 @@ +

Choose a Course

+ + +<%= form_for :Course , url: {:action => "duplicate" , method: "post"} do |f|%> +<%= f.select :id , @courses.collect{|c| [c.name , c.id]} %> +

+<%= f.submit%> + +<%end%> \ No newline at end of file diff --git a/tutor/config/routes.rb b/tutor/config/routes.rb index 6b19f2a6..07e51e93 100644 --- a/tutor/config/routes.rb +++ b/tutor/config/routes.rb @@ -1,4 +1,5 @@ Tutor::Application.routes.draw do + get "courses/new" # The priority is based upon order of creation: first created -> highest priority. # See how all your routes lay out with "rake routes". diff --git a/tutor/test/controllers/courses_controller_test.rb b/tutor/test/controllers/courses_controller_test.rb new file mode 100644 index 00000000..ce39c906 --- /dev/null +++ b/tutor/test/controllers/courses_controller_test.rb @@ -0,0 +1,9 @@ +require 'test_helper' + +class CoursesControllerTest < ActionController::TestCase + test "should get new" do + get :new + assert_response :success + end + +end diff --git a/tutor/test/helpers/courses_helper_test.rb b/tutor/test/helpers/courses_helper_test.rb new file mode 100644 index 00000000..3befd7ee --- /dev/null +++ b/tutor/test/helpers/courses_helper_test.rb @@ -0,0 +1,4 @@ +require 'test_helper' + +class CoursesHelperTest < ActionView::TestCase +end From 61261f2c30af824dbc187befa0c1123993b06136 Mon Sep 17 00:00:00 2001 From: Rania Abdel Fattah Date: Sun, 13 Apr 2014 15:15:28 +0200 Subject: [PATCH 002/938] create from existing --- tutor/config/routes.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tutor/config/routes.rb b/tutor/config/routes.rb index 07e51e93..376f1615 100644 --- a/tutor/config/routes.rb +++ b/tutor/config/routes.rb @@ -1,9 +1,12 @@ +route Tutor::Application.routes.draw do - get "courses/new" +get 'courses/show' # The priority is based upon order of creation: first created -> highest priority. # See how all your routes lay out with "rake routes". # You can have the root of your site routed with "root" + resources :courses + post "courses/duplicate" root 'site#index' # Example of regular route: From a8ca0fa9f5a359b32a0269a93231fb582fd1786f Mon Sep 17 00:00:00 2001 From: Rania Abdel Fattah Date: Sun, 13 Apr 2014 16:36:54 +0200 Subject: [PATCH 003/938] create from existing --- tutor/app/controllers/courses_controller.rb | 26 +++++++++++++++------ 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/tutor/app/controllers/courses_controller.rb b/tutor/app/controllers/courses_controller.rb index 3b92bfed..fcd94a44 100644 --- a/tutor/app/controllers/courses_controller.rb +++ b/tutor/app/controllers/courses_controller.rb @@ -1,4 +1,9 @@ class CoursesController < ApplicationController + # [Create from Existant Course - Story 2.5] + # Return the course specified by the id or else return all the courses + # Parameters: + # id: The course id + # Author: Rania Abdel Fattah def show @courses = [] if(params[:id]) @@ -9,22 +14,29 @@ def show end end - - # This method get all the existing courses + # [Create from Existant Course - Story 2.5] + # Return all the existing courses + # Author: Rania Abdel Fattah def existing @courses = Course.all end - - # This method duplicate the courses that it is found and save it in a new course - def duplicate + # [Create from Existant Course - Story 2.5] + # Duplicate the courses that it is found and save them in a new coursees + # Parameters: + # id: The course id + # Author: Rania Abdel Fattah + def duplicate permit course = Course.find_by_id(params[:Course][:id]) newCourse = course.dup newCourse.save redirect_to newCourse end - - # This method choose with parameter should be listed + # [Create from Existant Course - Story 2.5] + # Choose which parameter should be listed + # Parameters: + # id: The course id + # Author: Rania Abdel Fattah def permit params.require(:Course).permit(:id) end From 05451961ac215e8b56b6d81e6ad6982a001643d1 Mon Sep 17 00:00:00 2001 From: Rania Abdel Fattah Date: Mon, 14 Apr 2014 17:15:05 +0200 Subject: [PATCH 004/938] changing code for creating from existing --- tutor/db/seeds.rb | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/tutor/db/seeds.rb b/tutor/db/seeds.rb index 9278b119..5b44e317 100644 --- a/tutor/db/seeds.rb +++ b/tutor/db/seeds.rb @@ -10,7 +10,7 @@ puts("**************************************************************") puts("# ---------------------------Admins-----------------------------------") -# Admin.create(name: "Admin") +Admin.create(name: "Admin") puts("# ---------------------------Lecturers-----------------------------") Lecturer.create!(name:"Lecturer1" , email:"1@lecturer.com" , password:"123456789") @@ -109,11 +109,6 @@ Lecturer.first.courses << Course.find_by_id(2) puts("# -----------------------Problems---------------------------") -<<<<<<< HEAD -Problem.create(title: "Problem 1", description: "Problem 1", track_id: 1) -Problem.create(title: "Problem 2", description: "Problem 2", track_id: 1) -Problem.create(title: "Problem 3", description: "Problem 3", track_id: 2) -======= Problem.first.model_answers << ModelAnswer.first Problem.first.model_answers << ModelAnswer.find_by_id(2) Problem.first.test_cases << TestCase.first @@ -144,6 +139,4 @@ Course.first.topics << Topic.find_by_id(2) Course.find_by_id(2).topics << Topic.find_by_id(3) ->>>>>>> 6a460e526e7e76016b74313fe477e0169e49fea5 - puts("# -------------------------------------------------------") From 745ac7cd2912664258e60b37ce02c848c3a04345 Mon Sep 17 00:00:00 2001 From: Khaled Date: Mon, 14 Apr 2014 17:19:07 +0200 Subject: [PATCH 005/938] Issue #216 Add missing fields in lecturer registeration --- .../app/controllers/application_controller.rb | 2 +- tutor/app/models/lecturer.rb | 4 ++ .../lecturers/registrations/new.html.erb | 45 ++++++++++++++----- 3 files changed, 38 insertions(+), 13 deletions(-) diff --git a/tutor/app/controllers/application_controller.rb b/tutor/app/controllers/application_controller.rb index f59c26be..ba3b3e2a 100644 --- a/tutor/app/controllers/application_controller.rb +++ b/tutor/app/controllers/application_controller.rb @@ -10,7 +10,7 @@ class ApplicationController < ActionController::Base def update_sanitized_params if "#{resource_name}" == "lecturer" devise_parameter_sanitizer.for(:sign_up) { - |u| u.permit(:name, :email, :password, :password_confirmation, :degree) + |u| u.permit(:name, :email, :password, :password_confirmation, :degree, :age) } elsif "#{resource_name}" == "student" devise_parameter_sanitizer.for(:sign_up) { diff --git a/tutor/app/models/lecturer.rb b/tutor/app/models/lecturer.rb index 79d862a4..04e3cc25 100644 --- a/tutor/app/models/lecturer.rb +++ b/tutor/app/models/lecturer.rb @@ -5,6 +5,10 @@ class Lecturer < ActiveRecord::Base :recoverable, :rememberable, :trackable, :validatable #Validations + validates :name, presence: true + validates :dob, presence: true + validates :degree, presence: true + validates :age, presence: true #Relations has_one :user, as: :sub diff --git a/tutor/app/views/lecturers/registrations/new.html.erb b/tutor/app/views/lecturers/registrations/new.html.erb index 80ada924..4842fb7d 100644 --- a/tutor/app/views/lecturers/registrations/new.html.erb +++ b/tutor/app/views/lecturers/registrations/new.html.erb @@ -1,21 +1,42 @@

Sign up

+ <%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %> + <%= devise_error_messages! %> +
+ <%= f.label :email %>
+ <%= f.email_field :email, autofocus: true %> +
-<%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %> - <%= devise_error_messages! %> +
+ <%= f.label :name %>
+ <%= f.text_field :name %> +
-
<%= f.label :degree %>
- <%= f.text_field :degree%>
+
+ <%= f.label :password %>
+ <%= f.password_field :password, autocomplete: "off" %> +
-
<%= f.label :email %>
- <%= f.email_field :email, autofocus: true %>
+
+ <%= f.label :password_confirmation %>
+ <%= f.password_field :password_confirmation, autocomplete: "off" %> +
-
<%= f.label :password %>
- <%= f.password_field :password, autocomplete: "off" %>
+
+ <%= f.label :age %>
+ <%= f.number_field :age %> +
-
<%= f.label :password_confirmation %>
- <%= f.password_field :password_confirmation, autocomplete: "off" %>
+
+ <%= f.label :date_of_birth %>
+ <%= f.datetime_field :dob %> +
-
<%= f.submit "Sign up" %>
-<% end %> +
+ <%= f.label :degree %>
+ <%= f.text_field :degree %> +
+ +
<%= f.submit "Sign up" %>
+ <% end %> <%= render "lecturers/shared/links" %> From 8748f5a1661151c8820c00f785b5a158b36ad58c Mon Sep 17 00:00:00 2001 From: Rania Abdel Fattah Date: Mon, 14 Apr 2014 17:36:51 +0200 Subject: [PATCH 006/938] changing code for creating from existing again --- tutor/app/views/courses/existing.html.erb | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 tutor/app/views/courses/existing.html.erb diff --git a/tutor/app/views/courses/existing.html.erb b/tutor/app/views/courses/existing.html.erb deleted file mode 100644 index a9ec4c76..00000000 --- a/tutor/app/views/courses/existing.html.erb +++ /dev/null @@ -1,10 +0,0 @@ -

Choose a Course

- - -<%= form_for :Course , url: {:action => "duplicate" , method: "post"} do |f|%> -<%= f.select :id , @courses.collect{|c| [c.name , c.id]} %> -

-<%= f.submit%> - -<%end%> \ No newline at end of file From 54a6818649917f790520d6803a27abc0e91f8ef3 Mon Sep 17 00:00:00 2001 From: Rania Abdel Fattah Date: Mon, 14 Apr 2014 17:44:39 +0200 Subject: [PATCH 007/938] Issue #163 create from existing --- tutor/app/controllers/courses_controller.rb | 16 ++++++++-------- tutor/app/views/courses/index.html.erb | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tutor/app/controllers/courses_controller.rb b/tutor/app/controllers/courses_controller.rb index 3b150798..81b24f12 100644 --- a/tutor/app/controllers/courses_controller.rb +++ b/tutor/app/controllers/courses_controller.rb @@ -11,20 +11,20 @@ def index # id: The course id # Author: Rania Abdel Fattah def duplicate - course = Course.find_by_id(permitdup[:id]) - new_course = course.dup - if new_course.save - redirect_to :back - else - redirect_to :back - end + course = Course.find_by_id(permitdup[:id]) + new_course = course.dup + if new_course.save + redirect_to :back + else + redirect_to :back + end end # [Create from Existant Course - Story 2.5] # Choose which parameter should be listed # Parameters: # id: The course id # Author: Rania Abdel Fattah - private + private def permitdup params.require(:course).permit(:id) end diff --git a/tutor/app/views/courses/index.html.erb b/tutor/app/views/courses/index.html.erb index aa1e2cc8..69992309 100644 --- a/tutor/app/views/courses/index.html.erb +++ b/tutor/app/views/courses/index.html.erb @@ -3,7 +3,7 @@ <%= form_for :course , url: {:action => "duplicate" , method: "post"} do |f|%> - <%= f.select :id , @courses.collect{|c| [c.name , c.id]} %> + <%= f.select :id , @courses.collect{|c| [c.name , c.id]} %>

<%= f.submit%> From c82e56207fe81281718a0ff4aa38dd723e1da29d Mon Sep 17 00:00:00 2001 From: Khaled Date: Mon, 14 Apr 2014 17:45:04 +0200 Subject: [PATCH 008/938] Issue #216 Add missing fields in lecturer registeration with required presence validations --- tutor/app/controllers/application_controller.rb | 2 +- tutor/app/models/lecturer.rb | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/tutor/app/controllers/application_controller.rb b/tutor/app/controllers/application_controller.rb index ba3b3e2a..0abe72b6 100644 --- a/tutor/app/controllers/application_controller.rb +++ b/tutor/app/controllers/application_controller.rb @@ -10,7 +10,7 @@ class ApplicationController < ActionController::Base def update_sanitized_params if "#{resource_name}" == "lecturer" devise_parameter_sanitizer.for(:sign_up) { - |u| u.permit(:name, :email, :password, :password_confirmation, :degree, :age) + |u| u.permit(:name, :email, :password, :password_confirmation, :degree, :age, :dob) } elsif "#{resource_name}" == "student" devise_parameter_sanitizer.for(:sign_up) { diff --git a/tutor/app/models/lecturer.rb b/tutor/app/models/lecturer.rb index 15c158be..6df75430 100644 --- a/tutor/app/models/lecturer.rb +++ b/tutor/app/models/lecturer.rb @@ -9,6 +9,7 @@ class Lecturer < ActiveRecord::Base validates :dob, presence: true validates :degree, presence: true validates :age, presence: true + validates :dob, presence: true #Relations has_and_belongs_to_many :courses, join_table: "courses_lecturers" From 77023d25357db599f6be8feca56abce2ba7d1535 Mon Sep 17 00:00:00 2001 From: Rania Abdel Fattah Date: Mon, 14 Apr 2014 17:47:55 +0200 Subject: [PATCH 009/938] Issue #163 create from existing --- tutor/app/controllers/courses_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tutor/app/controllers/courses_controller.rb b/tutor/app/controllers/courses_controller.rb index 81b24f12..00735ed7 100644 --- a/tutor/app/controllers/courses_controller.rb +++ b/tutor/app/controllers/courses_controller.rb @@ -11,7 +11,7 @@ def index # id: The course id # Author: Rania Abdel Fattah def duplicate - course = Course.find_by_id(permitdup[:id]) + course = Course.find_by_id(permitd_up[:id]) new_course = course.dup if new_course.save redirect_to :back @@ -25,7 +25,7 @@ def duplicate # id: The course id # Author: Rania Abdel Fattah private - def permitdup + def permitd_up params.require(:course).permit(:id) end end \ No newline at end of file From 9a16d79c9a15a56580b29f9a34591d44665417f5 Mon Sep 17 00:00:00 2001 From: Rania Abdel Fattah Date: Tue, 15 Apr 2014 16:47:06 +0200 Subject: [PATCH 010/938] Issue #163 adding param in documentation --- tutor/app/controllers/courses_controller.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tutor/app/controllers/courses_controller.rb b/tutor/app/controllers/courses_controller.rb index 00735ed7..d409110a 100644 --- a/tutor/app/controllers/courses_controller.rb +++ b/tutor/app/controllers/courses_controller.rb @@ -1,6 +1,8 @@ class CoursesController < ApplicationController # [Create from Existant Course - Story 2.5] # Return the courses + # Parameters: + # null # Author: Rania Abdel Fattah def index @courses = Course.all From 91690ec9a1c8fe35a50081accc5ff94f839f22af Mon Sep 17 00:00:00 2001 From: ahmed93 Date: Tue, 15 Apr 2014 17:23:06 +0200 Subject: [PATCH 011/938] Issue #188 create controllers --- tutor/app/assets/javascripts/method_constraints.js.coffee | 3 +++ tutor/app/assets/stylesheets/method_constraints.css.scss | 3 +++ tutor/app/controllers/method_constraints_controller.rb | 7 +++++++ tutor/app/helpers/method_constraints_helper.rb | 2 ++ .../test/controllers/method_constraints_controller_test.rb | 7 +++++++ tutor/test/helpers/method_constraints_helper_test.rb | 4 ++++ 6 files changed, 26 insertions(+) create mode 100644 tutor/app/assets/javascripts/method_constraints.js.coffee create mode 100644 tutor/app/assets/stylesheets/method_constraints.css.scss create mode 100644 tutor/app/controllers/method_constraints_controller.rb create mode 100644 tutor/app/helpers/method_constraints_helper.rb create mode 100644 tutor/test/controllers/method_constraints_controller_test.rb create mode 100644 tutor/test/helpers/method_constraints_helper_test.rb diff --git a/tutor/app/assets/javascripts/method_constraints.js.coffee b/tutor/app/assets/javascripts/method_constraints.js.coffee new file mode 100644 index 00000000..24f83d18 --- /dev/null +++ b/tutor/app/assets/javascripts/method_constraints.js.coffee @@ -0,0 +1,3 @@ +# Place all the behaviors and hooks related to the matching controller here. +# All this logic will automatically be available in application.js. +# You can use CoffeeScript in this file: http://coffeescript.org/ diff --git a/tutor/app/assets/stylesheets/method_constraints.css.scss b/tutor/app/assets/stylesheets/method_constraints.css.scss new file mode 100644 index 00000000..611417eb --- /dev/null +++ b/tutor/app/assets/stylesheets/method_constraints.css.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the methodConstraints controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/tutor/app/controllers/method_constraints_controller.rb b/tutor/app/controllers/method_constraints_controller.rb new file mode 100644 index 00000000..582ebb5a --- /dev/null +++ b/tutor/app/controllers/method_constraints_controller.rb @@ -0,0 +1,7 @@ +class MethodConstraintsController < ApplicationController + + def create + + end + +end diff --git a/tutor/app/helpers/method_constraints_helper.rb b/tutor/app/helpers/method_constraints_helper.rb new file mode 100644 index 00000000..1102b1dc --- /dev/null +++ b/tutor/app/helpers/method_constraints_helper.rb @@ -0,0 +1,2 @@ +module MethodConstraintsHelper +end diff --git a/tutor/test/controllers/method_constraints_controller_test.rb b/tutor/test/controllers/method_constraints_controller_test.rb new file mode 100644 index 00000000..28467947 --- /dev/null +++ b/tutor/test/controllers/method_constraints_controller_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class MethodConstraintsControllerTest < ActionController::TestCase + # test "the truth" do + # assert true + # end +end diff --git a/tutor/test/helpers/method_constraints_helper_test.rb b/tutor/test/helpers/method_constraints_helper_test.rb new file mode 100644 index 00000000..45964376 --- /dev/null +++ b/tutor/test/helpers/method_constraints_helper_test.rb @@ -0,0 +1,4 @@ +require 'test_helper' + +class MethodConstraintsHelperTest < ActionView::TestCase +end From 4ad157137a16f94b265de3f6d26b796ece8fc084 Mon Sep 17 00:00:00 2001 From: Mohab Date: Thu, 17 Apr 2014 15:13:36 +0200 Subject: [PATCH 012/938] Create git_next_problem_to_solve method --- .gitignore~ | 25 +++++++++++++++++ .../app/assets/javascripts/profile.js.coffee | 3 ++ tutor/app/assets/stylesheets/profile.css.scss | 3 ++ tutor/app/controllers/profile_controller.rb | 2 ++ tutor/app/models/student.rb | 28 +++++++++++++++++++ tutor/app/views/profile/index.html.erb | 12 ++++++++ tutor/config/routes.rb | 2 ++ .../controllers/profile_controller_test.rb | 7 +++++ 8 files changed, 82 insertions(+) create mode 100644 .gitignore~ create mode 100644 tutor/app/assets/javascripts/profile.js.coffee create mode 100644 tutor/app/assets/stylesheets/profile.css.scss create mode 100644 tutor/app/controllers/profile_controller.rb create mode 100644 tutor/app/views/profile/index.html.erb create mode 100644 tutor/test/controllers/profile_controller_test.rb diff --git a/.gitignore~ b/.gitignore~ new file mode 100644 index 00000000..40c1a8fa --- /dev/null +++ b/.gitignore~ @@ -0,0 +1,25 @@ +.DS_Store +*.rbc +capybara-*.html +.rspec +/log +/tmp +/db/*.sqlite3 +/public/system +/coverage/ +/spec/tmp +**.orig +rerun.txt +pickle-email-*.html +config/initializers/secret_token.rb +config/secrets.yml + +## Environment normalisation: +/.bundle +/vendor/bundle + +# these should all be checked in to normalise the environment: +# Gemfile.lock, .ruby-version, .ruby-gemset + +# unless supporting rvm < 1.11.0 or doing something fancy, ignore this: +.rvmrc diff --git a/tutor/app/assets/javascripts/profile.js.coffee b/tutor/app/assets/javascripts/profile.js.coffee new file mode 100644 index 00000000..24f83d18 --- /dev/null +++ b/tutor/app/assets/javascripts/profile.js.coffee @@ -0,0 +1,3 @@ +# Place all the behaviors and hooks related to the matching controller here. +# All this logic will automatically be available in application.js. +# You can use CoffeeScript in this file: http://coffeescript.org/ diff --git a/tutor/app/assets/stylesheets/profile.css.scss b/tutor/app/assets/stylesheets/profile.css.scss new file mode 100644 index 00000000..22ee5087 --- /dev/null +++ b/tutor/app/assets/stylesheets/profile.css.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the Profile controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/tutor/app/controllers/profile_controller.rb b/tutor/app/controllers/profile_controller.rb new file mode 100644 index 00000000..c46b6546 --- /dev/null +++ b/tutor/app/controllers/profile_controller.rb @@ -0,0 +1,2 @@ +class ProfileController < ApplicationController +end diff --git a/tutor/app/models/student.rb b/tutor/app/models/student.rb index 7a686980..a1738991 100644 --- a/tutor/app/models/student.rb +++ b/tutor/app/models/student.rb @@ -49,5 +49,33 @@ def get_a_system_suggested_problem # Return random element from array return suggestions.to_a().sample() end + + def get_next_problems_hash + next_problems_to_solve = Hash.new + + courses.each do |course| + course.topics.each do |topic| + level = TrackProgression.get_progress(self.id, topic.id) + + topic.tracks.each do |track| + if(track.difficulty == level) + track.problems.each do |problem| + if(!problem.is_solved_by_student(self.id)) + key = course.name + key += " - " + topic.title + key += " - " + track.title + next_problems_to_solve[key] = problem + break + end + end + end + end + end + end + + return next_problems_to_solve + end + + end diff --git a/tutor/app/views/profile/index.html.erb b/tutor/app/views/profile/index.html.erb new file mode 100644 index 00000000..664d4793 --- /dev/null +++ b/tutor/app/views/profile/index.html.erb @@ -0,0 +1,12 @@ +<% if student_signed_in? %> +

you are signed in

+<% + next_problems_to_solve = current_student.get_next_problems_hash + if next_problems_to_solve != nil then + next_problems_to_solve.each do |key , value| + str = key + "--" + value.title + %> + <%= str %> + <% end %> + <% end %> +<% end %> \ No newline at end of file diff --git a/tutor/config/routes.rb b/tutor/config/routes.rb index 6b97d09f..ece105c4 100644 --- a/tutor/config/routes.rb +++ b/tutor/config/routes.rb @@ -31,6 +31,8 @@ devise_for :students devise_for :lecturers + get 'profile' => 'profile#index' + # Example of named route that can be invoked with purchase_url(id: product.id) # get 'products/:id/purchase' => 'catalog#purchase', as: :purchase diff --git a/tutor/test/controllers/profile_controller_test.rb b/tutor/test/controllers/profile_controller_test.rb new file mode 100644 index 00000000..81441f04 --- /dev/null +++ b/tutor/test/controllers/profile_controller_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class ProfileControllerTest < ActionController::TestCase + # test "the truth" do + # assert true + # end +end From 348e1b38493ca9bc1ca8ff935cdd17b5a91ecadd Mon Sep 17 00:00:00 2001 From: Mohab Date: Thu, 17 Apr 2014 18:25:05 +0200 Subject: [PATCH 013/938] Applying modification --- tutor/app/models/student.rb | 2 +- tutor/app/views/profile/index.html.erb | 18 ++++++++---------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/tutor/app/models/student.rb b/tutor/app/models/student.rb index a1738991..1eda018f 100644 --- a/tutor/app/models/student.rb +++ b/tutor/app/models/student.rb @@ -50,7 +50,7 @@ def get_a_system_suggested_problem return suggestions.to_a().sample() end - def get_next_problems_hash + def get_next_problems_to_solve next_problems_to_solve = Hash.new courses.each do |course| diff --git a/tutor/app/views/profile/index.html.erb b/tutor/app/views/profile/index.html.erb index 664d4793..ed7c92ba 100644 --- a/tutor/app/views/profile/index.html.erb +++ b/tutor/app/views/profile/index.html.erb @@ -1,12 +1,10 @@ -<% if student_signed_in? %> -

you are signed in

<% - next_problems_to_solve = current_student.get_next_problems_hash + next_problems_to_solve = current_student.get_next_problems_to_solve if next_problems_to_solve != nil then - next_problems_to_solve.each do |key , value| - str = key + "--" + value.title - %> - <%= str %> - <% end %> - <% end %> -<% end %> \ No newline at end of file + next_problems_to_solve.each do |key , value| + concat key + concat link_to value.title, controller: "problems", action: "show", id: value.id + concat "
".html_safe + end + end +%> \ No newline at end of file From 04ce70ad11be0d1370a6974c2747837edbbb16b9 Mon Sep 17 00:00:00 2001 From: Linsara Date: Thu, 17 Apr 2014 21:43:19 +0200 Subject: [PATCH 014/938] Issue #182 included acts_as_list in tracl's model --- tutor/app/models/track.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tutor/app/models/track.rb b/tutor/app/models/track.rb index d27bbd24..95fded85 100644 --- a/tutor/app/models/track.rb +++ b/tutor/app/models/track.rb @@ -1,5 +1,5 @@ class Track < ActiveRecord::Base - + acts_as_list :scope => :topic #Validations validates :difficulty, presence: true validates :title , presence: true From c677228a159758ca5c4829fb5cbb127edc4763e4 Mon Sep 17 00:00:00 2001 From: Khaled Date: Thu, 17 Apr 2014 22:13:21 +0200 Subject: [PATCH 015/938] Issue #216 Special handling for 'date of birth' field in lecturer registeration --- tutor/app/views/lecturers/registrations/new.html.erb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tutor/app/views/lecturers/registrations/new.html.erb b/tutor/app/views/lecturers/registrations/new.html.erb index 4842fb7d..14293b46 100644 --- a/tutor/app/views/lecturers/registrations/new.html.erb +++ b/tutor/app/views/lecturers/registrations/new.html.erb @@ -28,7 +28,7 @@
<%= f.label :date_of_birth %>
- <%= f.datetime_field :dob %> + <%= f.date_select :dob, {:start_year => Date.today.year-90, :end_year => Date.today.year} %>
@@ -36,6 +36,11 @@ <%= f.text_field :degree %>
+
+ <%= f.label :department %>
+ <%= f.text_field :department %> +
+
<%= f.submit "Sign up" %>
<% end %> From 6c9e0fb7835112bd8a6bab4ef561517763efbfa4 Mon Sep 17 00:00:00 2001 From: Linsara Date: Thu, 17 Apr 2014 23:26:00 +0200 Subject: [PATCH 016/938] Issue #182 added acts_as_list gem & testing drag&drop list --- tutor/Gemfile | 4 + tutor/Gemfile.lock | 3 + tutor/app/controllers/tracks_controller.rb | 15 + tutor/app/models/track.rb | 1 + tutor/app/views/tracks/index.html.erb | 24 + tutor/app/views/tracks/new.html.erb | 0 tutor/app/views/tracks/show.html.erb | 3 +- .../assets/javascripts/jquery.tablednd.js | 1010 +++++++++++++++++ 8 files changed, 1059 insertions(+), 1 deletion(-) create mode 100644 tutor/app/views/tracks/index.html.erb create mode 100644 tutor/app/views/tracks/new.html.erb create mode 100644 tutor/vendor/assets/javascripts/jquery.tablednd.js diff --git a/tutor/Gemfile b/tutor/Gemfile index 7382b0e9..97687742 100644 --- a/tutor/Gemfile +++ b/tutor/Gemfile @@ -51,3 +51,7 @@ gem 'foreman' # Use composite primary keys in models gem 'composite_primary_keys', '~> 6.0.1' + +# +gem 'acts_as_list' + diff --git a/tutor/Gemfile.lock b/tutor/Gemfile.lock index fa0d2aac..b3b19568 100644 --- a/tutor/Gemfile.lock +++ b/tutor/Gemfile.lock @@ -25,6 +25,8 @@ GEM multi_json (~> 1.3) thread_safe (~> 0.1) tzinfo (~> 0.3.37) + acts_as_list (0.4.0) + activerecord (>= 3.0) arel (4.0.2) atomic (1.1.16) bcrypt (3.1.7) @@ -131,6 +133,7 @@ PLATFORMS ruby DEPENDENCIES + acts_as_list coffee-rails (~> 4.0.0) composite_primary_keys (~> 6.0.1) devise diff --git a/tutor/app/controllers/tracks_controller.rb b/tutor/app/controllers/tracks_controller.rb index 9a19e3e7..7430b297 100644 --- a/tutor/app/controllers/tracks_controller.rb +++ b/tutor/app/controllers/tracks_controller.rb @@ -1,5 +1,13 @@ class TracksController < ApplicationController + + def index + @tracks = Track.all + end + + def new + @track = Track.new() + end # [Create Track - Story 4.1] # shows the tracks of the topic with id :id # show 404 page if there is no topic with such id @@ -70,4 +78,11 @@ def create def permitCreate params.require(:Track).permit(:topic_id , :title , :difficulty) end + def sort + @topic = Topic.find(params[:id]) + @Topic.tracks.each do | track | + track.difficulty = params["list-of-tracks"].index(f.id.to_s)+1 + f.save + end + end end \ No newline at end of file diff --git a/tutor/app/models/track.rb b/tutor/app/models/track.rb index 95fded85..e947daed 100644 --- a/tutor/app/models/track.rb +++ b/tutor/app/models/track.rb @@ -1,4 +1,5 @@ class Track < ActiveRecord::Base + acts_as_list :scope => :topic #Validations validates :difficulty, presence: true diff --git a/tutor/app/views/tracks/index.html.erb b/tutor/app/views/tracks/index.html.erb new file mode 100644 index 00000000..3bd8f7da --- /dev/null +++ b/tutor/app/views/tracks/index.html.erb @@ -0,0 +1,24 @@ + + + + + + + + + + + + +
1Onesome text
2Twosome text
3Threesome text
4Foursome text
5Fivesome text
6Sixsome text
+ + +
    + <% @tracks.each do |track| %> +
  • + <%= track.title %> +
    • + <% end %> +
diff --git a/tutor/app/views/tracks/new.html.erb b/tutor/app/views/tracks/new.html.erb new file mode 100644 index 00000000..e69de29b diff --git a/tutor/app/views/tracks/show.html.erb b/tutor/app/views/tracks/show.html.erb index aeb5a7e4..bf98d2fd 100644 --- a/tutor/app/views/tracks/show.html.erb +++ b/tutor/app/views/tracks/show.html.erb @@ -34,7 +34,8 @@ other buttons only shows an alert --> - + <%= button_to "Edit track rating", action: "index" %> diff --git a/tutor/vendor/assets/javascripts/jquery.tablednd.js b/tutor/vendor/assets/javascripts/jquery.tablednd.js new file mode 100644 index 00000000..7d2f84e8 --- /dev/null +++ b/tutor/vendor/assets/javascripts/jquery.tablednd.js @@ -0,0 +1,1010 @@ + + + + + + + + + + + + + TableDnD/stable/jquery.tablednd.js at master ยท isocra/TableDnD + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Skip to content +
+ + + + + + +
+
+ + + + + + + + + + +
+
+ +
+ + + +
+ + + +
+ + This repository + + + +
+ + + + + + + + +
+ +
+ + + + + + + + + + +
+
+ + + + + + + +
+
+ +
+
+ + +
    + +
  • +
    + +
    + + + + + Watch + + + +
    + +
    +
    + +
    +
    • + +
  • + + +
    + + Unstar + + + + Star + + + +
    + +
    • + + +
  • + + Fork + + +
    • + + +
+ +

+ public + + /TableDnD + + + Octocat-spinner-32 + + +

+
+
+ +
+
+
+ + +
+
+ +
+ + + +
+
+ +
+ + + + +
+

HTTPS clone URL

+
+ + + +
+
+ + + +
+

SSH clone URL

+
+ + + +
+
+ + + +
+

Subversion checkout URL

+
+ + + +
+
+ + +

You can clone with + HTTPS, + SSH, + or Subversion. + + + + + +

+ + + + + + Download ZIP + +
+
+ +
+ + + + + + + + + +
+ + +
+ + + branch: + master + + + +
+ +
+ TableDnD / stable / jquery.tablednd.js +
+
+ + +
+ isocra + + +
+ migrating project to Git +
+ +
+

1 contributor

+ +
+ +
+ +
+
+
+
+ + file + + 314 lines (291 sloc) + + 13.677 kb +
+
+
+ Edit + Raw + Blame + History +
+ + + + Delete + +
+
+
+ + + + + +
+ 1 +2 +3 +4 +5 +6 +7 +8 +9 +10 +11 +12 +13 +14 +15 +16 +17 +18 +19 +20 +21 +22 +23 +24 +25 +26 +27 +28 +29 +30 +31 +32 +33 +34 +35 +36 +37 +38 +39 +40 +41 +42 +43 +44 +45 +46 +47 +48 +49 +50 +51 +52 +53 +54 +55 +56 +57 +58 +59 +60 +61 +62 +63 +64 +65 +66 +67 +68 +69 +70 +71 +72 +73 +74 +75 +76 +77 +78 +79 +80 +81 +82 +83 +84 +85 +86 +87 +88 +89 +90 +91 +92 +93 +94 +95 +96 +97 +98 +99 +100 +101 +102 +103 +104 +105 +106 +107 +108 +109 +110 +111 +112 +113 +114 +115 +116 +117 +118 +119 +120 +121 +122 +123 +124 +125 +126 +127 +128 +129 +130 +131 +132 +133 +134 +135 +136 +137 +138 +139 +140 +141 +142 +143 +144 +145 +146 +147 +148 +149 +150 +151 +152 +153 +154 +155 +156 +157 +158 +159 +160 +161 +162 +163 +164 +165 +166 +167 +168 +169 +170 +171 +172 +173 +174 +175 +176 +177 +178 +179 +180 +181 +182 +183 +184 +185 +186 +187 +188 +189 +190 +191 +192 +193 +194 +195 +196 +197 +198 +199 +200 +201 +202 +203 +204 +205 +206 +207 +208 +209 +210 +211 +212 +213 +214 +215 +216 +217 +218 +219 +220 +221 +222 +223 +224 +225 +226 +227 +228 +229 +230 +231 +232 +233 +234 +235 +236 +237 +238 +239 +240 +241 +242 +243 +244 +245 +246 +247 +248 +249 +250 +251 +252 +253 +254 +255 +256 +257 +258 +259 +260 +261 +262 +263 +264 +265 +266 +267 +268 +269 +270 +271 +272 +273 +274 +275 +276 +277 +278 +279 +280 +281 +282 +283 +284 +285 +286 +287 +288 +289 +290 +291 +292 +293 +294 +295 +296 +297 +298 +299 +300 +301 +302 +303 +304 +305 +306 +307 +308 +309 +310 +311 +312 +313 +314 + + 
/**
 * TableDnD plug-in for JQuery, allows you to drag and drop table rows
 * You can set up various options to control how the system will work
 * Copyright ยฉ Denis Howlett <denish@isocra.com>
 * Licensed like jQuery, see http://docs.jquery.com/License.
 *
 * Configuration options:
 * 
 * onDragStyle
 *     This is the style that is assigned to the row during drag. There are limitations to the styles that can be
 *     associated with a row (such as you can't assign a borderรขโ‚ฌโ€well you can, but it won't be
 *     displayed). (So instead consider using onDragClass.) The CSS style to apply is specified as
 *     a map (as used in the jQuery css(...) function).
 * onDropStyle
 *     This is the style that is assigned to the row when it is dropped. As for onDragStyle, there are limitations
 *     to what you can do. Also this replaces the original style, so again consider using onDragClass which
 *     is simply added and then removed on drop.
 * onDragClass
 *     This class is added for the duration of the drag and then removed when the row is dropped. It is more
 *     flexible than using onDragStyle since it can be inherited by the row cells and other content. The default
 *     is class is tDnD_whileDrag. So to use the default, simply customise this CSS class in your
 *     stylesheet.
 * onDrop
 *     Pass a function that will be called when the row is dropped. The function takes 2 parameters: the table
 *     and the row that was dropped. You can work out the new order of the rows by using
 *     table.rows.
 * onDragStart
 *     Pass a function that will be called when the user starts dragging. The function takes 2 parameters: the
 *     table and the row which the user has started to drag.
 * onAllowDrop
 *     Pass a function that will be called as a row is over another row. If the function returns true, allow 
 *     dropping on that row, otherwise not. The function takes 2 parameters: the dragged row and the row under
 *     the cursor. It returns a boolean: true allows the drop, false doesn't allow it.
 * scrollAmount
 *     This is the number of pixels to scroll if the user moves the mouse cursor to the top or bottom of the
 *     window. The page should automatically scroll up or down as appropriate (tested in IE6, IE7, Safari, FF2,
 *     FF3 beta)
 * 
 * Other ways to control behaviour:
 *
 * Add class="nodrop" to any rows for which you don't want to allow dropping, and class="nodrag" to any rows
 * that you don't want to be draggable.
 *
 * Inside the onDrop method you can also call $.tableDnD.serialize() this returns a string of the form
 * <tableID>[]=<rowID1>&<tableID>[]=<rowID2> so that you can send this back to the server. The table must have
 * an ID as must all the rows.
 *
 * Known problems:
 * - Auto-scoll has some problems with IE7  (it scrolls even when it shouldn't), work-around: set scrollAmount to 0
 * 
 * Version 0.2: 2008-02-20 First public version
 * Version 0.3: 2008-02-07 Added onDragStart option
 *                         Made the scroll amount configurable (default is 5 as before)
 * Version 0.4: 2008-03-15 Changed the noDrag/noDrop attributes to nodrag/nodrop classes
 *                         Added onAllowDrop to control dropping
 *                         Fixed a bug which meant that you couldn't set the scroll amount in both directions
 *                         Added serialise method
 */
jQuery.tableDnD = {
    /** Keep hold of the current table being dragged */
    currentTable : null,
    /** Keep hold of the current drag object if any */
    dragObject: null,
    /** The current mouse offset */
    mouseOffset: null,
    /** Remember the old value of Y so that we don't do too much processing */
    oldY: 0,

    /** Actually build the structure */
    build: function(options) {
        // Make sure options exists
        options = options || {};
        // Set up the defaults if any

        this.each(function() {
            // Remember the options
            this.tableDnDConfig = {
                onDragStyle: options.onDragStyle,
                onDropStyle: options.onDropStyle,
				// Add in the default class for whileDragging
				onDragClass: options.onDragClass ? options.onDragClass : "tDnD_whileDrag",
                onDrop: options.onDrop,
                onDragStart: options.onDragStart,
                scrollAmount: options.scrollAmount ? options.scrollAmount : 5
            };
            // Now make the rows draggable
            jQuery.tableDnD.makeDraggable(this);
        });

        // Now we need to capture the mouse up and mouse move event
        // We can use bind so that we don't interfere with other event handlers
        jQuery(document)
            .bind('mousemove', jQuery.tableDnD.mousemove)
            .bind('mouseup', jQuery.tableDnD.mouseup);

        // Don't break the chain
        return this;
    },

    /** This function makes all the rows on the table draggable apart from those marked as "NoDrag" */
    makeDraggable: function(table) {
        // Now initialise the rows
        var rows = table.rows; //getElementsByTagName("tr")
        var config = table.tableDnDConfig;
        for (var i=0; i<rows.length; i++) {
            // To make non-draggable rows, add the nodrag class (eg for Category and Header rows) 
			// inspired by John Tarr and Famic
            var nodrag = $(rows[i]).hasClass("nodrag");
            if (! nodrag) { //There is no NoDnD attribute on rows I want to drag
                jQuery(rows[i]).mousedown(function(ev) {
                    if (ev.target.tagName == "TD") {
                        jQuery.tableDnD.dragObject = this;
                        jQuery.tableDnD.currentTable = table;
                        jQuery.tableDnD.mouseOffset = jQuery.tableDnD.getMouseOffset(this, ev);
                        if (config.onDragStart) {
                            // Call the onDrop method if there is one
                            config.onDragStart(table, this);
                        }
                        return false;
                    }
                }).css("cursor", "move"); // Store the tableDnD object
            }
        }
    },

    /** Get the mouse coordinates from the event (allowing for browser differences) */
    mouseCoords: function(ev){
        if(ev.pageX || ev.pageY){
            return {x:ev.pageX, y:ev.pageY};
        }
        return {
            x:ev.clientX + document.body.scrollLeft - document.body.clientLeft,
            y:ev.clientY + document.body.scrollTop  - document.body.clientTop
        };
    },

    /** Given a target element and a mouse event, get the mouse offset from that element.
        To do this we need the element's position and the mouse position */
    getMouseOffset: function(target, ev) {
        ev = ev || window.event;

        var docPos    = this.getPosition(target);
        var mousePos  = this.mouseCoords(ev);
        return {x:mousePos.x - docPos.x, y:mousePos.y - docPos.y};
    },

    /** Get the position of an element by going up the DOM tree and adding up all the offsets */
    getPosition: function(e){
        var left = 0;
        var top  = 0;
        /** Safari fix -- thanks to Luis Chato for this! */
        if (e.offsetHeight == 0) {
            /** Safari 2 doesn't correctly grab the offsetTop of a table row
            this is detailed here:
            http://jacob.peargrove.com/blog/2006/technical/table-row-offsettop-bug-in-safari/
            the solution is likewise noted there, grab the offset of a table cell in the row - the firstChild.
            note that firefox will return a text node as a first child, so designing a more thorough
            solution may need to take that into account, for now this seems to work in firefox, safari, ie */
            e = e.firstChild; // a table cell
        }

        while (e.offsetParent){
            left += e.offsetLeft;
            top  += e.offsetTop;
            e     = e.offsetParent;
        }

        left += e.offsetLeft;
        top  += e.offsetTop;

        return {x:left, y:top};
    },

    mousemove: function(ev) {
        if (jQuery.tableDnD.dragObject == null) {
            return;
        }

        var dragObj = jQuery(jQuery.tableDnD.dragObject);
        var config = jQuery.tableDnD.currentTable.tableDnDConfig;
        var mousePos = jQuery.tableDnD.mouseCoords(ev);
        var y = mousePos.y - jQuery.tableDnD.mouseOffset.y;
        //auto scroll the window
	    var yOffset = window.pageYOffset;
	 	if (document.all) {
	        // Windows version
	        //yOffset=document.body.scrollTop;
	        if (typeof document.compatMode != 'undefined' &&
	             document.compatMode != 'BackCompat') {
	           yOffset = document.documentElement.scrollTop;
	        }
	        else if (typeof document.body != 'undefined') {
	           yOffset=document.body.scrollTop;
	        }

	    }

		if (mousePos.y-yOffset < config.scrollAmount) {
	    	window.scrollBy(0, -config.scrollAmount);
	    } else {
            var windowHeight = window.innerHeight ? window.innerHeight
                    : document.documentElement.clientHeight ? document.documentElement.clientHeight : document.body.clientHeight;
            if (windowHeight-(mousePos.y-yOffset) < config.scrollAmount) {
                window.scrollBy(0, config.scrollAmount);
            }
        }


        if (y != jQuery.tableDnD.oldY) {
            // work out if we're going up or down...
            var movingDown = y > jQuery.tableDnD.oldY;
            // update the old value
            jQuery.tableDnD.oldY = y;
            // update the style to show we're dragging
			if (config.onDragClass) {
				dragObj.addClass(config.onDragClass);
			} else {
	            dragObj.css(config.onDragStyle);
			}
            // If we're over a row then move the dragged row to there so that the user sees the
            // effect dynamically
            var currentRow = jQuery.tableDnD.findDropTargetRow(dragObj, y);
            if (currentRow) {
                // TODO worry about what happens when there are multiple TBODIES
                if (movingDown && jQuery.tableDnD.dragObject != currentRow) {
                    jQuery.tableDnD.dragObject.parentNode.insertBefore(jQuery.tableDnD.dragObject, currentRow.nextSibling);
                } else if (! movingDown && jQuery.tableDnD.dragObject != currentRow) {
                    jQuery.tableDnD.dragObject.parentNode.insertBefore(jQuery.tableDnD.dragObject, currentRow);
                }
            }
        }

        return false;
    },

    /** We're only worried about the y position really, because we can only move rows up and down */
    findDropTargetRow: function(draggedRow, y) {
        var rows = jQuery.tableDnD.currentTable.rows;
        for (var i=0; i<rows.length; i++) {
            var row = rows[i];
            var rowY    = this.getPosition(row).y;
            var rowHeight = parseInt(row.offsetHeight)/2;
            if (row.offsetHeight == 0) {
                rowY = this.getPosition(row.firstChild).y;
                rowHeight = parseInt(row.firstChild.offsetHeight)/2;
            }
            // Because we always have to insert before, we need to offset the height a bit
            if ((y > rowY - rowHeight) && (y < (rowY + rowHeight))) {
                // that's the row we're over
				// If it's the same as the current row, ignore it
				if (row == draggedRow) {return null;}
                var config = jQuery.tableDnD.currentTable.tableDnDConfig;
                if (config.onAllowDrop) {
                    if (config.onAllowDrop(draggedRow, row)) {
                        return row;
                    } else {
                        return null;
                    }
                } else {
					// If a row has nodrop class, then don't allow dropping (inspired by John Tarr and Famic)
                    var nodrop = $(row).hasClass("nodrop");
                    if (! nodrop) {
                        return row;
                    } else {
                        return null;
                    }
                }
                return row;
            }
        }
        return null;
    },

    mouseup: function(e) {
        if (jQuery.tableDnD.currentTable && jQuery.tableDnD.dragObject) {
            var droppedRow = jQuery.tableDnD.dragObject;
            var config = jQuery.tableDnD.currentTable.tableDnDConfig;
            // If we have a dragObject, then we need to release it,
            // The row will already have been moved to the right place so we just reset stuff
			if (config.onDragClass) {
	            jQuery(droppedRow).removeClass(config.onDragClass);
			} else {
	            jQuery(droppedRow).css(config.onDropStyle);
			}
            jQuery.tableDnD.dragObject   = null;
            if (config.onDrop) {
                // Call the onDrop method if there is one
                config.onDrop(jQuery.tableDnD.currentTable, droppedRow);
            }
            jQuery.tableDnD.currentTable = null; // let go of the table too
        }
    },

    serialize: function() {
        if (jQuery.tableDnD.currentTable) {
            var result = "";
            var tableId = jQuery.tableDnD.currentTable.id;
            var rows = jQuery.tableDnD.currentTable.rows;
            for (var i=0; i<rows.length; i++) {
                if (result.length > 0) result += "&";
                result += tableId + '[]=' + rows[i].id;
            }
            return result;
        } else {
            return "Error: No Table id set, you need to set an id on your table and every row";
        }
    }
}

jQuery.fn.extend(
	{
		tableDnD : jQuery.tableDnD.build
	}
);
+
+ +
+
+ + + + +
+ +
+
+
+
+ + +
+ +
+
+ + + + + + + +
+
+ + +
+
+
+ +
+
+
+ + + + + + +
+
+ + + +
+ + + Something went wrong with that request. Please try again. +
+ + + + From 08934403721b96afc8ebc5c2ea8b67b02ddb82f5 Mon Sep 17 00:00:00 2001 From: AmirGeorge Date: Thu, 17 Apr 2014 23:40:04 +0200 Subject: [PATCH 017/938] Created mailer for System reminders --- tutor/app/mailers/system_reminders.rb | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 tutor/app/mailers/system_reminders.rb diff --git a/tutor/app/mailers/system_reminders.rb b/tutor/app/mailers/system_reminders.rb new file mode 100644 index 00000000..d24eaf63 --- /dev/null +++ b/tutor/app/mailers/system_reminders.rb @@ -0,0 +1,8 @@ +class SystemReminders < ActionMailer::Base + default from: "from@example.com" + def welcome_email(current_student) + @user = current_student + @url = 'http://localhost:3000' + mail(to: @user.email, subject: 'Welcome to our Awesome Tutors Website') + end +end From e4d1b7cbc0d02e6d012108349fead50b49dd079a Mon Sep 17 00:00:00 2001 From: AmirGeorge Date: Thu, 17 Apr 2014 23:50:12 +0200 Subject: [PATCH 018/938] Created message bodies awaiting dependency on link to next problem --- .../system_reminders/reminder_email.html.erb | 16 ++++++++++++++++ .../system_reminders/reminder_email.text.erb | 8 ++++++++ 2 files changed, 24 insertions(+) create mode 100644 tutor/app/views/system_reminders/reminder_email.html.erb create mode 100644 tutor/app/views/system_reminders/reminder_email.text.erb diff --git a/tutor/app/views/system_reminders/reminder_email.html.erb b/tutor/app/views/system_reminders/reminder_email.html.erb new file mode 100644 index 00000000..cab1be67 --- /dev/null +++ b/tutor/app/views/system_reminders/reminder_email.html.erb @@ -0,0 +1,16 @@ + + + + + + +

Welcome to Tutors website, <%= @user.name %>

+

+ Your beloved Tutors website has missed you !
+

+

+ To login to the site, just follow this link: <%= @url %>. +

+

Hoping to see you soon and have a great day!

+ + \ No newline at end of file diff --git a/tutor/app/views/system_reminders/reminder_email.text.erb b/tutor/app/views/system_reminders/reminder_email.text.erb new file mode 100644 index 00000000..03350bf4 --- /dev/null +++ b/tutor/app/views/system_reminders/reminder_email.text.erb @@ -0,0 +1,8 @@ +Hello <%= @user.name %>, +=============================================== + +We have missed you ! + +To login to the site, just follow this link: <%= @url %>. + +Hoping to see you soon ;) \ No newline at end of file From 3fa8b2b055c482823e806ff66db633e13045c30e Mon Sep 17 00:00:00 2001 From: AmirGeorge Date: Thu, 17 Apr 2014 23:57:46 +0200 Subject: [PATCH 019/938] Fixed mail subject --- tutor/app/mailers/system_reminders.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tutor/app/mailers/system_reminders.rb b/tutor/app/mailers/system_reminders.rb index d24eaf63..324af815 100644 --- a/tutor/app/mailers/system_reminders.rb +++ b/tutor/app/mailers/system_reminders.rb @@ -3,6 +3,6 @@ class SystemReminders < ActionMailer::Base def welcome_email(current_student) @user = current_student @url = 'http://localhost:3000' - mail(to: @user.email, subject: 'Welcome to our Awesome Tutors Website') + mail(to: @user.email, subject: 'We miss you at our Awesome Tutors Website') end end From d9c0f3732f9e9fda11a6d112d1c862d222f55c37 Mon Sep 17 00:00:00 2001 From: Linsara Date: Fri, 18 Apr 2014 00:09:33 +0200 Subject: [PATCH 020/938] Issue #182 working drag and drop functionality --- tutor/app/controllers/tracks_controller.rb | 24 +++++++---- tutor/app/views/tracks/index.html.erb | 43 +++++++++++-------- tutor/config/routes.rb | 2 + .../assets/javascripts/jquery.tablednd.js | 4 +- 4 files changed, 43 insertions(+), 30 deletions(-) diff --git a/tutor/app/controllers/tracks_controller.rb b/tutor/app/controllers/tracks_controller.rb index 7430b297..d6f8f94f 100644 --- a/tutor/app/controllers/tracks_controller.rb +++ b/tutor/app/controllers/tracks_controller.rb @@ -2,7 +2,7 @@ class TracksController < ApplicationController def index - @tracks = Track.all + @tracks = Track.all end def new @@ -78,11 +78,19 @@ def create def permitCreate params.require(:Track).permit(:topic_id , :title , :difficulty) end - def sort - @topic = Topic.find(params[:id]) - @Topic.tracks.each do | track | - track.difficulty = params["list-of-tracks"].index(f.id.to_s)+1 - f.save - end - end + + ##def sort + # @topic = Topic.find(params[:id]) + # @Topic.tracks.each do | track | + # track.difficulty = params["list-of-tracks"].index(f.id.to_s)+1 + # f.save + # end + #end + + def sort + params[:tracks].each_with_index do |id, index| + Track.update_all([โ€™difficulty=?โ€™, index+1], [โ€™id=?โ€™, id]) + end + render :nothing => true + end end \ No newline at end of file diff --git a/tutor/app/views/tracks/index.html.erb b/tutor/app/views/tracks/index.html.erb index 3bd8f7da..d3f20f45 100644 --- a/tutor/app/views/tracks/index.html.erb +++ b/tutor/app/views/tracks/index.html.erb @@ -1,24 +1,29 @@ + + + +jQuery UI Sortable - Default functionality + + + + + - - - - - - - - - -
1Onesome text
2Twosome text
3Threesome text
4Foursome text
5Fivesome text
6Sixsome text
- - -
    - <% @tracks.each do |track| %> -
  • - <%= track.title %> -
    • - <% end %> + +
      +<%- @tracks.each do |track| %> +
    • <%=track.title%>
      • +<% end %>
    + + diff --git a/tutor/config/routes.rb b/tutor/config/routes.rb index 6b97d09f..74dba6ca 100644 --- a/tutor/config/routes.rb +++ b/tutor/config/routes.rb @@ -8,6 +8,8 @@ # You can have the root of your site routed with "root" + resources :tracks, :collection => { :sort => :post} + root 'site#index' resources :tracks do post 'getProblems', on: :member diff --git a/tutor/vendor/assets/javascripts/jquery.tablednd.js b/tutor/vendor/assets/javascripts/jquery.tablednd.js index 7d2f84e8..1595cdd8 100644 --- a/tutor/vendor/assets/javascripts/jquery.tablednd.js +++ b/tutor/vendor/assets/javascripts/jquery.tablednd.js @@ -30,9 +30,7 @@ - - - + From 8279b8f784737b71c03bd13b2da1fe21ca7ef882 Mon Sep 17 00:00:00 2001 From: Khaled Date: Fri, 18 Apr 2014 01:27:38 +0200 Subject: [PATCH 021/938] Issue #216 Added uploading profile image in lecturer registeration --- tutor/Gemfile | 11 ++-- tutor/Gemfile.lock | 8 +++ .../app/controllers/application_controller.rb | 3 +- tutor/app/models/lecturer.rb | 6 +-- tutor/app/uploaders/profile_image_uploader.rb | 51 +++++++++++++++++++ .../lecturers/registrations/new.html.erb | 14 +++-- 6 files changed, 83 insertions(+), 10 deletions(-) create mode 100644 tutor/app/uploaders/profile_image_uploader.rb diff --git a/tutor/Gemfile b/tutor/Gemfile index 7382b0e9..1cf25cea 100644 --- a/tutor/Gemfile +++ b/tutor/Gemfile @@ -5,9 +5,16 @@ ruby '2.1.0' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '4.0.4' +# User authentication +gem 'devise' + +# File uploading +gem 'carrierwave' +gem 'rmagick' + # Use sqlite3 as the database for Active Record gem 'sqlite3' -gem 'devise' + # Use SCSS for stylesheets gem 'sass-rails', '~> 4.0.2' @@ -47,7 +54,5 @@ gem 'foreman' # Use debugger # gem 'debugger', group: [:development, :test] -# User authentication - # Use composite primary keys in models gem 'composite_primary_keys', '~> 6.0.1' diff --git a/tutor/Gemfile.lock b/tutor/Gemfile.lock index fa0d2aac..70e8e6dc 100644 --- a/tutor/Gemfile.lock +++ b/tutor/Gemfile.lock @@ -29,6 +29,11 @@ GEM atomic (1.1.16) bcrypt (3.1.7) builder (3.1.4) + carrierwave (0.10.0) + activemodel (>= 3.2.0) + activesupport (>= 3.2.0) + json (>= 1.7) + mime-types (>= 1.16) coffee-rails (4.0.1) coffee-script (>= 2.2.0) railties (>= 4.0.0, < 5.0) @@ -88,6 +93,7 @@ GEM rake (10.1.1) rdoc (4.1.1) json (~> 1.4) + rmagick (2.13.2) sass (3.2.17) sass-rails (4.0.2) railties (>= 4.0.0, < 5.0) @@ -131,6 +137,7 @@ PLATFORMS ruby DEPENDENCIES + carrierwave coffee-rails (~> 4.0.0) composite_primary_keys (~> 6.0.1) devise @@ -138,6 +145,7 @@ DEPENDENCIES jbuilder (~> 1.2) jquery-rails (~> 3.1.0) rails (= 4.0.4) + rmagick sass-rails (~> 4.0.2) sdoc sqlite3 diff --git a/tutor/app/controllers/application_controller.rb b/tutor/app/controllers/application_controller.rb index c164ace4..64faa7b5 100644 --- a/tutor/app/controllers/application_controller.rb +++ b/tutor/app/controllers/application_controller.rb @@ -11,7 +11,8 @@ class ApplicationController < ActionController::Base def update_sanitized_params if "#{resource_name}" == "lecturer" devise_parameter_sanitizer.for(:sign_up) { - |u| u.permit(:name, :email, :password, :password_confirmation, :degree, :age, :dob) + |u| u.permit(:name, :email, :password, :password_confirmation, :gender, :dob, :degree, :department, + :profile_image, :profile_image_cache) } elsif "#{resource_name}" == "student" devise_parameter_sanitizer.for(:sign_up) { diff --git a/tutor/app/models/lecturer.rb b/tutor/app/models/lecturer.rb index 6df75430..563a2f96 100644 --- a/tutor/app/models/lecturer.rb +++ b/tutor/app/models/lecturer.rb @@ -4,12 +4,12 @@ class Lecturer < ActiveRecord::Base devise :database_authenticatable, :registerable, :recoverable, :rememberable, :trackable, :validatable + mount_uploader :profile_image, ProfileImageUploader + #Validations validates :name, presence: true - validates :dob, presence: true validates :degree, presence: true - validates :age, presence: true - validates :dob, presence: true + validates :department, presence: true #Relations has_and_belongs_to_many :courses, join_table: "courses_lecturers" diff --git a/tutor/app/uploaders/profile_image_uploader.rb b/tutor/app/uploaders/profile_image_uploader.rb new file mode 100644 index 00000000..cfd3a79c --- /dev/null +++ b/tutor/app/uploaders/profile_image_uploader.rb @@ -0,0 +1,51 @@ +# encoding: utf-8 + +class ProfileImageUploader < CarrierWave::Uploader::Base + + # Include RMagick or MiniMagick support: + include CarrierWave::RMagick + # include CarrierWave::MiniMagick + + # Choose what kind of storage to use for this uploader: + storage :file + # storage :fog + + # Override the directory where uploaded files will be stored. + # This is a sensible default for uploaders that are meant to be mounted: + def store_dir + "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}" + end + + # Provide a default URL as a default if there hasn't been a file uploaded: + # def default_url + # # For Rails 3.1+ asset pipeline compatibility: + # # ActionController::Base.helpers.asset_path("fallback/" + [version_name, "default.png"].compact.join('_')) + # + # "/images/fallback/" + [version_name, "default.png"].compact.join('_') + # end + + # Process files as they are uploaded: + process :resize_to_limit => [50, 50] + # + # def scale(width, height) + # # do something + # end + + # Create different versions of your uploaded files: + version :profile do + process :resize_to_fit => [160, 160] + end + + # Add a white list of extensions which are allowed to be uploaded. + # For images you might use something like this: + def extension_white_list + %w(jpg jpeg gif png) + end + + # Override the filename of the uploaded files: + # Avoid using model.id or version_name here, see uploader/store.rb for details. + # def filename + # "something.jpg" if original_filename + # end + +end diff --git a/tutor/app/views/lecturers/registrations/new.html.erb b/tutor/app/views/lecturers/registrations/new.html.erb index 14293b46..bd6d8cc0 100644 --- a/tutor/app/views/lecturers/registrations/new.html.erb +++ b/tutor/app/views/lecturers/registrations/new.html.erb @@ -1,5 +1,5 @@

    Sign up

    - <%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %> + <%= form_for(resource, as: resource_name, url: registration_path(resource_name), :html => {:multipart => true}) do |f| %> <%= devise_error_messages! %>
    <%= f.label :email %>
    @@ -22,8 +22,8 @@
    - <%= f.label :age %>
    - <%= f.number_field :age %> + <%= f.label :gender %>
    + <%= f.select(:gender, [['Male', true], ['Female', false]]) %>
    @@ -41,6 +41,14 @@ <%= f.text_field :department %>
    +
    +
    + <%= image_tag(@lecturer.profile_image_url.to_s) if @lecturer.profile_image? %> + <%= f.file_field :profile_image, {:accept => 'image/png,image/gif,image/jpeg'} %> + <%= f.hidden_field :profile_image_cache %> +
    +
    +
    <%= f.submit "Sign up" %>
    <% end %> From 75f61d550efd70a1238a0097ca954ee2ee626d38 Mon Sep 17 00:00:00 2001 From: AmirGeorge Date: Fri, 18 Apr 2014 01:47:47 +0200 Subject: [PATCH 022/938] added whenever gem, changed action name to reminder_email --- tutor/Gemfile | 3 +++ tutor/app/mailers/system_reminders.rb | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/tutor/Gemfile b/tutor/Gemfile index 7382b0e9..48dbb0f4 100644 --- a/tutor/Gemfile +++ b/tutor/Gemfile @@ -51,3 +51,6 @@ gem 'foreman' # Use composite primary keys in models gem 'composite_primary_keys', '~> 6.0.1' + +# whenever gem for scheduling tasks +gem 'whenever' diff --git a/tutor/app/mailers/system_reminders.rb b/tutor/app/mailers/system_reminders.rb index 324af815..88149193 100644 --- a/tutor/app/mailers/system_reminders.rb +++ b/tutor/app/mailers/system_reminders.rb @@ -1,6 +1,6 @@ class SystemReminders < ActionMailer::Base default from: "from@example.com" - def welcome_email(current_student) + def reminder_email(current_student) @user = current_student @url = 'http://localhost:3000' mail(to: @user.email, subject: 'We miss you at our Awesome Tutors Website') From b8d43cde3713c822e082db5371553815377323e5 Mon Sep 17 00:00:00 2001 From: Khaled Date: Fri, 18 Apr 2014 02:13:00 +0200 Subject: [PATCH 023/938] Issue #216 Finished lecturer registeration --- .../lecturers/registrations/new.html.erb | 48 +++++++++---------- 1 file changed, 22 insertions(+), 26 deletions(-) diff --git a/tutor/app/views/lecturers/registrations/new.html.erb b/tutor/app/views/lecturers/registrations/new.html.erb index bd6d8cc0..fae5cff1 100644 --- a/tutor/app/views/lecturers/registrations/new.html.erb +++ b/tutor/app/views/lecturers/registrations/new.html.erb @@ -1,55 +1,51 @@

    Sign up

    <%= form_for(resource, as: resource_name, url: registration_path(resource_name), :html => {:multipart => true}) do |f| %> <%= devise_error_messages! %> -
    - <%= f.label :email %>
    - <%= f.email_field :email, autofocus: true %> + +
    + <%= f.email_field :email, autofocus: true, class: "form-control", style: "width:300px", placeholder: "Email"%>
    -
    - <%= f.label :name %>
    - <%= f.text_field :name %> +
    + <%= f.text_field :name, class: "form-control", style: "width:300px", placeholder: "Name"%>
    -
    - <%= f.label :password %>
    - <%= f.password_field :password, autocomplete: "off" %> -
    +
    + <%= f.password_field :password, autocomplete: "off", class:"form-control", style:"width:300px", placeholder:"Password"%> +
    -
    - <%= f.label :password_confirmation %>
    - <%= f.password_field :password_confirmation, autocomplete: "off" %> -
    +
    + <%= f.password_field :password_confirmation, autocomplete: "off", class:"form-control", style:"width:300px",placeholder: "Confirm Password" %> +
    -
    - <%= f.label :gender %>
    +
    + <%= f.label :gender %> <%= f.select(:gender, [['Male', true], ['Female', false]]) %>
    -
    - <%= f.label :date_of_birth %>
    +
    + <%= f.label :date_of_birth %> <%= f.date_select :dob, {:start_year => Date.today.year-90, :end_year => Date.today.year} %>
    -
    - <%= f.label :degree %>
    - <%= f.text_field :degree %> +
    + <%= f.text_field :degree, class: "form-control", style: "width:300px", placeholder: "Degree"%>
    -
    - <%= f.label :department %>
    - <%= f.text_field :department %> +
    + <%= f.text_field :department, class: "form-control", style: "width:300px", placeholder: "Department"%>
    -
    +

    + <%= f.label :profile_image %> <%= image_tag(@lecturer.profile_image_url.to_s) if @lecturer.profile_image? %> <%= f.file_field :profile_image, {:accept => 'image/png,image/gif,image/jpeg'} %> <%= f.hidden_field :profile_image_cache %>
    -
    <%= f.submit "Sign up" %>
    +
    <%= f.submit "Sign up", class: "btn btn-success", style: "margin-top:10px" %>
    <% end %> <%= render "lecturers/shared/links" %> From 7c1273e0f6a85096d88cd57b82852d54b427b857 Mon Sep 17 00:00:00 2001 From: AmirGeorge Date: Fri, 18 Apr 2014 02:40:15 +0200 Subject: [PATCH 024/938] added scheduler file, modified parameter name in system_reminders to avoid conflict --- tutor/app/mailers/system_reminders.rb | 4 ++-- tutor/config/schedule.rb | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 tutor/config/schedule.rb diff --git a/tutor/app/mailers/system_reminders.rb b/tutor/app/mailers/system_reminders.rb index 88149193..c2e8b07d 100644 --- a/tutor/app/mailers/system_reminders.rb +++ b/tutor/app/mailers/system_reminders.rb @@ -1,7 +1,7 @@ class SystemReminders < ActionMailer::Base default from: "from@example.com" - def reminder_email(current_student) - @user = current_student + def reminder_email(user) + @user = user @url = 'http://localhost:3000' mail(to: @user.email, subject: 'We miss you at our Awesome Tutors Website') end diff --git a/tutor/config/schedule.rb b/tutor/config/schedule.rb new file mode 100644 index 00000000..bd8c520a --- /dev/null +++ b/tutor/config/schedule.rb @@ -0,0 +1,8 @@ +every 2.hours do + @current = + Student.all.each do |student| + #if student.last_sign_in_at > #some value + runner "SystemReminders.reminder_email(student)" + #end + end +end \ No newline at end of file From c7e7575da4c53e7deff6846a46a57b3125f39569 Mon Sep 17 00:00:00 2001 From: AmirGeorge Date: Fri, 18 Apr 2014 02:54:29 +0200 Subject: [PATCH 025/938] fixed bugs in scheduler.rb --- tutor/config/schedule.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tutor/config/schedule.rb b/tutor/config/schedule.rb index bd8c520a..6e27b345 100644 --- a/tutor/config/schedule.rb +++ b/tutor/config/schedule.rb @@ -1,8 +1,8 @@ -every 2.hours do +every 2.days do @current = Student.all.each do |student| - #if student.last_sign_in_at > #some value - runner "SystemReminders.reminder_email(student)" - #end + if student.last_sign_in_at > Time.now - 7.days + runner "SystemReminders.reminder_email(student).deliver" + end end end \ No newline at end of file From 98582904885c5cacde24f7b8efd63f11f15f7935 Mon Sep 17 00:00:00 2001 From: Linsara Date: Fri, 18 Apr 2014 09:18:53 +0200 Subject: [PATCH 026/938] Issue #182 added 'jquery.sortable.js' as a plugin & sorting is working --- tutor/app/views/tracks/index.html.erb | 39 +- .../assets/javascripts/jquery.sortable.js | 81 ++ .../assets/javascripts/jquery.sortable.min.js | 3 + .../assets/javascripts/jquery.tablednd.js | 1008 ----------------- 4 files changed, 100 insertions(+), 1031 deletions(-) create mode 100644 tutor/vendor/assets/javascripts/jquery.sortable.js create mode 100644 tutor/vendor/assets/javascripts/jquery.sortable.min.js delete mode 100644 tutor/vendor/assets/javascripts/jquery.tablednd.js diff --git a/tutor/app/views/tracks/index.html.erb b/tutor/app/views/tracks/index.html.erb index d3f20f45..9348968f 100644 --- a/tutor/app/views/tracks/index.html.erb +++ b/tutor/app/views/tracks/index.html.erb @@ -1,29 +1,22 @@ - - + - -jQuery UI Sortable - Default functionality - - - - - +
      + <%- @tracks.each do |track| %> + +
    • <%= track.title %>
      • + + <% end %> +
    +<%= javascript_include_tag 'jquery.sortable.js' %> + + + + -
      -<%- @tracks.each do |track| %> -
    • <%=track.title%>
      • -<% end %> -
    + - + \ No newline at end of file diff --git a/tutor/vendor/assets/javascripts/jquery.sortable.js b/tutor/vendor/assets/javascripts/jquery.sortable.js new file mode 100644 index 00000000..5ac3161c --- /dev/null +++ b/tutor/vendor/assets/javascripts/jquery.sortable.js @@ -0,0 +1,81 @@ +/* + * HTML5 Sortable jQuery Plugin + * http://farhadi.ir/projects/html5sortable + * + * Copyright 2012, Ali Farhadi + * Released under the MIT license. + */ +(function($) { +var dragging, placeholders = $(); +$.fn.sortable = function(options) { + var method = String(options); + options = $.extend({ + connectWith: false + }, options); + return this.each(function() { + if (/^enable|disable|destroy$/.test(method)) { + var items = $(this).children($(this).data('items')).attr('draggable', method == 'enable'); + if (method == 'destroy') { + items.add(this).removeData('connectWith items') + .off('dragstart.h5s dragend.h5s selectstart.h5s dragover.h5s dragenter.h5s drop.h5s'); + } + return; + } + var isHandle, index, items = $(this).children(options.items); + var placeholder = $('<' + (/^ul|ol$/i.test(this.tagName) ? 'li' : 'div') + ' class="sortable-placeholder">'); + items.find(options.handle).mousedown(function() { + isHandle = true; + }).mouseup(function() { + isHandle = false; + }); + $(this).data('items', options.items) + placeholders = placeholders.add(placeholder); + if (options.connectWith) { + $(options.connectWith).add(this).data('connectWith', options.connectWith); + } + items.attr('draggable', 'true').on('dragstart.h5s', function(e) { + if (options.handle && !isHandle) { + return false; + } + isHandle = false; + var dt = e.originalEvent.dataTransfer; + dt.effectAllowed = 'move'; + dt.setData('Text', 'dummy'); + index = (dragging = $(this)).addClass('sortable-dragging').index(); + }).on('dragend.h5s', function() { + dragging.removeClass('sortable-dragging').show(); + placeholders.detach(); + if (index != dragging.index()) { + items.parent().trigger('sortupdate', {item: dragging}); + } + dragging = null; + }).not('a[href], img').on('selectstart.h5s', function() { + this.dragDrop && this.dragDrop(); + return false; + }).end().add([this, placeholder]).on('dragover.h5s dragenter.h5s drop.h5s', function(e) { + if (!items.is(dragging) && options.connectWith !== $(dragging).parent().data('connectWith')) { + return true; + } + if (e.type == 'drop') { + e.stopPropagation(); + placeholders.filter(':visible').after(dragging); + return false; + } + e.preventDefault(); + e.originalEvent.dataTransfer.dropEffect = 'move'; + if (items.is(this)) { + if (options.forcePlaceholderSize) { + placeholder.height(dragging.outerHeight()); + } + dragging.hide(); + $(this)[placeholder.index() < $(this).index() ? 'after' : 'before'](placeholder); + placeholders.not(placeholder).detach(); + } else if (!placeholders.is(this) && !$(this).children(options.items).length) { + placeholders.detach(); + $(this).append(placeholder); + } + return false; + }); + }); +}; +})(jQuery); diff --git a/tutor/vendor/assets/javascripts/jquery.sortable.min.js b/tutor/vendor/assets/javascripts/jquery.sortable.min.js new file mode 100644 index 00000000..ccbd29f7 --- /dev/null +++ b/tutor/vendor/assets/javascripts/jquery.sortable.min.js @@ -0,0 +1,3 @@ +/* HTML5 Sortable (http://farhadi.ir/projects/html5sortable) + * Released under the MIT license. + */(function(a){var b,c=a();a.fn.sortable=function(d){var e=String(d);return d=a.extend({connectWith:!1},d),this.each(function(){if(/^enable|disable|destroy$/.test(e)){var f=a(this).children(a(this).data("items")).attr("draggable",e=="enable");e=="destroy"&&f.add(this).removeData("connectWith items").off("dragstart.h5s dragend.h5s selectstart.h5s dragover.h5s dragenter.h5s drop.h5s");return}var g,h,f=a(this).children(d.items),i=a("<"+(/^ul|ol$/i.test(this.tagName)?"li":"div")+' class="sortable-placeholder">');f.find(d.handle).mousedown(function(){g=!0}).mouseup(function(){g=!1}),a(this).data("items",d.items),c=c.add(i),d.connectWith&&a(d.connectWith).add(this).data("connectWith",d.connectWith),f.attr("draggable","true").on("dragstart.h5s",function(c){if(d.handle&&!g)return!1;g=!1;var e=c.originalEvent.dataTransfer;e.effectAllowed="move",e.setData("Text","dummy"),h=(b=a(this)).addClass("sortable-dragging").index()}).on("dragend.h5s",function(){b.removeClass("sortable-dragging").show(),c.detach(),h!=b.index()&&f.parent().trigger("sortupdate",{item:b}),b=null}).not("a[href], img").on("selectstart.h5s",function(){return this.dragDrop&&this.dragDrop(),!1}).end().add([this,i]).on("dragover.h5s dragenter.h5s drop.h5s",function(e){return!f.is(b)&&d.connectWith!==a(b).parent().data("connectWith")?!0:e.type=="drop"?(e.stopPropagation(),c.filter(":visible").after(b),!1):(e.preventDefault(),e.originalEvent.dataTransfer.dropEffect="move",f.is(this)?(d.forcePlaceholderSize&&i.height(b.outerHeight()),b.hide(),a(this)[i.index() - - - - - - - TableDnD/stable/jquery.tablednd.js at master ยท isocra/TableDnD - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Skip to content -
    - - - - - - -
    -
    - - - - - - - - - - -
    -
    - -
    - - - -
    - - - -
    - - This repository - - - -
    - - - - - - - - -
    - -
    - - - - - - - - - - -
    -
    - - - - - - - -
    -
    - -
    -
    - - -
      - -
    • -
      - -
      - - - - - Watch - - - -
      - -
      -
      - -
      -
      • - -
    • - - -
      - - Unstar - - - - Star - - - -
      - -
      • - - -
    • - - Fork - - -
      • - - -
    - -

    - public - - /TableDnD - - - Octocat-spinner-32 - - -

    -
    -
    - -
    -
    -
    - - -
    -
    - -
    - - - -
    -
    - -
    - - - - -
    -

    HTTPS clone URL

    -
    - - - -
    -
    - - - -
    -

    SSH clone URL

    -
    - - - -
    -
    - - - -
    -

    Subversion checkout URL

    -
    - - - -
    -
    - - -

    You can clone with - HTTPS, - SSH, - or Subversion. - - - - - -

    - - - - - - Download ZIP - -
    -
    - -
    - - - - - - - - - -
    - - -
    - - - branch: - master - - - -
    - -
    - TableDnD / stable / jquery.tablednd.js -
    -
    - - -
    - isocra - - -
    - migrating project to Git -
    - -
    -

    1 contributor

    - -
    - -
    - -
    -
    -
    -
    - - file - - 314 lines (291 sloc) - - 13.677 kb -
    -
    -
    - Edit - Raw - Blame - History -
    - - - - Delete - -
    -
    -
    - - - - - -
    - 1 -2 -3 -4 -5 -6 -7 -8 -9 -10 -11 -12 -13 -14 -15 -16 -17 -18 -19 -20 -21 -22 -23 -24 -25 -26 -27 -28 -29 -30 -31 -32 -33 -34 -35 -36 -37 -38 -39 -40 -41 -42 -43 -44 -45 -46 -47 -48 -49 -50 -51 -52 -53 -54 -55 -56 -57 -58 -59 -60 -61 -62 -63 -64 -65 -66 -67 -68 -69 -70 -71 -72 -73 -74 -75 -76 -77 -78 -79 -80 -81 -82 -83 -84 -85 -86 -87 -88 -89 -90 -91 -92 -93 -94 -95 -96 -97 -98 -99 -100 -101 -102 -103 -104 -105 -106 -107 -108 -109 -110 -111 -112 -113 -114 -115 -116 -117 -118 -119 -120 -121 -122 -123 -124 -125 -126 -127 -128 -129 -130 -131 -132 -133 -134 -135 -136 -137 -138 -139 -140 -141 -142 -143 -144 -145 -146 -147 -148 -149 -150 -151 -152 -153 -154 -155 -156 -157 -158 -159 -160 -161 -162 -163 -164 -165 -166 -167 -168 -169 -170 -171 -172 -173 -174 -175 -176 -177 -178 -179 -180 -181 -182 -183 -184 -185 -186 -187 -188 -189 -190 -191 -192 -193 -194 -195 -196 -197 -198 -199 -200 -201 -202 -203 -204 -205 -206 -207 -208 -209 -210 -211 -212 -213 -214 -215 -216 -217 -218 -219 -220 -221 -222 -223 -224 -225 -226 -227 -228 -229 -230 -231 -232 -233 -234 -235 -236 -237 -238 -239 -240 -241 -242 -243 -244 -245 -246 -247 -248 -249 -250 -251 -252 -253 -254 -255 -256 -257 -258 -259 -260 -261 -262 -263 -264 -265 -266 -267 -268 -269 -270 -271 -272 -273 -274 -275 -276 -277 -278 -279 -280 -281 -282 -283 -284 -285 -286 -287 -288 -289 -290 -291 -292 -293 -294 -295 -296 -297 -298 -299 -300 -301 -302 -303 -304 -305 -306 -307 -308 -309 -310 -311 -312 -313 -314 - - 
    /**
     * TableDnD plug-in for JQuery, allows you to drag and drop table rows
     * You can set up various options to control how the system will work
     * Copyright ยฉ Denis Howlett <denish@isocra.com>
     * Licensed like jQuery, see http://docs.jquery.com/License.
     *
     * Configuration options:
     * 
     * onDragStyle
     *     This is the style that is assigned to the row during drag. There are limitations to the styles that can be
     *     associated with a row (such as you can't assign a borderรขโ‚ฌโ€well you can, but it won't be
     *     displayed). (So instead consider using onDragClass.) The CSS style to apply is specified as
     *     a map (as used in the jQuery css(...) function).
     * onDropStyle
     *     This is the style that is assigned to the row when it is dropped. As for onDragStyle, there are limitations
     *     to what you can do. Also this replaces the original style, so again consider using onDragClass which
     *     is simply added and then removed on drop.
     * onDragClass
     *     This class is added for the duration of the drag and then removed when the row is dropped. It is more
     *     flexible than using onDragStyle since it can be inherited by the row cells and other content. The default
     *     is class is tDnD_whileDrag. So to use the default, simply customise this CSS class in your
     *     stylesheet.
     * onDrop
     *     Pass a function that will be called when the row is dropped. The function takes 2 parameters: the table
     *     and the row that was dropped. You can work out the new order of the rows by using
     *     table.rows.
     * onDragStart
     *     Pass a function that will be called when the user starts dragging. The function takes 2 parameters: the
     *     table and the row which the user has started to drag.
     * onAllowDrop
     *     Pass a function that will be called as a row is over another row. If the function returns true, allow 
     *     dropping on that row, otherwise not. The function takes 2 parameters: the dragged row and the row under
     *     the cursor. It returns a boolean: true allows the drop, false doesn't allow it.
     * scrollAmount
     *     This is the number of pixels to scroll if the user moves the mouse cursor to the top or bottom of the
     *     window. The page should automatically scroll up or down as appropriate (tested in IE6, IE7, Safari, FF2,
     *     FF3 beta)
     * 
     * Other ways to control behaviour:
     *
     * Add class="nodrop" to any rows for which you don't want to allow dropping, and class="nodrag" to any rows
     * that you don't want to be draggable.
     *
     * Inside the onDrop method you can also call $.tableDnD.serialize() this returns a string of the form
     * <tableID>[]=<rowID1>&<tableID>[]=<rowID2> so that you can send this back to the server. The table must have
     * an ID as must all the rows.
     *
     * Known problems:
     * - Auto-scoll has some problems with IE7  (it scrolls even when it shouldn't), work-around: set scrollAmount to 0
     * 
     * Version 0.2: 2008-02-20 First public version
     * Version 0.3: 2008-02-07 Added onDragStart option
     *                         Made the scroll amount configurable (default is 5 as before)
     * Version 0.4: 2008-03-15 Changed the noDrag/noDrop attributes to nodrag/nodrop classes
     *                         Added onAllowDrop to control dropping
     *                         Fixed a bug which meant that you couldn't set the scroll amount in both directions
     *                         Added serialise method
     */
    jQuery.tableDnD = {
        /** Keep hold of the current table being dragged */
        currentTable : null,
        /** Keep hold of the current drag object if any */
        dragObject: null,
        /** The current mouse offset */
        mouseOffset: null,
        /** Remember the old value of Y so that we don't do too much processing */
        oldY: 0,

        /** Actually build the structure */
        build: function(options) {
            // Make sure options exists
            options = options || {};
            // Set up the defaults if any

            this.each(function() {
                // Remember the options
                this.tableDnDConfig = {
                    onDragStyle: options.onDragStyle,
                    onDropStyle: options.onDropStyle,
    				// Add in the default class for whileDragging
    				onDragClass: options.onDragClass ? options.onDragClass : "tDnD_whileDrag",
                    onDrop: options.onDrop,
                    onDragStart: options.onDragStart,
                    scrollAmount: options.scrollAmount ? options.scrollAmount : 5
                };
                // Now make the rows draggable
                jQuery.tableDnD.makeDraggable(this);
            });

            // Now we need to capture the mouse up and mouse move event
            // We can use bind so that we don't interfere with other event handlers
            jQuery(document)
                .bind('mousemove', jQuery.tableDnD.mousemove)
                .bind('mouseup', jQuery.tableDnD.mouseup);

            // Don't break the chain
            return this;
        },

        /** This function makes all the rows on the table draggable apart from those marked as "NoDrag" */
        makeDraggable: function(table) {
            // Now initialise the rows
            var rows = table.rows; //getElementsByTagName("tr")
            var config = table.tableDnDConfig;
            for (var i=0; i<rows.length; i++) {
                // To make non-draggable rows, add the nodrag class (eg for Category and Header rows) 
    			// inspired by John Tarr and Famic
                var nodrag = $(rows[i]).hasClass("nodrag");
                if (! nodrag) { //There is no NoDnD attribute on rows I want to drag
                    jQuery(rows[i]).mousedown(function(ev) {
                        if (ev.target.tagName == "TD") {
                            jQuery.tableDnD.dragObject = this;
                            jQuery.tableDnD.currentTable = table;
                            jQuery.tableDnD.mouseOffset = jQuery.tableDnD.getMouseOffset(this, ev);
                            if (config.onDragStart) {
                                // Call the onDrop method if there is one
                                config.onDragStart(table, this);
                            }
                            return false;
                        }
                    }).css("cursor", "move"); // Store the tableDnD object
                }
            }
        },

        /** Get the mouse coordinates from the event (allowing for browser differences) */
        mouseCoords: function(ev){
            if(ev.pageX || ev.pageY){
                return {x:ev.pageX, y:ev.pageY};
            }
            return {
                x:ev.clientX + document.body.scrollLeft - document.body.clientLeft,
                y:ev.clientY + document.body.scrollTop  - document.body.clientTop
            };
        },

        /** Given a target element and a mouse event, get the mouse offset from that element.
            To do this we need the element's position and the mouse position */
        getMouseOffset: function(target, ev) {
            ev = ev || window.event;

            var docPos    = this.getPosition(target);
            var mousePos  = this.mouseCoords(ev);
            return {x:mousePos.x - docPos.x, y:mousePos.y - docPos.y};
        },

        /** Get the position of an element by going up the DOM tree and adding up all the offsets */
        getPosition: function(e){
            var left = 0;
            var top  = 0;
            /** Safari fix -- thanks to Luis Chato for this! */
            if (e.offsetHeight == 0) {
                /** Safari 2 doesn't correctly grab the offsetTop of a table row
                this is detailed here:
                http://jacob.peargrove.com/blog/2006/technical/table-row-offsettop-bug-in-safari/
                the solution is likewise noted there, grab the offset of a table cell in the row - the firstChild.
                note that firefox will return a text node as a first child, so designing a more thorough
                solution may need to take that into account, for now this seems to work in firefox, safari, ie */
                e = e.firstChild; // a table cell
            }

            while (e.offsetParent){
                left += e.offsetLeft;
                top  += e.offsetTop;
                e     = e.offsetParent;
            }

            left += e.offsetLeft;
            top  += e.offsetTop;

            return {x:left, y:top};
        },

        mousemove: function(ev) {
            if (jQuery.tableDnD.dragObject == null) {
                return;
            }

            var dragObj = jQuery(jQuery.tableDnD.dragObject);
            var config = jQuery.tableDnD.currentTable.tableDnDConfig;
            var mousePos = jQuery.tableDnD.mouseCoords(ev);
            var y = mousePos.y - jQuery.tableDnD.mouseOffset.y;
            //auto scroll the window
    	    var yOffset = window.pageYOffset;
    	 	if (document.all) {
    	        // Windows version
    	        //yOffset=document.body.scrollTop;
    	        if (typeof document.compatMode != 'undefined' &&
    	             document.compatMode != 'BackCompat') {
    	           yOffset = document.documentElement.scrollTop;
    	        }
    	        else if (typeof document.body != 'undefined') {
    	           yOffset=document.body.scrollTop;
    	        }

    	    }

    		if (mousePos.y-yOffset < config.scrollAmount) {
    	    	window.scrollBy(0, -config.scrollAmount);
    	    } else {
                var windowHeight = window.innerHeight ? window.innerHeight
                        : document.documentElement.clientHeight ? document.documentElement.clientHeight : document.body.clientHeight;
                if (windowHeight-(mousePos.y-yOffset) < config.scrollAmount) {
                    window.scrollBy(0, config.scrollAmount);
                }
            }


            if (y != jQuery.tableDnD.oldY) {
                // work out if we're going up or down...
                var movingDown = y > jQuery.tableDnD.oldY;
                // update the old value
                jQuery.tableDnD.oldY = y;
                // update the style to show we're dragging
    			if (config.onDragClass) {
    				dragObj.addClass(config.onDragClass);
    			} else {
    	            dragObj.css(config.onDragStyle);
    			}
                // If we're over a row then move the dragged row to there so that the user sees the
                // effect dynamically
                var currentRow = jQuery.tableDnD.findDropTargetRow(dragObj, y);
                if (currentRow) {
                    // TODO worry about what happens when there are multiple TBODIES
                    if (movingDown && jQuery.tableDnD.dragObject != currentRow) {
                        jQuery.tableDnD.dragObject.parentNode.insertBefore(jQuery.tableDnD.dragObject, currentRow.nextSibling);
                    } else if (! movingDown && jQuery.tableDnD.dragObject != currentRow) {
                        jQuery.tableDnD.dragObject.parentNode.insertBefore(jQuery.tableDnD.dragObject, currentRow);
                    }
                }
            }

            return false;
        },

        /** We're only worried about the y position really, because we can only move rows up and down */
        findDropTargetRow: function(draggedRow, y) {
            var rows = jQuery.tableDnD.currentTable.rows;
            for (var i=0; i<rows.length; i++) {
                var row = rows[i];
                var rowY    = this.getPosition(row).y;
                var rowHeight = parseInt(row.offsetHeight)/2;
                if (row.offsetHeight == 0) {
                    rowY = this.getPosition(row.firstChild).y;
                    rowHeight = parseInt(row.firstChild.offsetHeight)/2;
                }
                // Because we always have to insert before, we need to offset the height a bit
                if ((y > rowY - rowHeight) && (y < (rowY + rowHeight))) {
                    // that's the row we're over
    				// If it's the same as the current row, ignore it
    				if (row == draggedRow) {return null;}
                    var config = jQuery.tableDnD.currentTable.tableDnDConfig;
                    if (config.onAllowDrop) {
                        if (config.onAllowDrop(draggedRow, row)) {
                            return row;
                        } else {
                            return null;
                        }
                    } else {
    					// If a row has nodrop class, then don't allow dropping (inspired by John Tarr and Famic)
                        var nodrop = $(row).hasClass("nodrop");
                        if (! nodrop) {
                            return row;
                        } else {
                            return null;
                        }
                    }
                    return row;
                }
            }
            return null;
        },

        mouseup: function(e) {
            if (jQuery.tableDnD.currentTable && jQuery.tableDnD.dragObject) {
                var droppedRow = jQuery.tableDnD.dragObject;
                var config = jQuery.tableDnD.currentTable.tableDnDConfig;
                // If we have a dragObject, then we need to release it,
                // The row will already have been moved to the right place so we just reset stuff
    			if (config.onDragClass) {
    	            jQuery(droppedRow).removeClass(config.onDragClass);
    			} else {
    	            jQuery(droppedRow).css(config.onDropStyle);
    			}
                jQuery.tableDnD.dragObject   = null;
                if (config.onDrop) {
                    // Call the onDrop method if there is one
                    config.onDrop(jQuery.tableDnD.currentTable, droppedRow);
                }
                jQuery.tableDnD.currentTable = null; // let go of the table too
            }
        },

        serialize: function() {
            if (jQuery.tableDnD.currentTable) {
                var result = "";
                var tableId = jQuery.tableDnD.currentTable.id;
                var rows = jQuery.tableDnD.currentTable.rows;
                for (var i=0; i<rows.length; i++) {
                    if (result.length > 0) result += "&";
                    result += tableId + '[]=' + rows[i].id;
                }
                return result;
            } else {
                return "Error: No Table id set, you need to set an id on your table and every row";
            }
        }
    }

    jQuery.fn.extend(
    	{
    		tableDnD : jQuery.tableDnD.build
    	}
    );
    -
    - -
    -
    - - - - -
    - -
    -
    -
    -
    - - -
    - -
    -
    - - - - - - - -
    -
    - - -
    -
    -
    - -
    -
    -
    - - - - - - -
    -
    - - - -
    - - - Something went wrong with that request. Please try again. -
    - - - - From 1b927a6c12cc9ec85066c01d59f03c9351d8909f Mon Sep 17 00:00:00 2001 From: Khaled Date: Fri, 18 Apr 2014 09:31:57 +0200 Subject: [PATCH 027/938] Issue #216 Minor bug fix --- tutor/app/views/lecturers/registrations/new.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tutor/app/views/lecturers/registrations/new.html.erb b/tutor/app/views/lecturers/registrations/new.html.erb index fae5cff1..119f04dc 100644 --- a/tutor/app/views/lecturers/registrations/new.html.erb +++ b/tutor/app/views/lecturers/registrations/new.html.erb @@ -38,7 +38,7 @@

    - <%= f.label :profile_image %> + <%= f.label :profile_image %>
    <%= image_tag(@lecturer.profile_image_url.to_s) if @lecturer.profile_image? %> <%= f.file_field :profile_image, {:accept => 'image/png,image/gif,image/jpeg'} %> <%= f.hidden_field :profile_image_cache %> From 6662cc6b8ed9a1bccbfbf79892f5a5c6b28fd94d Mon Sep 17 00:00:00 2001 From: Mohab Date: Fri, 18 Apr 2014 11:32:50 +0200 Subject: [PATCH 028/938] Placing problems in table --- tutor/app/models/student.rb | 11 +++++++---- tutor/app/views/profile/index.html.erb | 22 +++++++++++++--------- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/tutor/app/models/student.rb b/tutor/app/models/student.rb index 1eda018f..b975ea87 100644 --- a/tutor/app/models/student.rb +++ b/tutor/app/models/student.rb @@ -50,6 +50,12 @@ def get_a_system_suggested_problem return suggestions.to_a().sample() end + #Methods + # [Problem Assined - Story 5.5] + # Returns a Hash containing the next problem to solve in each course - topic - track + # Parameters: None + # Returns: A Hash of key as 'Course-Topic-track' and value as a Problem model instance + # Author: Mohab Ghanim (Modified from Rami Khalil's Story 3.9) def get_next_problems_to_solve next_problems_to_solve = Hash.new @@ -72,10 +78,7 @@ def get_next_problems_to_solve end end end - return next_problems_to_solve end - -end - +end \ No newline at end of file diff --git a/tutor/app/views/profile/index.html.erb b/tutor/app/views/profile/index.html.erb index ed7c92ba..f4a38ffd 100644 --- a/tutor/app/views/profile/index.html.erb +++ b/tutor/app/views/profile/index.html.erb @@ -1,10 +1,14 @@ -<% +<% next_problems_to_solve = current_student.get_next_problems_to_solve - if next_problems_to_solve != nil then - next_problems_to_solve.each do |key , value| - concat key - concat link_to value.title, controller: "problems", action: "show", id: value.id - concat "
    ".html_safe - end - end -%> \ No newline at end of file + if next_problems_to_solve != nil then %> + + + <% next_problems_to_solve.each do |key , value| %> + + + + <% end %> +
    Your Next Problems
    <%= link_to value.title, controller: "problems", action: "show", id: value.id %> + <%= key %> +
    +<% end %> \ No newline at end of file From f14099f589881e9ff6dc5cf05caa7d3952aee782 Mon Sep 17 00:00:00 2001 From: Mohab Date: Fri, 18 Apr 2014 11:43:18 +0200 Subject: [PATCH 029/938] Adding Documentation --- tutor/app/helpers/profile_helper.rb | 2 ++ tutor/app/views/profile/index.html.erb | 7 +++++-- tutor/app/views/site/home.html | 1 + tutor/test/helpers/profile_helper_test.rb | 4 ++++ 4 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 tutor/app/helpers/profile_helper.rb create mode 100644 tutor/app/views/site/home.html create mode 100644 tutor/test/helpers/profile_helper_test.rb diff --git a/tutor/app/helpers/profile_helper.rb b/tutor/app/helpers/profile_helper.rb new file mode 100644 index 00000000..5a0d6b31 --- /dev/null +++ b/tutor/app/helpers/profile_helper.rb @@ -0,0 +1,2 @@ +module ProfileHelper +end diff --git a/tutor/app/views/profile/index.html.erb b/tutor/app/views/profile/index.html.erb index f4a38ffd..4d1224e5 100644 --- a/tutor/app/views/profile/index.html.erb +++ b/tutor/app/views/profile/index.html.erb @@ -1,5 +1,8 @@ -<% - next_problems_to_solve = current_student.get_next_problems_to_solve + +<% next_problems_to_solve = current_student.get_next_problems_to_solve if next_problems_to_solve != nil then %> diff --git a/tutor/app/views/site/home.html b/tutor/app/views/site/home.html new file mode 100644 index 00000000..724f4d4c --- /dev/null +++ b/tutor/app/views/site/home.html @@ -0,0 +1 @@ +html \ No newline at end of file diff --git a/tutor/test/helpers/profile_helper_test.rb b/tutor/test/helpers/profile_helper_test.rb new file mode 100644 index 00000000..c79b5454 --- /dev/null +++ b/tutor/test/helpers/profile_helper_test.rb @@ -0,0 +1,4 @@ +require 'test_helper' + +class ProfileHelperTest < ActionView::TestCase +end From 93f693051ecc79a5e0b7b4250c020414e33b886f Mon Sep 17 00:00:00 2001 From: Mohab Date: Fri, 18 Apr 2014 11:44:49 +0200 Subject: [PATCH 030/938] Adding Documentation --- tutor/app/views/profile/index.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tutor/app/views/profile/index.html.erb b/tutor/app/views/profile/index.html.erb index 4d1224e5..819c0b0f 100644 --- a/tutor/app/views/profile/index.html.erb +++ b/tutor/app/views/profile/index.html.erb @@ -1,5 +1,5 @@ <% next_problems_to_solve = current_student.get_next_problems_to_solve From 529323e90f2015696656753c25f8fc3f737ff2d2 Mon Sep 17 00:00:00 2001 From: Mohab Date: Fri, 18 Apr 2014 11:57:52 +0200 Subject: [PATCH 031/938] Deleting helpers --- tutor/app/helpers/profile_helper.rb | 2 -- tutor/test/helpers/profile_helper_test.rb | 4 ---- 2 files changed, 6 deletions(-) delete mode 100644 tutor/app/helpers/profile_helper.rb delete mode 100644 tutor/test/helpers/profile_helper_test.rb diff --git a/tutor/app/helpers/profile_helper.rb b/tutor/app/helpers/profile_helper.rb deleted file mode 100644 index 5a0d6b31..00000000 --- a/tutor/app/helpers/profile_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module ProfileHelper -end diff --git a/tutor/test/helpers/profile_helper_test.rb b/tutor/test/helpers/profile_helper_test.rb deleted file mode 100644 index c79b5454..00000000 --- a/tutor/test/helpers/profile_helper_test.rb +++ /dev/null @@ -1,4 +0,0 @@ -require 'test_helper' - -class ProfileHelperTest < ActionView::TestCase -end From 3d5ac01fdac58aad498028fb4aa5bc6f58e48706 Mon Sep 17 00:00:00 2001 From: Mohab Date: Fri, 18 Apr 2014 13:06:16 +0200 Subject: [PATCH 032/938] deleting home.html --- tutor/app/models/student.rb | 2 +- tutor/app/views/profile/index.html.erb | 2 +- tutor/app/views/site/home.html | 1 - tutor/config/routes.rb | 1 - 4 files changed, 2 insertions(+), 4 deletions(-) delete mode 100644 tutor/app/views/site/home.html diff --git a/tutor/app/models/student.rb b/tutor/app/models/student.rb index b975ea87..91f51a01 100644 --- a/tutor/app/models/student.rb +++ b/tutor/app/models/student.rb @@ -81,4 +81,4 @@ def get_next_problems_to_solve return next_problems_to_solve end -end \ No newline at end of file +end diff --git a/tutor/app/views/profile/index.html.erb b/tutor/app/views/profile/index.html.erb index 819c0b0f..ba2bf9ed 100644 --- a/tutor/app/views/profile/index.html.erb +++ b/tutor/app/views/profile/index.html.erb @@ -14,4 +14,4 @@ <% end %>
    Your Next Problems
    -<% end %> \ No newline at end of file +<% end %> diff --git a/tutor/app/views/site/home.html b/tutor/app/views/site/home.html deleted file mode 100644 index 724f4d4c..00000000 --- a/tutor/app/views/site/home.html +++ /dev/null @@ -1 +0,0 @@ -html \ No newline at end of file diff --git a/tutor/config/routes.rb b/tutor/config/routes.rb index ece105c4..bfaa7ef2 100644 --- a/tutor/config/routes.rb +++ b/tutor/config/routes.rb @@ -30,7 +30,6 @@ devise_for :teaching_assistants devise_for :students devise_for :lecturers - get 'profile' => 'profile#index' # Example of named route that can be invoked with purchase_url(id: product.id) From b524c85d3ece96e4aaafcaa75a0f960c9e573c98 Mon Sep 17 00:00:00 2001 From: Mohab Date: Fri, 18 Apr 2014 13:45:59 +0200 Subject: [PATCH 033/938] updating routes --- tutor/config/routes.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tutor/config/routes.rb b/tutor/config/routes.rb index bfaa7ef2..b8aeb1c3 100644 --- a/tutor/config/routes.rb +++ b/tutor/config/routes.rb @@ -30,7 +30,8 @@ devise_for :teaching_assistants devise_for :students devise_for :lecturers - get 'profile' => 'profile#index' + + resources :profile # Example of named route that can be invoked with purchase_url(id: product.id) # get 'products/:id/purchase' => 'catalog#purchase', as: :purchase From 7bfb8df882dd6d73dccfd15f6bbca669edc3b266 Mon Sep 17 00:00:00 2001 From: Mohab Date: Fri, 18 Apr 2014 13:56:45 +0200 Subject: [PATCH 034/938] Removing extra spaces --- tutor/app/views/profile/index.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tutor/app/views/profile/index.html.erb b/tutor/app/views/profile/index.html.erb index ba2bf9ed..8e9b588c 100644 --- a/tutor/app/views/profile/index.html.erb +++ b/tutor/app/views/profile/index.html.erb @@ -2,7 +2,7 @@ Displays student's next problem to solve in a table Author: Mohab Ghanim --> -<% next_problems_to_solve = current_student.get_next_problems_to_solve +<% next_problems_to_solve = current_student.get_next_problems_to_solve if next_problems_to_solve != nil then %> @@ -14,4 +14,4 @@ <% end %>
    Your Next Problems
    -<% end %> +<% end %> From f82057f28431c703b9bfc45843323da586037c62 Mon Sep 17 00:00:00 2001 From: Ahmed Moataz Date: Fri, 18 Apr 2014 17:29:37 +0200 Subject: [PATCH 035/938] Adding Compiler model and an elementary compile method --- tutor/app/models/compiler.rb | 16 ++++++++++++++++ tutor/test/fixtures/compilers.yml | 11 +++++++++++ tutor/test/models/compiler_test.rb | 7 +++++++ 3 files changed, 34 insertions(+) create mode 100644 tutor/app/models/compiler.rb create mode 100644 tutor/test/fixtures/compilers.yml create mode 100644 tutor/test/models/compiler_test.rb diff --git a/tutor/app/models/compiler.rb b/tutor/app/models/compiler.rb new file mode 100644 index 00000000..03f948c5 --- /dev/null +++ b/tutor/app/models/compiler.rb @@ -0,0 +1,16 @@ +class Compiler < ActiveRecord::Base + + #Validations + + #Relations + + #Scoops + + #Methods + def compile(student_id, problem_id, code) + #needs a third parameter to make it unique + file_name = 's' + student_id.to_s + 'p' + problem_id.to_s + '.java' + File.open(file_name, 'w') { |file| file.write(code) } + return %x[ #{'javac ' + file_name + ' 2>&1'} ] + end +end diff --git a/tutor/test/fixtures/compilers.yml b/tutor/test/fixtures/compilers.yml new file mode 100644 index 00000000..937a0c00 --- /dev/null +++ b/tutor/test/fixtures/compilers.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +# This model initially had no columns defined. If you add columns to the +# model remove the '{}' from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +one: {} +# column: value +# +two: {} +# column: value diff --git a/tutor/test/models/compiler_test.rb b/tutor/test/models/compiler_test.rb new file mode 100644 index 00000000..314ab853 --- /dev/null +++ b/tutor/test/models/compiler_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class CompilerTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end From 7151ad26e7b62b4a98b1656c1cc8f6bfc98f3ad8 Mon Sep 17 00:00:00 2001 From: Rami Khalil Date: Fri, 18 Apr 2014 18:38:31 +0200 Subject: [PATCH 036/938] Added method stub. Created javascript file for solutions.[B --- tutor/app/assets/javascripts/solutions.js.coffee | 0 tutor/app/models/debugger.rb | 10 ++++++++++ 2 files changed, 10 insertions(+) create mode 100644 tutor/app/assets/javascripts/solutions.js.coffee diff --git a/tutor/app/assets/javascripts/solutions.js.coffee b/tutor/app/assets/javascripts/solutions.js.coffee new file mode 100644 index 00000000..e69de29b diff --git a/tutor/app/models/debugger.rb b/tutor/app/models/debugger.rb index 4c048a77..84032e96 100644 --- a/tutor/app/models/debugger.rb +++ b/tutor/app/models/debugger.rb @@ -8,4 +8,14 @@ class Debugger < ActiveRecord::Base #Methods + # [Execute Line By Line - 3.8] + # Converts the list of execution states to JSON + # Parameters: + # states_table: The hash table containing the states of execution of a program + # Returns: JSON representation of execution table + # Author: Rami Khalil + def execution_states_json(states_table) + + end + end From 5497a23a0724f1bbee3db129945bdb941c2b9272 Mon Sep 17 00:00:00 2001 From: Ahmed Moataz Date: Fri, 18 Apr 2014 18:59:27 +0200 Subject: [PATCH 037/938] Complete compile method and start with compile_feedback method --- tutor/app/models/compiler.rb | 13 +++++++++++-- tutor/db/schema.rb | 7 ++++++- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/tutor/app/models/compiler.rb b/tutor/app/models/compiler.rb index 03f948c5..33d60eec 100644 --- a/tutor/app/models/compiler.rb +++ b/tutor/app/models/compiler.rb @@ -7,10 +7,19 @@ class Compiler < ActiveRecord::Base #Scoops #Methods + def compile(student_id, problem_id, code) #needs a third parameter to make it unique file_name = 's' + student_id.to_s + 'p' + problem_id.to_s + '.java' File.open(file_name, 'w') { |file| file.write(code) } - return %x[ #{'javac ' + file_name + ' 2>&1'} ] + return %x[ #{'javac -g ' + file_name + ' 2>&1'} ] end -end + + def compiler_feedback(student_id, problem_id, code) + feedback = compile(student_id,problem_id, code) + if feeedback == "" + return { success: true } + else + end + +end \ No newline at end of file diff --git a/tutor/db/schema.rb b/tutor/db/schema.rb index 47787fed..0075b713 100644 --- a/tutor/db/schema.rb +++ b/tutor/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20140327152228) do +ActiveRecord::Schema.define(version: 20140418131728) do create_table "admins", force: true do |t| t.string "name" @@ -34,6 +34,11 @@ t.datetime "updated_at" end + create_table "compilers", force: true do |t| + t.datetime "created_at" + t.datetime "updated_at" + end + create_table "courses", force: true do |t| t.string "name" t.string "code" From dcc489c108bc0ea5f650f8fc977c25cb325cd595 Mon Sep 17 00:00:00 2001 From: Khaled Date: Fri, 18 Apr 2014 19:16:27 +0200 Subject: [PATCH 038/938] Issue #216 Finished student registeration --- .../app/controllers/application_controller.rb | 7 +- tutor/app/models/student.rb | 6 ++ .../views/students/registrations/new.html.erb | 64 ++++++++++++++++--- tutor/config/initializers/devise.rb | 2 +- 4 files changed, 65 insertions(+), 14 deletions(-) diff --git a/tutor/app/controllers/application_controller.rb b/tutor/app/controllers/application_controller.rb index 64faa7b5..80f1c87d 100644 --- a/tutor/app/controllers/application_controller.rb +++ b/tutor/app/controllers/application_controller.rb @@ -11,12 +11,13 @@ class ApplicationController < ActionController::Base def update_sanitized_params if "#{resource_name}" == "lecturer" devise_parameter_sanitizer.for(:sign_up) { - |u| u.permit(:name, :email, :password, :password_confirmation, :gender, :dob, :degree, :department, - :profile_image, :profile_image_cache) + |u| u.permit(:name, :email, :password, :password_confirmation, :gender, :dob, :degree, + :department, :profile_image, :profile_image_cache) } elsif "#{resource_name}" == "student" devise_parameter_sanitizer.for(:sign_up) { - |u| u.permit(:name, :email, :password, :password_confirmation) + |u| u.permit(:name, :email, :password, :password_confirmation, :gender, :dob, :faculty, + :major, :semester, :advising, :probation, :profile_image, :profile_image_cache) } elsif "#{resource_name}" == "teaching_assistant" devise_parameter_sanitizer.for(:sign_up) { diff --git a/tutor/app/models/student.rb b/tutor/app/models/student.rb index 7a686980..60cf3697 100644 --- a/tutor/app/models/student.rb +++ b/tutor/app/models/student.rb @@ -4,7 +4,13 @@ class Student < ActiveRecord::Base devise :database_authenticatable, :registerable, :recoverable, :rememberable, :trackable, :validatable + mount_uploader :profile_image, ProfileImageUploader + #Validations + validates :name, presence: true + validates :faculty, presence: true + validates :major, presence: true + validates :semester, presence: true, numericality: {only_integer: true, message: "must be a number."} #Relations has_many :solutions, dependent: :destroy diff --git a/tutor/app/views/students/registrations/new.html.erb b/tutor/app/views/students/registrations/new.html.erb index 1204ea98..dbb6cca2 100644 --- a/tutor/app/views/students/registrations/new.html.erb +++ b/tutor/app/views/students/registrations/new.html.erb @@ -1,18 +1,62 @@

    Sign up

    + <%= form_for(resource, as: resource_name, url: registration_path(resource_name), :html => {:multipart => true}) do |f| %> + <%= devise_error_messages! %> + +
    + <%= f.email_field :email, autofocus: true, class: "form-control", style: "width:300px", placeholder: "Email"%> +
    -<%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %> - <%= devise_error_messages! %> +
    + <%= f.text_field :name, class: "form-control", style: "width:300px", placeholder: "Name"%> +
    -
    <%= f.label :email %>
    - <%= f.email_field :email, autofocus: true %>
    +
    + <%= f.password_field :password, autocomplete: "off", class:"form-control", style:"width:300px", placeholder:"Password"%> +
    -
    <%= f.label :password %>
    - <%= f.password_field :password, autocomplete: "off" %>
    +
    + <%= f.password_field :password_confirmation, autocomplete: "off", class:"form-control", style:"width:300px",placeholder: "Confirm Password" %> +
    -
    <%= f.label :password_confirmation %>
    - <%= f.password_field :password_confirmation, autocomplete: "off" %>
    +
    + <%= f.label :gender %> + <%= f.select(:gender, [['Male', true], ['Female', false]]) %> +
    -
    <%= f.submit "Sign up" %>
    -<% end %> +
    + <%= f.label :date_of_birth %> + <%= f.date_select :dob, {:start_year => Date.today.year-90, :end_year => Date.today.year} %> +
    + +
    + <%= f.text_field :faculty, class: "form-control", style: "width:300px", placeholder: "Faculty"%> +
    + +
    + <%= f.text_field :major, class: "form-control", style: "width:300px", placeholder: "Major"%> +
    + +
    + <%= f.text_field :semester, class: "form-control", style: "width:300px", placeholder: "Semester"%> +
    + +
    + <%= f.label :advising %> + <%= f.select(:advising, [['No', false], ['Yes', true]]) %> + <%= f.label :probation %> + <%= f.select(:probation, [['No', false], ['Yes', true]]) %> +
    + +
    +
    + <%= f.label :profile_image %>
    + <%= image_tag(@student.profile_image_url.to_s) if @student.profile_image? %> + <%= f.file_field :profile_image, {:accept => 'image/png,image/gif,image/jpeg'} %> + <%= f.hidden_field :profile_image_cache %> +
    +
    + +
    <%= f.submit "Sign up", class: "btn btn-success", style: "margin-top:10px" %>
    + <% end %> <%= render "students/shared/links" %> \ No newline at end of file diff --git a/tutor/config/initializers/devise.rb b/tutor/config/initializers/devise.rb index b34152e6..da52f964 100644 --- a/tutor/config/initializers/devise.rb +++ b/tutor/config/initializers/devise.rb @@ -186,7 +186,7 @@ # Time interval you can reset your password with a reset password key. # Don't put a too small interval or your users won't have the time to # change their passwords. - config.reset_password_within = 6.hours + config.reset_password_within = 0 # ==> Configuration for :encryptable # Allow you to use another encryption algorithm besides bcrypt (default). You can use From c2c11de05b4a88afd1d9206fc9efdcda5157fa2d Mon Sep 17 00:00:00 2001 From: Linsara Date: Fri, 18 Apr 2014 19:17:10 +0200 Subject: [PATCH 039/938] Issue#182 removed 'acts_as_list' gem. It caused many errors. --- tutor/Gemfile | 2 +- tutor/Gemfile.lock | 3 --- tutor/app/models/track.rb | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/tutor/Gemfile b/tutor/Gemfile index 97687742..703e1ea5 100644 --- a/tutor/Gemfile +++ b/tutor/Gemfile @@ -53,5 +53,5 @@ gem 'foreman' gem 'composite_primary_keys', '~> 6.0.1' # -gem 'acts_as_list' + diff --git a/tutor/Gemfile.lock b/tutor/Gemfile.lock index b3b19568..fa0d2aac 100644 --- a/tutor/Gemfile.lock +++ b/tutor/Gemfile.lock @@ -25,8 +25,6 @@ GEM multi_json (~> 1.3) thread_safe (~> 0.1) tzinfo (~> 0.3.37) - acts_as_list (0.4.0) - activerecord (>= 3.0) arel (4.0.2) atomic (1.1.16) bcrypt (3.1.7) @@ -133,7 +131,6 @@ PLATFORMS ruby DEPENDENCIES - acts_as_list coffee-rails (~> 4.0.0) composite_primary_keys (~> 6.0.1) devise diff --git a/tutor/app/models/track.rb b/tutor/app/models/track.rb index e947daed..8542e90d 100644 --- a/tutor/app/models/track.rb +++ b/tutor/app/models/track.rb @@ -1,6 +1,6 @@ class Track < ActiveRecord::Base - acts_as_list :scope => :topic + #Validations validates :difficulty, presence: true validates :title , presence: true From df5eda297822a36e8d3f3e1d8331f33bd849b897 Mon Sep 17 00:00:00 2001 From: Mimi Date: Fri, 18 Apr 2014 19:30:19 +0200 Subject: [PATCH 040/938] Adding 3 javascript files for the syntax highlighter --- tutor/app/assets/javascripts/ace.js | 17629 ++++++++++++++++ tutor/app/assets/javascripts/mode-java.js | 1078 + .../app/assets/javascripts/theme-twilight.js | 140 + 3 files changed, 18847 insertions(+) create mode 100644 tutor/app/assets/javascripts/ace.js create mode 100644 tutor/app/assets/javascripts/mode-java.js create mode 100644 tutor/app/assets/javascripts/theme-twilight.js diff --git a/tutor/app/assets/javascripts/ace.js b/tutor/app/assets/javascripts/ace.js new file mode 100644 index 00000000..cc35cfb0 --- /dev/null +++ b/tutor/app/assets/javascripts/ace.js @@ -0,0 +1,17629 @@ +/* ***** BEGIN LICENSE BLOCK ***** + * Distributed under the BSD license: + * + * Copyright (c) 2010, Ajax.org B.V. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of Ajax.org B.V. nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * ***** END LICENSE BLOCK ***** */ + +(function() { + +var ACE_NAMESPACE = "ace"; + +var global = (function() { + return this; +})(); + + +if (!ACE_NAMESPACE && typeof requirejs !== "undefined") + return; + + +var _define = function(module, deps, payload) { + if (typeof module !== 'string') { + if (_define.original) + _define.original.apply(window, arguments); + else { + console.error('dropping module because define wasn\'t a string.'); + console.trace(); + } + return; + } + + if (arguments.length == 2) + payload = deps; + + if (!_define.modules) { + _define.modules = {}; + _define.payloads = {}; + } + + _define.payloads[module] = payload; + _define.modules[module] = null; +}; +var _require = function(parentId, module, callback) { + if (Object.prototype.toString.call(module) === "[object Array]") { + var params = []; + for (var i = 0, l = module.length; i < l; ++i) { + var dep = lookup(parentId, module[i]); + if (!dep && _require.original) + return _require.original.apply(window, arguments); + params.push(dep); + } + if (callback) { + callback.apply(null, params); + } + } + else if (typeof module === 'string') { + var payload = lookup(parentId, module); + if (!payload && _require.original) + return _require.original.apply(window, arguments); + + if (callback) { + callback(); + } + + return payload; + } + else { + if (_require.original) + return _require.original.apply(window, arguments); + } +}; + +var normalizeModule = function(parentId, moduleName) { + if (moduleName.indexOf("!") !== -1) { + var chunks = moduleName.split("!"); + return normalizeModule(parentId, chunks[0]) + "!" + normalizeModule(parentId, chunks[1]); + } + if (moduleName.charAt(0) == ".") { + var base = parentId.split("/").slice(0, -1).join("/"); + moduleName = base + "/" + moduleName; + + while(moduleName.indexOf(".") !== -1 && previous != moduleName) { + var previous = moduleName; + moduleName = moduleName.replace(/\/\.\//, "/").replace(/[^\/]+\/\.\.\//, ""); + } + } + + return moduleName; +}; +var lookup = function(parentId, moduleName) { + + moduleName = normalizeModule(parentId, moduleName); + + var module = _define.modules[moduleName]; + if (!module) { + module = _define.payloads[moduleName]; + if (typeof module === 'function') { + var exports = {}; + var mod = { + id: moduleName, + uri: '', + exports: exports, + packaged: true + }; + + var req = function(module, callback) { + return _require(moduleName, module, callback); + }; + + var returnValue = module(req, exports, mod); + exports = returnValue || mod.exports; + _define.modules[moduleName] = exports; + delete _define.payloads[moduleName]; + } + module = _define.modules[moduleName] = exports || module; + } + return module; +}; + +function exportAce(ns) { + var require = function(module, callback) { + return _require("", module, callback); + }; + + var root = global; + if (ns) { + if (!global[ns]) + global[ns] = {}; + root = global[ns]; + } + + if (!root.define || !root.define.packaged) { + _define.original = root.define; + root.define = _define; + root.define.packaged = true; + } + + if (!root.require || !root.require.packaged) { + _require.original = root.require; + root.require = require; + root.require.packaged = true; + } +} + +exportAce(ACE_NAMESPACE); + +})(); + +ace.define('ace/ace', ['require', 'exports', 'module' , 'ace/lib/fixoldbrowsers', 'ace/lib/dom', 'ace/lib/event', 'ace/editor', 'ace/edit_session', 'ace/undomanager', 'ace/virtual_renderer', 'ace/multi_select', 'ace/worker/worker_client', 'ace/keyboard/hash_handler', 'ace/placeholder', 'ace/mode/folding/fold_mode', 'ace/theme/textmate', 'ace/ext/error_marker', 'ace/config'], function(require, exports, module) { + + +require("./lib/fixoldbrowsers"); + +var dom = require("./lib/dom"); +var event = require("./lib/event"); + +var Editor = require("./editor").Editor; +var EditSession = require("./edit_session").EditSession; +var UndoManager = require("./undomanager").UndoManager; +var Renderer = require("./virtual_renderer").VirtualRenderer; +var MultiSelect = require("./multi_select").MultiSelect; +require("./worker/worker_client"); +require("./keyboard/hash_handler"); +require("./placeholder"); +require("./mode/folding/fold_mode"); +require("./theme/textmate"); +require("./ext/error_marker"); + +exports.config = require("./config"); +exports.require = require; +exports.edit = function(el) { + if (typeof(el) == "string") { + var _id = el; + var el = document.getElementById(_id); + if (!el) + throw new Error("ace.edit can't find div #" + _id); + } + + if (el.env && el.env.editor instanceof Editor) + return el.env.editor; + + var doc = exports.createEditSession(dom.getInnerText(el)); + el.innerHTML = ''; + + var editor = new Editor(new Renderer(el)); + new MultiSelect(editor); + editor.setSession(doc); + + var env = { + document: doc, + editor: editor, + onResize: editor.resize.bind(editor, null) + }; + event.addListener(window, "resize", env.onResize); + editor.on("destroy", function() { + event.removeListener(window, "resize", env.onResize); + }); + el.env = editor.env = env; + return editor; +}; +exports.createEditSession = function(text, mode) { + var doc = new EditSession(text, mode); + doc.setUndoManager(new UndoManager()); + return doc; +} +exports.EditSession = EditSession; +exports.UndoManager = UndoManager; +}); + +ace.define('ace/lib/fixoldbrowsers', ['require', 'exports', 'module' , 'ace/lib/regexp', 'ace/lib/es5-shim'], function(require, exports, module) { + + +require("./regexp"); +require("./es5-shim"); + +}); + +ace.define('ace/lib/regexp', ['require', 'exports', 'module' ], function(require, exports, module) { + + var real = { + exec: RegExp.prototype.exec, + test: RegExp.prototype.test, + match: String.prototype.match, + replace: String.prototype.replace, + split: String.prototype.split + }, + compliantExecNpcg = real.exec.call(/()??/, "")[1] === undefined, // check `exec` handling of nonparticipating capturing groups + compliantLastIndexIncrement = function () { + var x = /^/g; + real.test.call(x, ""); + return !x.lastIndex; + }(); + + if (compliantLastIndexIncrement && compliantExecNpcg) + return; + RegExp.prototype.exec = function (str) { + var match = real.exec.apply(this, arguments), + name, r2; + if ( typeof(str) == 'string' && match) { + if (!compliantExecNpcg && match.length > 1 && indexOf(match, "") > -1) { + r2 = RegExp(this.source, real.replace.call(getNativeFlags(this), "g", "")); + real.replace.call(str.slice(match.index), r2, function () { + for (var i = 1; i < arguments.length - 2; i++) { + if (arguments[i] === undefined) + match[i] = undefined; + } + }); + } + if (this._xregexp && this._xregexp.captureNames) { + for (var i = 1; i < match.length; i++) { + name = this._xregexp.captureNames[i - 1]; + if (name) + match[name] = match[i]; + } + } + if (!compliantLastIndexIncrement && this.global && !match[0].length && (this.lastIndex > match.index)) + this.lastIndex--; + } + return match; + }; + if (!compliantLastIndexIncrement) { + RegExp.prototype.test = function (str) { + var match = real.exec.call(this, str); + if (match && this.global && !match[0].length && (this.lastIndex > match.index)) + this.lastIndex--; + return !!match; + }; + } + + function getNativeFlags (regex) { + return (regex.global ? "g" : "") + + (regex.ignoreCase ? "i" : "") + + (regex.multiline ? "m" : "") + + (regex.extended ? "x" : "") + // Proposed for ES4; included in AS3 + (regex.sticky ? "y" : ""); + } + + function indexOf (array, item, from) { + if (Array.prototype.indexOf) // Use the native array method if available + return array.indexOf(item, from); + for (var i = from || 0; i < array.length; i++) { + if (array[i] === item) + return i; + } + return -1; + } + +}); + +ace.define('ace/lib/es5-shim', ['require', 'exports', 'module' ], function(require, exports, module) { + +function Empty() {} + +if (!Function.prototype.bind) { + Function.prototype.bind = function bind(that) { // .length is 1 + var target = this; + if (typeof target != "function") { + throw new TypeError("Function.prototype.bind called on incompatible " + target); + } + var args = slice.call(arguments, 1); // for normal call + var bound = function () { + + if (this instanceof bound) { + + var result = target.apply( + this, + args.concat(slice.call(arguments)) + ); + if (Object(result) === result) { + return result; + } + return this; + + } else { + return target.apply( + that, + args.concat(slice.call(arguments)) + ); + + } + + }; + if(target.prototype) { + Empty.prototype = target.prototype; + bound.prototype = new Empty(); + Empty.prototype = null; + } + return bound; + }; +} +var call = Function.prototype.call; +var prototypeOfArray = Array.prototype; +var prototypeOfObject = Object.prototype; +var slice = prototypeOfArray.slice; +var _toString = call.bind(prototypeOfObject.toString); +var owns = call.bind(prototypeOfObject.hasOwnProperty); +var defineGetter; +var defineSetter; +var lookupGetter; +var lookupSetter; +var supportsAccessors; +if ((supportsAccessors = owns(prototypeOfObject, "__defineGetter__"))) { + defineGetter = call.bind(prototypeOfObject.__defineGetter__); + defineSetter = call.bind(prototypeOfObject.__defineSetter__); + lookupGetter = call.bind(prototypeOfObject.__lookupGetter__); + lookupSetter = call.bind(prototypeOfObject.__lookupSetter__); +} +if ([1,2].splice(0).length != 2) { + if(function() { // test IE < 9 to splice bug - see issue #138 + function makeArray(l) { + var a = new Array(l+2); + a[0] = a[1] = 0; + return a; + } + var array = [], lengthBefore; + + array.splice.apply(array, makeArray(20)); + array.splice.apply(array, makeArray(26)); + + lengthBefore = array.length; //46 + array.splice(5, 0, "XXX"); // add one element + + lengthBefore + 1 == array.length + + if (lengthBefore + 1 == array.length) { + return true;// has right splice implementation without bugs + } + }()) {//IE 6/7 + var array_splice = Array.prototype.splice; + Array.prototype.splice = function(start, deleteCount) { + if (!arguments.length) { + return []; + } else { + return array_splice.apply(this, [ + start === void 0 ? 0 : start, + deleteCount === void 0 ? (this.length - start) : deleteCount + ].concat(slice.call(arguments, 2))) + } + }; + } else {//IE8 + Array.prototype.splice = function(pos, removeCount){ + var length = this.length; + if (pos > 0) { + if (pos > length) + pos = length; + } else if (pos == void 0) { + pos = 0; + } else if (pos < 0) { + pos = Math.max(length + pos, 0); + } + + if (!(pos+removeCount < length)) + removeCount = length - pos; + + var removed = this.slice(pos, pos+removeCount); + var insert = slice.call(arguments, 2); + var add = insert.length; + if (pos === length) { + if (add) { + this.push.apply(this, insert); + } + } else { + var remove = Math.min(removeCount, length - pos); + var tailOldPos = pos + remove; + var tailNewPos = tailOldPos + add - remove; + var tailCount = length - tailOldPos; + var lengthAfterRemove = length - remove; + + if (tailNewPos < tailOldPos) { // case A + for (var i = 0; i < tailCount; ++i) { + this[tailNewPos+i] = this[tailOldPos+i]; + } + } else if (tailNewPos > tailOldPos) { // case B + for (i = tailCount; i--; ) { + this[tailNewPos+i] = this[tailOldPos+i]; + } + } // else, add == remove (nothing to do) + + if (add && pos === lengthAfterRemove) { + this.length = lengthAfterRemove; // truncate array + this.push.apply(this, insert); + } else { + this.length = lengthAfterRemove + add; // reserves space + for (i = 0; i < add; ++i) { + this[pos+i] = insert[i]; + } + } + } + return removed; + }; + } +} +if (!Array.isArray) { + Array.isArray = function isArray(obj) { + return _toString(obj) == "[object Array]"; + }; +} +var boxedString = Object("a"), + splitString = boxedString[0] != "a" || !(0 in boxedString); + +if (!Array.prototype.forEach) { + Array.prototype.forEach = function forEach(fun /*, thisp*/) { + var object = toObject(this), + self = splitString && _toString(this) == "[object String]" ? + this.split("") : + object, + thisp = arguments[1], + i = -1, + length = self.length >>> 0; + if (_toString(fun) != "[object Function]") { + throw new TypeError(); // TODO message + } + + while (++i < length) { + if (i in self) { + fun.call(thisp, self[i], i, object); + } + } + }; +} +if (!Array.prototype.map) { + Array.prototype.map = function map(fun /*, thisp*/) { + var object = toObject(this), + self = splitString && _toString(this) == "[object String]" ? + this.split("") : + object, + length = self.length >>> 0, + result = Array(length), + thisp = arguments[1]; + if (_toString(fun) != "[object Function]") { + throw new TypeError(fun + " is not a function"); + } + + for (var i = 0; i < length; i++) { + if (i in self) + result[i] = fun.call(thisp, self[i], i, object); + } + return result; + }; +} +if (!Array.prototype.filter) { + Array.prototype.filter = function filter(fun /*, thisp */) { + var object = toObject(this), + self = splitString && _toString(this) == "[object String]" ? + this.split("") : + object, + length = self.length >>> 0, + result = [], + value, + thisp = arguments[1]; + if (_toString(fun) != "[object Function]") { + throw new TypeError(fun + " is not a function"); + } + + for (var i = 0; i < length; i++) { + if (i in self) { + value = self[i]; + if (fun.call(thisp, value, i, object)) { + result.push(value); + } + } + } + return result; + }; +} +if (!Array.prototype.every) { + Array.prototype.every = function every(fun /*, thisp */) { + var object = toObject(this), + self = splitString && _toString(this) == "[object String]" ? + this.split("") : + object, + length = self.length >>> 0, + thisp = arguments[1]; + if (_toString(fun) != "[object Function]") { + throw new TypeError(fun + " is not a function"); + } + + for (var i = 0; i < length; i++) { + if (i in self && !fun.call(thisp, self[i], i, object)) { + return false; + } + } + return true; + }; +} +if (!Array.prototype.some) { + Array.prototype.some = function some(fun /*, thisp */) { + var object = toObject(this), + self = splitString && _toString(this) == "[object String]" ? + this.split("") : + object, + length = self.length >>> 0, + thisp = arguments[1]; + if (_toString(fun) != "[object Function]") { + throw new TypeError(fun + " is not a function"); + } + + for (var i = 0; i < length; i++) { + if (i in self && fun.call(thisp, self[i], i, object)) { + return true; + } + } + return false; + }; +} +if (!Array.prototype.reduce) { + Array.prototype.reduce = function reduce(fun /*, initial*/) { + var object = toObject(this), + self = splitString && _toString(this) == "[object String]" ? + this.split("") : + object, + length = self.length >>> 0; + if (_toString(fun) != "[object Function]") { + throw new TypeError(fun + " is not a function"); + } + if (!length && arguments.length == 1) { + throw new TypeError("reduce of empty array with no initial value"); + } + + var i = 0; + var result; + if (arguments.length >= 2) { + result = arguments[1]; + } else { + do { + if (i in self) { + result = self[i++]; + break; + } + if (++i >= length) { + throw new TypeError("reduce of empty array with no initial value"); + } + } while (true); + } + + for (; i < length; i++) { + if (i in self) { + result = fun.call(void 0, result, self[i], i, object); + } + } + + return result; + }; +} +if (!Array.prototype.reduceRight) { + Array.prototype.reduceRight = function reduceRight(fun /*, initial*/) { + var object = toObject(this), + self = splitString && _toString(this) == "[object String]" ? + this.split("") : + object, + length = self.length >>> 0; + if (_toString(fun) != "[object Function]") { + throw new TypeError(fun + " is not a function"); + } + if (!length && arguments.length == 1) { + throw new TypeError("reduceRight of empty array with no initial value"); + } + + var result, i = length - 1; + if (arguments.length >= 2) { + result = arguments[1]; + } else { + do { + if (i in self) { + result = self[i--]; + break; + } + if (--i < 0) { + throw new TypeError("reduceRight of empty array with no initial value"); + } + } while (true); + } + + do { + if (i in this) { + result = fun.call(void 0, result, self[i], i, object); + } + } while (i--); + + return result; + }; +} +if (!Array.prototype.indexOf || ([0, 1].indexOf(1, 2) != -1)) { + Array.prototype.indexOf = function indexOf(sought /*, fromIndex */ ) { + var self = splitString && _toString(this) == "[object String]" ? + this.split("") : + toObject(this), + length = self.length >>> 0; + + if (!length) { + return -1; + } + + var i = 0; + if (arguments.length > 1) { + i = toInteger(arguments[1]); + } + i = i >= 0 ? i : Math.max(0, length + i); + for (; i < length; i++) { + if (i in self && self[i] === sought) { + return i; + } + } + return -1; + }; +} +if (!Array.prototype.lastIndexOf || ([0, 1].lastIndexOf(0, -3) != -1)) { + Array.prototype.lastIndexOf = function lastIndexOf(sought /*, fromIndex */) { + var self = splitString && _toString(this) == "[object String]" ? + this.split("") : + toObject(this), + length = self.length >>> 0; + + if (!length) { + return -1; + } + var i = length - 1; + if (arguments.length > 1) { + i = Math.min(i, toInteger(arguments[1])); + } + i = i >= 0 ? i : length - Math.abs(i); + for (; i >= 0; i--) { + if (i in self && sought === self[i]) { + return i; + } + } + return -1; + }; +} +if (!Object.getPrototypeOf) { + Object.getPrototypeOf = function getPrototypeOf(object) { + return object.__proto__ || ( + object.constructor ? + object.constructor.prototype : + prototypeOfObject + ); + }; +} +if (!Object.getOwnPropertyDescriptor) { + var ERR_NON_OBJECT = "Object.getOwnPropertyDescriptor called on a " + + "non-object: "; + Object.getOwnPropertyDescriptor = function getOwnPropertyDescriptor(object, property) { + if ((typeof object != "object" && typeof object != "function") || object === null) + throw new TypeError(ERR_NON_OBJECT + object); + if (!owns(object, property)) + return; + + var descriptor, getter, setter; + descriptor = { enumerable: true, configurable: true }; + if (supportsAccessors) { + var prototype = object.__proto__; + object.__proto__ = prototypeOfObject; + + var getter = lookupGetter(object, property); + var setter = lookupSetter(object, property); + object.__proto__ = prototype; + + if (getter || setter) { + if (getter) descriptor.get = getter; + if (setter) descriptor.set = setter; + return descriptor; + } + } + descriptor.value = object[property]; + return descriptor; + }; +} +if (!Object.getOwnPropertyNames) { + Object.getOwnPropertyNames = function getOwnPropertyNames(object) { + return Object.keys(object); + }; +} +if (!Object.create) { + var createEmpty; + if (Object.prototype.__proto__ === null) { + createEmpty = function () { + return { "__proto__": null }; + }; + } else { + createEmpty = function () { + var empty = {}; + for (var i in empty) + empty[i] = null; + empty.constructor = + empty.hasOwnProperty = + empty.propertyIsEnumerable = + empty.isPrototypeOf = + empty.toLocaleString = + empty.toString = + empty.valueOf = + empty.__proto__ = null; + return empty; + } + } + + Object.create = function create(prototype, properties) { + var object; + if (prototype === null) { + object = createEmpty(); + } else { + if (typeof prototype != "object") + throw new TypeError("typeof prototype["+(typeof prototype)+"] != 'object'"); + var Type = function () {}; + Type.prototype = prototype; + object = new Type(); + object.__proto__ = prototype; + } + if (properties !== void 0) + Object.defineProperties(object, properties); + return object; + }; +} + +function doesDefinePropertyWork(object) { + try { + Object.defineProperty(object, "sentinel", {}); + return "sentinel" in object; + } catch (exception) { + } +} +if (Object.defineProperty) { + var definePropertyWorksOnObject = doesDefinePropertyWork({}); + var definePropertyWorksOnDom = typeof document == "undefined" || + doesDefinePropertyWork(document.createElement("div")); + if (!definePropertyWorksOnObject || !definePropertyWorksOnDom) { + var definePropertyFallback = Object.defineProperty; + } +} + +if (!Object.defineProperty || definePropertyFallback) { + var ERR_NON_OBJECT_DESCRIPTOR = "Property description must be an object: "; + var ERR_NON_OBJECT_TARGET = "Object.defineProperty called on non-object: " + var ERR_ACCESSORS_NOT_SUPPORTED = "getters & setters can not be defined " + + "on this javascript engine"; + + Object.defineProperty = function defineProperty(object, property, descriptor) { + if ((typeof object != "object" && typeof object != "function") || object === null) + throw new TypeError(ERR_NON_OBJECT_TARGET + object); + if ((typeof descriptor != "object" && typeof descriptor != "function") || descriptor === null) + throw new TypeError(ERR_NON_OBJECT_DESCRIPTOR + descriptor); + if (definePropertyFallback) { + try { + return definePropertyFallback.call(Object, object, property, descriptor); + } catch (exception) { + } + } + if (owns(descriptor, "value")) { + + if (supportsAccessors && (lookupGetter(object, property) || + lookupSetter(object, property))) + { + var prototype = object.__proto__; + object.__proto__ = prototypeOfObject; + delete object[property]; + object[property] = descriptor.value; + object.__proto__ = prototype; + } else { + object[property] = descriptor.value; + } + } else { + if (!supportsAccessors) + throw new TypeError(ERR_ACCESSORS_NOT_SUPPORTED); + if (owns(descriptor, "get")) + defineGetter(object, property, descriptor.get); + if (owns(descriptor, "set")) + defineSetter(object, property, descriptor.set); + } + + return object; + }; +} +if (!Object.defineProperties) { + Object.defineProperties = function defineProperties(object, properties) { + for (var property in properties) { + if (owns(properties, property)) + Object.defineProperty(object, property, properties[property]); + } + return object; + }; +} +if (!Object.seal) { + Object.seal = function seal(object) { + return object; + }; +} +if (!Object.freeze) { + Object.freeze = function freeze(object) { + return object; + }; +} +try { + Object.freeze(function () {}); +} catch (exception) { + Object.freeze = (function freeze(freezeObject) { + return function freeze(object) { + if (typeof object == "function") { + return object; + } else { + return freezeObject(object); + } + }; + })(Object.freeze); +} +if (!Object.preventExtensions) { + Object.preventExtensions = function preventExtensions(object) { + return object; + }; +} +if (!Object.isSealed) { + Object.isSealed = function isSealed(object) { + return false; + }; +} +if (!Object.isFrozen) { + Object.isFrozen = function isFrozen(object) { + return false; + }; +} +if (!Object.isExtensible) { + Object.isExtensible = function isExtensible(object) { + if (Object(object) === object) { + throw new TypeError(); // TODO message + } + var name = ''; + while (owns(object, name)) { + name += '?'; + } + object[name] = true; + var returnValue = owns(object, name); + delete object[name]; + return returnValue; + }; +} +if (!Object.keys) { + var hasDontEnumBug = true, + dontEnums = [ + "toString", + "toLocaleString", + "valueOf", + "hasOwnProperty", + "isPrototypeOf", + "propertyIsEnumerable", + "constructor" + ], + dontEnumsLength = dontEnums.length; + + for (var key in {"toString": null}) { + hasDontEnumBug = false; + } + + Object.keys = function keys(object) { + + if ( + (typeof object != "object" && typeof object != "function") || + object === null + ) { + throw new TypeError("Object.keys called on a non-object"); + } + + var keys = []; + for (var name in object) { + if (owns(object, name)) { + keys.push(name); + } + } + + if (hasDontEnumBug) { + for (var i = 0, ii = dontEnumsLength; i < ii; i++) { + var dontEnum = dontEnums[i]; + if (owns(object, dontEnum)) { + keys.push(dontEnum); + } + } + } + return keys; + }; + +} +if (!Date.now) { + Date.now = function now() { + return new Date().getTime(); + }; +} +var ws = "\x09\x0A\x0B\x0C\x0D\x20\xA0\u1680\u180E\u2000\u2001\u2002\u2003" + + "\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u202F\u205F\u3000\u2028" + + "\u2029\uFEFF"; +if (!String.prototype.trim || ws.trim()) { + ws = "[" + ws + "]"; + var trimBeginRegexp = new RegExp("^" + ws + ws + "*"), + trimEndRegexp = new RegExp(ws + ws + "*$"); + String.prototype.trim = function trim() { + return String(this).replace(trimBeginRegexp, "").replace(trimEndRegexp, ""); + }; +} + +function toInteger(n) { + n = +n; + if (n !== n) { // isNaN + n = 0; + } else if (n !== 0 && n !== (1/0) && n !== -(1/0)) { + n = (n > 0 || -1) * Math.floor(Math.abs(n)); + } + return n; +} + +function isPrimitive(input) { + var type = typeof input; + return ( + input === null || + type === "undefined" || + type === "boolean" || + type === "number" || + type === "string" + ); +} + +function toPrimitive(input) { + var val, valueOf, toString; + if (isPrimitive(input)) { + return input; + } + valueOf = input.valueOf; + if (typeof valueOf === "function") { + val = valueOf.call(input); + if (isPrimitive(val)) { + return val; + } + } + toString = input.toString; + if (typeof toString === "function") { + val = toString.call(input); + if (isPrimitive(val)) { + return val; + } + } + throw new TypeError(); +} +var toObject = function (o) { + if (o == null) { // this matches both null and undefined + throw new TypeError("can't convert "+o+" to object"); + } + return Object(o); +}; + +}); + +ace.define('ace/lib/dom', ['require', 'exports', 'module' ], function(require, exports, module) { + + +if (typeof document == "undefined") + return; + +var XHTML_NS = "http://www.w3.org/1999/xhtml"; + +exports.getDocumentHead = function(doc) { + if (!doc) + doc = document; + return doc.head || doc.getElementsByTagName("head")[0] || doc.documentElement; +} + +exports.createElement = function(tag, ns) { + return document.createElementNS ? + document.createElementNS(ns || XHTML_NS, tag) : + document.createElement(tag); +}; + +exports.hasCssClass = function(el, name) { + var classes = el.className.split(/\s+/g); + return classes.indexOf(name) !== -1; +}; +exports.addCssClass = function(el, name) { + if (!exports.hasCssClass(el, name)) { + el.className += " " + name; + } +}; +exports.removeCssClass = function(el, name) { + var classes = el.className.split(/\s+/g); + while (true) { + var index = classes.indexOf(name); + if (index == -1) { + break; + } + classes.splice(index, 1); + } + el.className = classes.join(" "); +}; + +exports.toggleCssClass = function(el, name) { + var classes = el.className.split(/\s+/g), add = true; + while (true) { + var index = classes.indexOf(name); + if (index == -1) { + break; + } + add = false; + classes.splice(index, 1); + } + if(add) + classes.push(name); + + el.className = classes.join(" "); + return add; +}; +exports.setCssClass = function(node, className, include) { + if (include) { + exports.addCssClass(node, className); + } else { + exports.removeCssClass(node, className); + } +}; + +exports.hasCssString = function(id, doc) { + var index = 0, sheets; + doc = doc || document; + + if (doc.createStyleSheet && (sheets = doc.styleSheets)) { + while (index < sheets.length) + if (sheets[index++].owningElement.id === id) return true; + } else if ((sheets = doc.getElementsByTagName("style"))) { + while (index < sheets.length) + if (sheets[index++].id === id) return true; + } + + return false; +}; + +exports.importCssString = function importCssString(cssText, id, doc) { + doc = doc || document; + if (id && exports.hasCssString(id, doc)) + return null; + + var style; + + if (doc.createStyleSheet) { + style = doc.createStyleSheet(); + style.cssText = cssText; + if (id) + style.owningElement.id = id; + } else { + style = doc.createElementNS + ? doc.createElementNS(XHTML_NS, "style") + : doc.createElement("style"); + + style.appendChild(doc.createTextNode(cssText)); + if (id) + style.id = id; + + exports.getDocumentHead(doc).appendChild(style); + } +}; + +exports.importCssStylsheet = function(uri, doc) { + if (doc.createStyleSheet) { + doc.createStyleSheet(uri); + } else { + var link = exports.createElement('link'); + link.rel = 'stylesheet'; + link.href = uri; + + exports.getDocumentHead(doc).appendChild(link); + } +}; + +exports.getInnerWidth = function(element) { + return ( + parseInt(exports.computedStyle(element, "paddingLeft"), 10) + + parseInt(exports.computedStyle(element, "paddingRight"), 10) + + element.clientWidth + ); +}; + +exports.getInnerHeight = function(element) { + return ( + parseInt(exports.computedStyle(element, "paddingTop"), 10) + + parseInt(exports.computedStyle(element, "paddingBottom"), 10) + + element.clientHeight + ); +}; + +if (window.pageYOffset !== undefined) { + exports.getPageScrollTop = function() { + return window.pageYOffset; + }; + + exports.getPageScrollLeft = function() { + return window.pageXOffset; + }; +} +else { + exports.getPageScrollTop = function() { + return document.body.scrollTop; + }; + + exports.getPageScrollLeft = function() { + return document.body.scrollLeft; + }; +} + +if (window.getComputedStyle) + exports.computedStyle = function(element, style) { + if (style) + return (window.getComputedStyle(element, "") || {})[style] || ""; + return window.getComputedStyle(element, "") || {}; + }; +else + exports.computedStyle = function(element, style) { + if (style) + return element.currentStyle[style]; + return element.currentStyle; + }; + +exports.scrollbarWidth = function(document) { + var inner = exports.createElement("ace_inner"); + inner.style.width = "100%"; + inner.style.minWidth = "0px"; + inner.style.height = "200px"; + inner.style.display = "block"; + + var outer = exports.createElement("ace_outer"); + var style = outer.style; + + style.position = "absolute"; + style.left = "-10000px"; + style.overflow = "hidden"; + style.width = "200px"; + style.minWidth = "0px"; + style.height = "150px"; + style.display = "block"; + + outer.appendChild(inner); + + var body = document.documentElement; + body.appendChild(outer); + + var noScrollbar = inner.offsetWidth; + + style.overflow = "scroll"; + var withScrollbar = inner.offsetWidth; + + if (noScrollbar == withScrollbar) { + withScrollbar = outer.clientWidth; + } + + body.removeChild(outer); + + return noScrollbar-withScrollbar; +}; +exports.setInnerHtml = function(el, innerHtml) { + var element = el.cloneNode(false);//document.createElement("div"); + element.innerHTML = innerHtml; + el.parentNode.replaceChild(element, el); + return element; +}; + +if ("textContent" in document.documentElement) { + exports.setInnerText = function(el, innerText) { + el.textContent = innerText; + }; + + exports.getInnerText = function(el) { + return el.textContent; + }; +} +else { + exports.setInnerText = function(el, innerText) { + el.innerText = innerText; + }; + + exports.getInnerText = function(el) { + return el.innerText; + }; +} + +exports.getParentWindow = function(document) { + return document.defaultView || document.parentWindow; +}; + +}); + +ace.define('ace/lib/event', ['require', 'exports', 'module' , 'ace/lib/keys', 'ace/lib/useragent'], function(require, exports, module) { + + +var keys = require("./keys"); +var useragent = require("./useragent"); + +exports.addListener = function(elem, type, callback) { + if (elem.addEventListener) { + return elem.addEventListener(type, callback, false); + } + if (elem.attachEvent) { + var wrapper = function() { + callback.call(elem, window.event); + }; + callback._wrapper = wrapper; + elem.attachEvent("on" + type, wrapper); + } +}; + +exports.removeListener = function(elem, type, callback) { + if (elem.removeEventListener) { + return elem.removeEventListener(type, callback, false); + } + if (elem.detachEvent) { + elem.detachEvent("on" + type, callback._wrapper || callback); + } +}; +exports.stopEvent = function(e) { + exports.stopPropagation(e); + exports.preventDefault(e); + return false; +}; + +exports.stopPropagation = function(e) { + if (e.stopPropagation) + e.stopPropagation(); + else + e.cancelBubble = true; +}; + +exports.preventDefault = function(e) { + if (e.preventDefault) + e.preventDefault(); + else + e.returnValue = false; +}; +exports.getButton = function(e) { + if (e.type == "dblclick") + return 0; + if (e.type == "contextmenu" || (e.ctrlKey && useragent.isMac)) + return 2; + if (e.preventDefault) { + return e.button; + } + else { + return {1:0, 2:2, 4:1}[e.button]; + } +}; + +exports.capture = function(el, eventHandler, releaseCaptureHandler) { + function onMouseUp(e) { + eventHandler && eventHandler(e); + releaseCaptureHandler && releaseCaptureHandler(e); + + exports.removeListener(document, "mousemove", eventHandler, true); + exports.removeListener(document, "mouseup", onMouseUp, true); + exports.removeListener(document, "dragstart", onMouseUp, true); + } + + exports.addListener(document, "mousemove", eventHandler, true); + exports.addListener(document, "mouseup", onMouseUp, true); + exports.addListener(document, "dragstart", onMouseUp, true); + + return onMouseUp; +}; + +exports.addMouseWheelListener = function(el, callback) { + if ("onmousewheel" in el) { + exports.addListener(el, "mousewheel", function(e) { + var factor = 8; + if (e.wheelDeltaX !== undefined) { + e.wheelX = -e.wheelDeltaX / factor; + e.wheelY = -e.wheelDeltaY / factor; + } else { + e.wheelX = 0; + e.wheelY = -e.wheelDelta / factor; + } + callback(e); + }); + } else if ("onwheel" in el) { + exports.addListener(el, "wheel", function(e) { + var factor = 0.35; + switch (e.deltaMode) { + case e.DOM_DELTA_PIXEL: + e.wheelX = e.deltaX * factor || 0; + e.wheelY = e.deltaY * factor || 0; + break; + case e.DOM_DELTA_LINE: + case e.DOM_DELTA_PAGE: + e.wheelX = (e.deltaX || 0) * 5; + e.wheelY = (e.deltaY || 0) * 5; + break; + } + + callback(e); + }); + } else { + exports.addListener(el, "DOMMouseScroll", function(e) { + if (e.axis && e.axis == e.HORIZONTAL_AXIS) { + e.wheelX = (e.detail || 0) * 5; + e.wheelY = 0; + } else { + e.wheelX = 0; + e.wheelY = (e.detail || 0) * 5; + } + callback(e); + }); + } +}; + +exports.addMultiMouseDownListener = function(el, timeouts, eventHandler, callbackName) { + var clicks = 0; + var startX, startY, timer; + var eventNames = { + 2: "dblclick", + 3: "tripleclick", + 4: "quadclick" + }; + + exports.addListener(el, "mousedown", function(e) { + if (exports.getButton(e) !== 0) { + clicks = 0; + } else if (e.detail > 1) { + clicks++; + if (clicks > 4) + clicks = 1; + } else { + clicks = 1; + } + if (useragent.isIE) { + var isNewClick = Math.abs(e.clientX - startX) > 5 || Math.abs(e.clientY - startY) > 5; + if (!timer || isNewClick) + clicks = 1; + if (timer) + clearTimeout(timer) + timer = setTimeout(function() {timer = null}, timeouts[clicks - 1] || 600); + + if (clicks == 1) { + startX = e.clientX; + startY = e.clientY; + } + } + + eventHandler[callbackName]("mousedown", e); + + if (clicks > 4) + clicks = 0; + else if (clicks > 1) + return eventHandler[callbackName](eventNames[clicks], e); + }); + + if (useragent.isOldIE) { + exports.addListener(el, "dblclick", function(e) { + clicks = 2; + if (timer) + clearTimeout(timer); + timer = setTimeout(function() {timer = null}, timeouts[clicks - 1] || 600); + eventHandler[callbackName]("mousedown", e); + eventHandler[callbackName](eventNames[clicks], e); + }); + } +}; + +var getModifierHash = useragent.isMac && useragent.isOpera && !("KeyboardEvent" in window) + ? function(e) { + return 0 | (e.metaKey ? 1 : 0) | (e.altKey ? 2 : 0) | (e.shiftKey ? 4 : 0) | (e.ctrlKey ? 8 : 0); + } + : function(e) { + return 0 | (e.ctrlKey ? 1 : 0) | (e.altKey ? 2 : 0) | (e.shiftKey ? 4 : 0) | (e.metaKey ? 8 : 0); + }; + +exports.getModifierString = function(e) { + return keys.KEY_MODS[getModifierHash(e)]; +}; + +function normalizeCommandKeys(callback, e, keyCode) { + var hashId = getModifierHash(e); + + if (!useragent.isMac && pressedKeys) { + if (pressedKeys[91] || pressedKeys[92]) + hashId |= 8; + if (pressedKeys.altGr) { + if ((3 & hashId) != 3) + pressedKeys.altGr = 0; + else + return; + } + if (keyCode === 18 || keyCode === 17) { + var location = e.location || e.keyLocation; + if (keyCode === 17 && location === 1) { + ts = e.timeStamp; + } else if (keyCode === 18 && hashId === 3 && location === 2) { + var dt = -ts; + ts = e.timeStamp; + dt += ts; + if (dt < 3) + pressedKeys.altGr = true; + } + } + } + + if (keyCode in keys.MODIFIER_KEYS) { + switch (keys.MODIFIER_KEYS[keyCode]) { + case "Alt": + hashId = 2; + break; + case "Shift": + hashId = 4; + break; + case "Ctrl": + hashId = 1; + break; + default: + hashId = 8; + break; + } + keyCode = -1; + } + + if (hashId & 8 && (keyCode === 91 || keyCode === 93)) { + keyCode = -1; + } + + if (!hashId && keyCode === 13) { + if (e.location || e.keyLocation === 3) { + callback(e, hashId, -keyCode); + if (e.defaultPrevented) + return; + } + } + if (!hashId && !(keyCode in keys.FUNCTION_KEYS) && !(keyCode in keys.PRINTABLE_KEYS)) { + return false; + } + + return callback(e, hashId, keyCode); +} + +var pressedKeys = null; +var ts = 0; +exports.addCommandKeyListener = function(el, callback) { + var addListener = exports.addListener; + if (useragent.isOldGecko || (useragent.isOpera && !("KeyboardEvent" in window))) { + var lastKeyDownKeyCode = null; + addListener(el, "keydown", function(e) { + lastKeyDownKeyCode = e.keyCode; + }); + addListener(el, "keypress", function(e) { + return normalizeCommandKeys(callback, e, lastKeyDownKeyCode); + }); + } else { + var lastDefaultPrevented = null; + + addListener(el, "keydown", function(e) { + pressedKeys[e.keyCode] = true; + var result = normalizeCommandKeys(callback, e, e.keyCode); + lastDefaultPrevented = e.defaultPrevented; + return result; + }); + + addListener(el, "keypress", function(e) { + if (lastDefaultPrevented && (e.ctrlKey || e.altKey || e.shiftKey || e.metaKey)) { + exports.stopEvent(e); + lastDefaultPrevented = null; + } + }); + + addListener(el, "keyup", function(e) { + pressedKeys[e.keyCode] = null; + }); + + if (!pressedKeys) { + pressedKeys = Object.create(null); + addListener(window, "focus", function(e) { + pressedKeys = Object.create(null); + }); + } + } +}; + +if (window.postMessage && !useragent.isOldIE) { + var postMessageId = 1; + exports.nextTick = function(callback, win) { + win = win || window; + var messageName = "zero-timeout-message-" + postMessageId; + exports.addListener(win, "message", function listener(e) { + if (e.data == messageName) { + exports.stopPropagation(e); + exports.removeListener(win, "message", listener); + callback(); + } + }); + win.postMessage(messageName, "*"); + }; +} + + +exports.nextFrame = window.requestAnimationFrame || + window.mozRequestAnimationFrame || + window.webkitRequestAnimationFrame || + window.msRequestAnimationFrame || + window.oRequestAnimationFrame; + +if (exports.nextFrame) + exports.nextFrame = exports.nextFrame.bind(window); +else + exports.nextFrame = function(callback) { + setTimeout(callback, 17); + }; +}); + +ace.define('ace/lib/keys', ['require', 'exports', 'module' , 'ace/lib/oop'], function(require, exports, module) { + + +var oop = require("./oop"); +var Keys = (function() { + var ret = { + MODIFIER_KEYS: { + 16: 'Shift', 17: 'Ctrl', 18: 'Alt', 224: 'Meta' + }, + + KEY_MODS: { + "ctrl": 1, "alt": 2, "option" : 2, "shift": 4, + "super": 8, "meta": 8, "command": 8, "cmd": 8 + }, + + FUNCTION_KEYS : { + 8 : "Backspace", + 9 : "Tab", + 13 : "Return", + 19 : "Pause", + 27 : "Esc", + 32 : "Space", + 33 : "PageUp", + 34 : "PageDown", + 35 : "End", + 36 : "Home", + 37 : "Left", + 38 : "Up", + 39 : "Right", + 40 : "Down", + 44 : "Print", + 45 : "Insert", + 46 : "Delete", + 96 : "Numpad0", + 97 : "Numpad1", + 98 : "Numpad2", + 99 : "Numpad3", + 100: "Numpad4", + 101: "Numpad5", + 102: "Numpad6", + 103: "Numpad7", + 104: "Numpad8", + 105: "Numpad9", + '-13': "NumpadEnter", + 112: "F1", + 113: "F2", + 114: "F3", + 115: "F4", + 116: "F5", + 117: "F6", + 118: "F7", + 119: "F8", + 120: "F9", + 121: "F10", + 122: "F11", + 123: "F12", + 144: "Numlock", + 145: "Scrolllock" + }, + + PRINTABLE_KEYS: { + 32: ' ', 48: '0', 49: '1', 50: '2', 51: '3', 52: '4', 53: '5', + 54: '6', 55: '7', 56: '8', 57: '9', 59: ';', 61: '=', 65: 'a', + 66: 'b', 67: 'c', 68: 'd', 69: 'e', 70: 'f', 71: 'g', 72: 'h', + 73: 'i', 74: 'j', 75: 'k', 76: 'l', 77: 'm', 78: 'n', 79: 'o', + 80: 'p', 81: 'q', 82: 'r', 83: 's', 84: 't', 85: 'u', 86: 'v', + 87: 'w', 88: 'x', 89: 'y', 90: 'z', 107: '+', 109: '-', 110: '.', + 187: '=', 188: ',', 189: '-', 190: '.', 191: '/', 192: '`', 219: '[', + 220: '\\',221: ']', 222: '\'', + } + }; + var name, i; + for (i in ret.FUNCTION_KEYS) { + name = ret.FUNCTION_KEYS[i].toLowerCase(); + ret[name] = parseInt(i, 10); + } + for (i in ret.PRINTABLE_KEYS) { + name = ret.PRINTABLE_KEYS[i].toLowerCase(); + ret[name] = parseInt(i, 10); + } + oop.mixin(ret, ret.MODIFIER_KEYS); + oop.mixin(ret, ret.PRINTABLE_KEYS); + oop.mixin(ret, ret.FUNCTION_KEYS); + ret.enter = ret["return"]; + ret.escape = ret.esc; + ret.del = ret["delete"]; + ret[173] = '-'; + + (function() { + var mods = ["cmd", "ctrl", "alt", "shift"]; + for (var i = Math.pow(2, mods.length); i--;) { + ret.KEY_MODS[i] = mods.filter(function(x) { + return i & ret.KEY_MODS[x]; + }).join("-") + "-"; + } + })(); + + return ret; +})(); +oop.mixin(exports, Keys); + +exports.keyCodeToString = function(keyCode) { + var keyString = Keys[keyCode]; + if (typeof keyString != "string") + keyString = String.fromCharCode(keyCode); + return keyString.toLowerCase(); +}; + +}); + +ace.define('ace/lib/oop', ['require', 'exports', 'module' ], function(require, exports, module) { + + +exports.inherits = function(ctor, superCtor) { + ctor.super_ = superCtor; + ctor.prototype = Object.create(superCtor.prototype, { + constructor: { + value: ctor, + enumerable: false, + writable: true, + configurable: true + } + }); +}; + +exports.mixin = function(obj, mixin) { + for (var key in mixin) { + obj[key] = mixin[key]; + } + return obj; +}; + +exports.implement = function(proto, mixin) { + exports.mixin(proto, mixin); +}; + +}); + +ace.define('ace/lib/useragent', ['require', 'exports', 'module' ], function(require, exports, module) { +exports.OS = { + LINUX: "LINUX", + MAC: "MAC", + WINDOWS: "WINDOWS" +}; +exports.getOS = function() { + if (exports.isMac) { + return exports.OS.MAC; + } else if (exports.isLinux) { + return exports.OS.LINUX; + } else { + return exports.OS.WINDOWS; + } +}; +if (typeof navigator != "object") + return; + +var os = (navigator.platform.match(/mac|win|linux/i) || ["other"])[0].toLowerCase(); +var ua = navigator.userAgent; +exports.isWin = (os == "win"); +exports.isMac = (os == "mac"); +exports.isLinux = (os == "linux"); +exports.isIE = + (navigator.appName == "Microsoft Internet Explorer" || navigator.appName.indexOf("MSAppHost") >= 0) + ? parseFloat((ua.match(/(?:MSIE |Trident\/[0-9]+[\.0-9]+;.*rv:)([0-9]+[\.0-9]+)/)||[])[1]) + : parseFloat((ua.match(/(?:Trident\/[0-9]+[\.0-9]+;.*rv:)([0-9]+[\.0-9]+)/)||[])[1]); // for ie + +exports.isOldIE = exports.isIE && exports.isIE < 9; +exports.isGecko = exports.isMozilla = window.controllers && window.navigator.product === "Gecko"; +exports.isOldGecko = exports.isGecko && parseInt((ua.match(/rv\:(\d+)/)||[])[1], 10) < 4; +exports.isOpera = window.opera && Object.prototype.toString.call(window.opera) == "[object Opera]"; +exports.isWebKit = parseFloat(ua.split("WebKit/")[1]) || undefined; + +exports.isChrome = parseFloat(ua.split(" Chrome/")[1]) || undefined; + +exports.isAIR = ua.indexOf("AdobeAIR") >= 0; + +exports.isIPad = ua.indexOf("iPad") >= 0; + +exports.isTouchPad = ua.indexOf("TouchPad") >= 0; + +}); + +ace.define('ace/editor', ['require', 'exports', 'module' , 'ace/lib/fixoldbrowsers', 'ace/lib/oop', 'ace/lib/dom', 'ace/lib/lang', 'ace/lib/useragent', 'ace/keyboard/textinput', 'ace/mouse/mouse_handler', 'ace/mouse/fold_handler', 'ace/keyboard/keybinding', 'ace/edit_session', 'ace/search', 'ace/range', 'ace/lib/event_emitter', 'ace/commands/command_manager', 'ace/commands/default_commands', 'ace/config'], function(require, exports, module) { + + +require("./lib/fixoldbrowsers"); + +var oop = require("./lib/oop"); +var dom = require("./lib/dom"); +var lang = require("./lib/lang"); +var useragent = require("./lib/useragent"); +var TextInput = require("./keyboard/textinput").TextInput; +var MouseHandler = require("./mouse/mouse_handler").MouseHandler; +var FoldHandler = require("./mouse/fold_handler").FoldHandler; +var KeyBinding = require("./keyboard/keybinding").KeyBinding; +var EditSession = require("./edit_session").EditSession; +var Search = require("./search").Search; +var Range = require("./range").Range; +var EventEmitter = require("./lib/event_emitter").EventEmitter; +var CommandManager = require("./commands/command_manager").CommandManager; +var defaultCommands = require("./commands/default_commands").commands; +var config = require("./config"); +var Editor = function(renderer, session) { + var container = renderer.getContainerElement(); + this.container = container; + this.renderer = renderer; + + this.commands = new CommandManager(useragent.isMac ? "mac" : "win", defaultCommands); + this.textInput = new TextInput(renderer.getTextAreaContainer(), this); + this.renderer.textarea = this.textInput.getElement(); + this.keyBinding = new KeyBinding(this); + this.$mouseHandler = new MouseHandler(this); + new FoldHandler(this); + + this.$blockScrolling = 0; + this.$search = new Search().set({ + wrap: true + }); + + this.$historyTracker = this.$historyTracker.bind(this); + this.commands.on("exec", this.$historyTracker); + + this.$initOperationListeners(); + + this._$emitInputEvent = lang.delayedCall(function() { + this._signal("input", {}); + this.session.bgTokenizer && this.session.bgTokenizer.scheduleStart(); + }.bind(this)); + + this.on("change", function(_, _self) { + _self._$emitInputEvent.schedule(31); + }); + + this.setSession(session || new EditSession("")); + config.resetOptions(this); + config._signal("editor", this); +}; + +(function(){ + + oop.implement(this, EventEmitter); + + this.$initOperationListeners = function() { + function last(a) {return a[a.length - 1]} + + this.selections = []; + this.commands.on("exec", function(e) { + this.startOperation(e); + + var command = e.command; + if (command.aceCommandGroup == "fileJump") { + var prev = this.prevOp; + if (!prev || prev.command.aceCommandGroup != "fileJump") { + this.lastFileJumpPos = last(this.selections); + } + } else { + this.lastFileJumpPos = null; + } + }.bind(this), true); + + this.commands.on("afterExec", function(e) { + var command = e.command; + + if (command.aceCommandGroup == "fileJump") { + if (this.lastFileJumpPos && !this.curOp.selectionChanged) { + this.selection.fromJSON(this.lastFileJumpPos); + } + } + this.endOperation(e); + }.bind(this), true); + + this.$opResetTimer = lang.delayedCall(this.endOperation.bind(this)); + + this.on("change", function() { + this.curOp || this.startOperation(); + this.curOp.docChanged = true; + }.bind(this), true); + + this.on("changeSelection", function() { + this.curOp || this.startOperation(); + this.curOp.selectionChanged = true; + }.bind(this), true); + }; + + this.curOp = null; + this.prevOp = {}; + this.startOperation = function(commadEvent) { + if (this.curOp) { + if (!commadEvent || this.curOp.command) + return; + this.prevOp = this.curOp; + } + if (!commadEvent) { + this.previousCommand = null; + commadEvent = {}; + } + + this.$opResetTimer.schedule(); + this.curOp = { + command: commadEvent.command || {}, + args: commadEvent.args, + scrollTop: this.renderer.scrollTop + }; + + var command = this.curOp.command; + if (command && command.scrollIntoView) + this.$blockScrolling++; + + this.selections.push(this.selection.toJSON()); + }; + + this.endOperation = function() { + if (this.curOp) { + var command = this.curOp.command; + if (command && command.scrollIntoView) { + this.$blockScrolling--; + switch (command.scrollIntoView) { + case "center": + this.renderer.scrollCursorIntoView(null, 0.5); + break; + case "animate": + case "cursor": + this.renderer.scrollCursorIntoView(); + break; + case "selectionPart": + var range = this.selection.getRange(); + var config = this.renderer.layerConfig; + if (range.start.row >= config.lastRow || range.end.row <= config.firstRow) { + this.renderer.scrollSelectionIntoView(this.selection.anchor, this.selection.lead); + } + break; + default: + break; + } + if (command.scrollIntoView == "animate") + this.renderer.animateScrolling(this.curOp.scrollTop); + } + + this.prevOp = this.curOp; + this.curOp = null; + } + }; + + this.$historyTracker = function(e) { + if (!this.$mergeUndoDeltas) + return; + + + var prev = this.prevOp; + var mergeableCommands = ["backspace", "del", "insertstring"]; + var shouldMerge = prev.command && (e.command.name == prev.command.name); + if (e.command.name == "insertstring") { + var text = e.args; + if (this.mergeNextCommand === undefined) + this.mergeNextCommand = true; + + shouldMerge = shouldMerge + && this.mergeNextCommand // previous command allows to coalesce with + && (!/\s/.test(text) || /\s/.test(prev.args)); // previous insertion was of same type + + this.mergeNextCommand = true; + } else { + shouldMerge = shouldMerge + && mergeableCommands.indexOf(e.command.name) !== -1; // the command is mergeable + } + + if ( + this.$mergeUndoDeltas != "always" + && Date.now() - this.sequenceStartTime > 2000 + ) { + shouldMerge = false; // the sequence is too long + } + + if (shouldMerge) + this.session.mergeUndoDeltas = true; + else if (mergeableCommands.indexOf(e.command.name) !== -1) + this.sequenceStartTime = Date.now(); + }; + this.setKeyboardHandler = function(keyboardHandler) { + if (!keyboardHandler) { + this.keyBinding.setKeyboardHandler(null); + } else if (typeof keyboardHandler === "string") { + this.$keybindingId = keyboardHandler; + var _self = this; + config.loadModule(["keybinding", keyboardHandler], function(module) { + if (_self.$keybindingId == keyboardHandler) + _self.keyBinding.setKeyboardHandler(module && module.handler); + }); + } else { + this.$keybindingId = null; + this.keyBinding.setKeyboardHandler(keyboardHandler); + } + }; + this.getKeyboardHandler = function() { + return this.keyBinding.getKeyboardHandler(); + }; + this.setSession = function(session) { + if (this.session == session) + return; + + var oldSession = this.session; + if (oldSession) { + this.session.removeEventListener("change", this.$onDocumentChange); + this.session.removeEventListener("changeMode", this.$onChangeMode); + this.session.removeEventListener("tokenizerUpdate", this.$onTokenizerUpdate); + this.session.removeEventListener("changeTabSize", this.$onChangeTabSize); + this.session.removeEventListener("changeWrapLimit", this.$onChangeWrapLimit); + this.session.removeEventListener("changeWrapMode", this.$onChangeWrapMode); + this.session.removeEventListener("onChangeFold", this.$onChangeFold); + this.session.removeEventListener("changeFrontMarker", this.$onChangeFrontMarker); + this.session.removeEventListener("changeBackMarker", this.$onChangeBackMarker); + this.session.removeEventListener("changeBreakpoint", this.$onChangeBreakpoint); + this.session.removeEventListener("changeAnnotation", this.$onChangeAnnotation); + this.session.removeEventListener("changeOverwrite", this.$onCursorChange); + this.session.removeEventListener("changeScrollTop", this.$onScrollTopChange); + this.session.removeEventListener("changeScrollLeft", this.$onScrollLeftChange); + + var selection = this.session.getSelection(); + selection.removeEventListener("changeCursor", this.$onCursorChange); + selection.removeEventListener("changeSelection", this.$onSelectionChange); + } + + this.session = session; + if (session) { + this.$onDocumentChange = this.onDocumentChange.bind(this); + session.addEventListener("change", this.$onDocumentChange); + this.renderer.setSession(session); + + this.$onChangeMode = this.onChangeMode.bind(this); + session.addEventListener("changeMode", this.$onChangeMode); + + this.$onTokenizerUpdate = this.onTokenizerUpdate.bind(this); + session.addEventListener("tokenizerUpdate", this.$onTokenizerUpdate); + + this.$onChangeTabSize = this.renderer.onChangeTabSize.bind(this.renderer); + session.addEventListener("changeTabSize", this.$onChangeTabSize); + + this.$onChangeWrapLimit = this.onChangeWrapLimit.bind(this); + session.addEventListener("changeWrapLimit", this.$onChangeWrapLimit); + + this.$onChangeWrapMode = this.onChangeWrapMode.bind(this); + session.addEventListener("changeWrapMode", this.$onChangeWrapMode); + + this.$onChangeFold = this.onChangeFold.bind(this); + session.addEventListener("changeFold", this.$onChangeFold); + + this.$onChangeFrontMarker = this.onChangeFrontMarker.bind(this); + this.session.addEventListener("changeFrontMarker", this.$onChangeFrontMarker); + + this.$onChangeBackMarker = this.onChangeBackMarker.bind(this); + this.session.addEventListener("changeBackMarker", this.$onChangeBackMarker); + + this.$onChangeBreakpoint = this.onChangeBreakpoint.bind(this); + this.session.addEventListener("changeBreakpoint", this.$onChangeBreakpoint); + + this.$onChangeAnnotation = this.onChangeAnnotation.bind(this); + this.session.addEventListener("changeAnnotation", this.$onChangeAnnotation); + + this.$onCursorChange = this.onCursorChange.bind(this); + this.session.addEventListener("changeOverwrite", this.$onCursorChange); + + this.$onScrollTopChange = this.onScrollTopChange.bind(this); + this.session.addEventListener("changeScrollTop", this.$onScrollTopChange); + + this.$onScrollLeftChange = this.onScrollLeftChange.bind(this); + this.session.addEventListener("changeScrollLeft", this.$onScrollLeftChange); + + this.selection = session.getSelection(); + this.selection.addEventListener("changeCursor", this.$onCursorChange); + + this.$onSelectionChange = this.onSelectionChange.bind(this); + this.selection.addEventListener("changeSelection", this.$onSelectionChange); + + this.onChangeMode(); + + this.$blockScrolling += 1; + this.onCursorChange(); + this.$blockScrolling -= 1; + + this.onScrollTopChange(); + this.onScrollLeftChange(); + this.onSelectionChange(); + this.onChangeFrontMarker(); + this.onChangeBackMarker(); + this.onChangeBreakpoint(); + this.onChangeAnnotation(); + this.session.getUseWrapMode() && this.renderer.adjustWrapLimit(); + this.renderer.updateFull(); + } + + this._signal("changeSession", { + session: session, + oldSession: oldSession + }); + + oldSession && oldSession._signal("changeEditor", {oldEditor: this}); + session && session._signal("changeEditor", {editor: this}); + }; + this.getSession = function() { + return this.session; + }; + this.setValue = function(val, cursorPos) { + this.session.doc.setValue(val); + + if (!cursorPos) + this.selectAll(); + else if (cursorPos == 1) + this.navigateFileEnd(); + else if (cursorPos == -1) + this.navigateFileStart(); + + return val; + }; + this.getValue = function() { + return this.session.getValue(); + }; + this.getSelection = function() { + return this.selection; + }; + this.resize = function(force) { + this.renderer.onResize(force); + }; + this.setTheme = function(theme, cb) { + this.renderer.setTheme(theme, cb); + }; + this.getTheme = function() { + return this.renderer.getTheme(); + }; + this.setStyle = function(style) { + this.renderer.setStyle(style); + }; + this.unsetStyle = function(style) { + this.renderer.unsetStyle(style); + }; + this.getFontSize = function () { + return this.getOption("fontSize") || + dom.computedStyle(this.container, "fontSize"); + }; + this.setFontSize = function(size) { + this.setOption("fontSize", size); + }; + + this.$highlightBrackets = function() { + if (this.session.$bracketHighlight) { + this.session.removeMarker(this.session.$bracketHighlight); + this.session.$bracketHighlight = null; + } + + if (this.$highlightPending) { + return; + } + var self = this; + this.$highlightPending = true; + setTimeout(function() { + self.$highlightPending = false; + + var pos = self.session.findMatchingBracket(self.getCursorPosition()); + if (pos) { + var range = new Range(pos.row, pos.column, pos.row, pos.column+1); + } else if (self.session.$mode.getMatching) { + var range = self.session.$mode.getMatching(self.session); + } + if (range) + self.session.$bracketHighlight = self.session.addMarker(range, "ace_bracket", "text"); + }, 50); + }; + this.focus = function() { + var _self = this; + setTimeout(function() { + _self.textInput.focus(); + }); + this.textInput.focus(); + }; + this.isFocused = function() { + return this.textInput.isFocused(); + }; + this.blur = function() { + this.textInput.blur(); + }; + this.onFocus = function() { + if (this.$isFocused) + return; + this.$isFocused = true; + this.renderer.showCursor(); + this.renderer.visualizeFocus(); + this._emit("focus"); + }; + this.onBlur = function() { + if (!this.$isFocused) + return; + this.$isFocused = false; + this.renderer.hideCursor(); + this.renderer.visualizeBlur(); + this._emit("blur"); + }; + + this.$cursorChange = function() { + this.renderer.updateCursor(); + }; + this.onDocumentChange = function(e) { + var delta = e.data; + var range = delta.range; + var lastRow; + + if (range.start.row == range.end.row && delta.action != "insertLines" && delta.action != "removeLines") + lastRow = range.end.row; + else + lastRow = Infinity; + this.renderer.updateLines(range.start.row, lastRow); + + this._signal("change", e); + this.$cursorChange(); + }; + + this.onTokenizerUpdate = function(e) { + var rows = e.data; + this.renderer.updateLines(rows.first, rows.last); + }; + + + this.onScrollTopChange = function() { + this.renderer.scrollToY(this.session.getScrollTop()); + }; + + this.onScrollLeftChange = function() { + this.renderer.scrollToX(this.session.getScrollLeft()); + }; + this.onCursorChange = function() { + this.$cursorChange(); + + if (!this.$blockScrolling) { + this.renderer.scrollCursorIntoView(); + } + + this.$highlightBrackets(); + this.$updateHighlightActiveLine(); + this._signal("changeSelection"); + }; + + this.$updateHighlightActiveLine = function() { + var session = this.getSession(); + + var highlight; + if (this.$highlightActiveLine) { + if ((this.$selectionStyle != "line" || !this.selection.isMultiLine())) + highlight = this.getCursorPosition(); + if (this.renderer.$maxLines && this.session.getLength() === 1 && !(this.renderer.$minLines > 1)) + highlight = false; + } + + if (session.$highlightLineMarker && !highlight) { + session.removeMarker(session.$highlightLineMarker.id); + session.$highlightLineMarker = null; + } else if (!session.$highlightLineMarker && highlight) { + var range = new Range(highlight.row, highlight.column, highlight.row, Infinity); + range.id = session.addMarker(range, "ace_active-line", "screenLine"); + session.$highlightLineMarker = range; + } else if (highlight) { + session.$highlightLineMarker.start.row = highlight.row; + session.$highlightLineMarker.end.row = highlight.row; + session.$highlightLineMarker.start.column = highlight.column; + session._signal("changeBackMarker"); + } + }; + + this.onSelectionChange = function(e) { + var session = this.session; + + if (session.$selectionMarker) { + session.removeMarker(session.$selectionMarker); + } + session.$selectionMarker = null; + + if (!this.selection.isEmpty()) { + var range = this.selection.getRange(); + var style = this.getSelectionStyle(); + session.$selectionMarker = session.addMarker(range, "ace_selection", style); + } else { + this.$updateHighlightActiveLine(); + } + + var re = this.$highlightSelectedWord && this.$getSelectionHighLightRegexp(); + this.session.highlight(re); + + this._signal("changeSelection"); + }; + + this.$getSelectionHighLightRegexp = function() { + var session = this.session; + + var selection = this.getSelectionRange(); + if (selection.isEmpty() || selection.isMultiLine()) + return; + + var startOuter = selection.start.column - 1; + var endOuter = selection.end.column + 1; + var line = session.getLine(selection.start.row); + var lineCols = line.length; + var needle = line.substring(Math.max(startOuter, 0), + Math.min(endOuter, lineCols)); + if ((startOuter >= 0 && /^[\w\d]/.test(needle)) || + (endOuter <= lineCols && /[\w\d]$/.test(needle))) + return; + + needle = line.substring(selection.start.column, selection.end.column); + if (!/^[\w\d]+$/.test(needle)) + return; + + var re = this.$search.$assembleRegExp({ + wholeWord: true, + caseSensitive: true, + needle: needle + }); + + return re; + }; + + + this.onChangeFrontMarker = function() { + this.renderer.updateFrontMarkers(); + }; + + this.onChangeBackMarker = function() { + this.renderer.updateBackMarkers(); + }; + + + this.onChangeBreakpoint = function() { + this.renderer.updateBreakpoints(); + }; + + this.onChangeAnnotation = function() { + this.renderer.setAnnotations(this.session.getAnnotations()); + }; + + + this.onChangeMode = function(e) { + this.renderer.updateText(); + this._emit("changeMode", e); + }; + + + this.onChangeWrapLimit = function() { + this.renderer.updateFull(); + }; + + this.onChangeWrapMode = function() { + this.renderer.onResize(true); + }; + + + this.onChangeFold = function() { + this.$updateHighlightActiveLine(); + this.renderer.updateFull(); + }; + this.getSelectedText = function() { + return this.session.getTextRange(this.getSelectionRange()); + }; + this.getCopyText = function() { + var text = this.getSelectedText(); + this._signal("copy", text); + return text; + }; + this.onCopy = function() { + this.commands.exec("copy", this); + }; + this.onCut = function() { + this.commands.exec("cut", this); + }; + this.onPaste = function(text) { + if (this.$readOnly) + return; + var e = {text: text}; + this._signal("paste", e); + this.insert(e.text, true); + }; + + + this.execCommand = function(command, args) { + this.commands.exec(command, this, args); + }; + this.insert = function(text, pasted) { + var session = this.session; + var mode = session.getMode(); + var cursor = this.getCursorPosition(); + + if (this.getBehavioursEnabled() && !pasted) { + var transform = mode.transformAction(session.getState(cursor.row), 'insertion', this, session, text); + if (transform) { + if (text !== transform.text) { + this.session.mergeUndoDeltas = false; + this.$mergeNextCommand = false; + } + text = transform.text; + + } + } + + if (text == "\t") + text = this.session.getTabString(); + if (!this.selection.isEmpty()) { + var range = this.getSelectionRange(); + cursor = this.session.remove(range); + this.clearSelection(); + } + else if (this.session.getOverwrite()) { + var range = new Range.fromPoints(cursor, cursor); + range.end.column += text.length; + this.session.remove(range); + } + + if (text == "\n" || text == "\r\n") { + var line = session.getLine(cursor.row); + if (cursor.column > line.search(/\S|$/)) { + var d = line.substr(cursor.column).search(/\S|$/); + session.doc.removeInLine(cursor.row, cursor.column, cursor.column + d); + } + } + this.clearSelection(); + + var start = cursor.column; + var lineState = session.getState(cursor.row); + var line = session.getLine(cursor.row); + var shouldOutdent = mode.checkOutdent(lineState, line, text); + var end = session.insert(cursor, text); + + if (transform && transform.selection) { + if (transform.selection.length == 2) { // Transform relative to the current column + this.selection.setSelectionRange( + new Range(cursor.row, start + transform.selection[0], + cursor.row, start + transform.selection[1])); + } else { // Transform relative to the current row. + this.selection.setSelectionRange( + new Range(cursor.row + transform.selection[0], + transform.selection[1], + cursor.row + transform.selection[2], + transform.selection[3])); + } + } + + if (session.getDocument().isNewLine(text)) { + var lineIndent = mode.getNextLineIndent(lineState, line.slice(0, cursor.column), session.getTabString()); + + session.insert({row: cursor.row+1, column: 0}, lineIndent); + } + if (shouldOutdent) + mode.autoOutdent(lineState, session, cursor.row); + }; + + this.onTextInput = function(text) { + this.keyBinding.onTextInput(text); + }; + + this.onCommandKey = function(e, hashId, keyCode) { + this.keyBinding.onCommandKey(e, hashId, keyCode); + }; + this.setOverwrite = function(overwrite) { + this.session.setOverwrite(overwrite); + }; + this.getOverwrite = function() { + return this.session.getOverwrite(); + }; + this.toggleOverwrite = function() { + this.session.toggleOverwrite(); + }; + this.setScrollSpeed = function(speed) { + this.setOption("scrollSpeed", speed); + }; + this.getScrollSpeed = function() { + return this.getOption("scrollSpeed"); + }; + this.setDragDelay = function(dragDelay) { + this.setOption("dragDelay", dragDelay); + }; + this.getDragDelay = function() { + return this.getOption("dragDelay"); + }; + this.setSelectionStyle = function(val) { + this.setOption("selectionStyle", val); + }; + this.getSelectionStyle = function() { + return this.getOption("selectionStyle"); + }; + this.setHighlightActiveLine = function(shouldHighlight) { + this.setOption("highlightActiveLine", shouldHighlight); + }; + this.getHighlightActiveLine = function() { + return this.getOption("highlightActiveLine"); + }; + this.setHighlightGutterLine = function(shouldHighlight) { + this.setOption("highlightGutterLine", shouldHighlight); + }; + + this.getHighlightGutterLine = function() { + return this.getOption("highlightGutterLine"); + }; + this.setHighlightSelectedWord = function(shouldHighlight) { + this.setOption("highlightSelectedWord", shouldHighlight); + }; + this.getHighlightSelectedWord = function() { + return this.$highlightSelectedWord; + }; + + this.setAnimatedScroll = function(shouldAnimate){ + this.renderer.setAnimatedScroll(shouldAnimate); + }; + + this.getAnimatedScroll = function(){ + return this.renderer.getAnimatedScroll(); + }; + this.setShowInvisibles = function(showInvisibles) { + this.renderer.setShowInvisibles(showInvisibles); + }; + this.getShowInvisibles = function() { + return this.renderer.getShowInvisibles(); + }; + + this.setDisplayIndentGuides = function(display) { + this.renderer.setDisplayIndentGuides(display); + }; + + this.getDisplayIndentGuides = function() { + return this.renderer.getDisplayIndentGuides(); + }; + this.setShowPrintMargin = function(showPrintMargin) { + this.renderer.setShowPrintMargin(showPrintMargin); + }; + this.getShowPrintMargin = function() { + return this.renderer.getShowPrintMargin(); + }; + this.setPrintMarginColumn = function(showPrintMargin) { + this.renderer.setPrintMarginColumn(showPrintMargin); + }; + this.getPrintMarginColumn = function() { + return this.renderer.getPrintMarginColumn(); + }; + this.setReadOnly = function(readOnly) { + this.setOption("readOnly", readOnly); + }; + this.getReadOnly = function() { + return this.getOption("readOnly"); + }; + this.setBehavioursEnabled = function (enabled) { + this.setOption("behavioursEnabled", enabled); + }; + this.getBehavioursEnabled = function () { + return this.getOption("behavioursEnabled"); + }; + this.setWrapBehavioursEnabled = function (enabled) { + this.setOption("wrapBehavioursEnabled", enabled); + }; + this.getWrapBehavioursEnabled = function () { + return this.getOption("wrapBehavioursEnabled"); + }; + this.setShowFoldWidgets = function(show) { + this.setOption("showFoldWidgets", show); + + }; + this.getShowFoldWidgets = function() { + return this.getOption("showFoldWidgets"); + }; + + this.setFadeFoldWidgets = function(fade) { + this.setOption("fadeFoldWidgets", fade); + }; + + this.getFadeFoldWidgets = function() { + return this.getOption("fadeFoldWidgets"); + }; + this.remove = function(dir) { + if (this.selection.isEmpty()){ + if (dir == "left") + this.selection.selectLeft(); + else + this.selection.selectRight(); + } + + var range = this.getSelectionRange(); + if (this.getBehavioursEnabled()) { + var session = this.session; + var state = session.getState(range.start.row); + var new_range = session.getMode().transformAction(state, 'deletion', this, session, range); + + if (range.end.column === 0) { + var text = session.getTextRange(range); + if (text[text.length - 1] == "\n") { + var line = session.getLine(range.end.row); + if (/^\s+$/.test(line)) { + range.end.column = line.length; + } + } + } + if (new_range) + range = new_range; + } + + this.session.remove(range); + this.clearSelection(); + }; + this.removeWordRight = function() { + if (this.selection.isEmpty()) + this.selection.selectWordRight(); + + this.session.remove(this.getSelectionRange()); + this.clearSelection(); + }; + this.removeWordLeft = function() { + if (this.selection.isEmpty()) + this.selection.selectWordLeft(); + + this.session.remove(this.getSelectionRange()); + this.clearSelection(); + }; + this.removeToLineStart = function() { + if (this.selection.isEmpty()) + this.selection.selectLineStart(); + + this.session.remove(this.getSelectionRange()); + this.clearSelection(); + }; + this.removeToLineEnd = function() { + if (this.selection.isEmpty()) + this.selection.selectLineEnd(); + + var range = this.getSelectionRange(); + if (range.start.column == range.end.column && range.start.row == range.end.row) { + range.end.column = 0; + range.end.row++; + } + + this.session.remove(range); + this.clearSelection(); + }; + this.splitLine = function() { + if (!this.selection.isEmpty()) { + this.session.remove(this.getSelectionRange()); + this.clearSelection(); + } + + var cursor = this.getCursorPosition(); + this.insert("\n"); + this.moveCursorToPosition(cursor); + }; + this.transposeLetters = function() { + if (!this.selection.isEmpty()) { + return; + } + + var cursor = this.getCursorPosition(); + var column = cursor.column; + if (column === 0) + return; + + var line = this.session.getLine(cursor.row); + var swap, range; + if (column < line.length) { + swap = line.charAt(column) + line.charAt(column-1); + range = new Range(cursor.row, column-1, cursor.row, column+1); + } + else { + swap = line.charAt(column-1) + line.charAt(column-2); + range = new Range(cursor.row, column-2, cursor.row, column); + } + this.session.replace(range, swap); + }; + this.toLowerCase = function() { + var originalRange = this.getSelectionRange(); + if (this.selection.isEmpty()) { + this.selection.selectWord(); + } + + var range = this.getSelectionRange(); + var text = this.session.getTextRange(range); + this.session.replace(range, text.toLowerCase()); + this.selection.setSelectionRange(originalRange); + }; + this.toUpperCase = function() { + var originalRange = this.getSelectionRange(); + if (this.selection.isEmpty()) { + this.selection.selectWord(); + } + + var range = this.getSelectionRange(); + var text = this.session.getTextRange(range); + this.session.replace(range, text.toUpperCase()); + this.selection.setSelectionRange(originalRange); + }; + this.indent = function() { + var session = this.session; + var range = this.getSelectionRange(); + + if (range.start.row < range.end.row) { + var rows = this.$getSelectedRows(); + session.indentRows(rows.first, rows.last, "\t"); + return; + } else if (range.start.column < range.end.column) { + var text = session.getTextRange(range); + if (!/^\s+$/.test(text)) { + var rows = this.$getSelectedRows(); + session.indentRows(rows.first, rows.last, "\t"); + return; + } + } + + var line = session.getLine(range.start.row); + var position = range.start; + var size = session.getTabSize(); + var column = session.documentToScreenColumn(position.row, position.column); + + if (this.session.getUseSoftTabs()) { + var count = (size - column % size); + var indentString = lang.stringRepeat(" ", count); + } else { + var count = column % size; + while (line[range.start.column] == " " && count) { + range.start.column--; + count--; + } + this.selection.setSelectionRange(range); + indentString = "\t"; + } + return this.insert(indentString); + }; + this.blockIndent = function() { + var rows = this.$getSelectedRows(); + this.session.indentRows(rows.first, rows.last, "\t"); + }; + this.blockOutdent = function() { + var selection = this.session.getSelection(); + this.session.outdentRows(selection.getRange()); + }; + this.sortLines = function() { + var rows = this.$getSelectedRows(); + var session = this.session; + + var lines = []; + for (i = rows.first; i <= rows.last; i++) + lines.push(session.getLine(i)); + + lines.sort(function(a, b) { + if (a.toLowerCase() < b.toLowerCase()) return -1; + if (a.toLowerCase() > b.toLowerCase()) return 1; + return 0; + }); + + var deleteRange = new Range(0, 0, 0, 0); + for (var i = rows.first; i <= rows.last; i++) { + var line = session.getLine(i); + deleteRange.start.row = i; + deleteRange.end.row = i; + deleteRange.end.column = line.length; + session.replace(deleteRange, lines[i-rows.first]); + } + }; + this.toggleCommentLines = function() { + var state = this.session.getState(this.getCursorPosition().row); + var rows = this.$getSelectedRows(); + this.session.getMode().toggleCommentLines(state, this.session, rows.first, rows.last); + }; + + this.toggleBlockComment = function() { + var cursor = this.getCursorPosition(); + var state = this.session.getState(cursor.row); + var range = this.getSelectionRange(); + this.session.getMode().toggleBlockComment(state, this.session, range, cursor); + }; + this.getNumberAt = function(row, column) { + var _numberRx = /[\-]?[0-9]+(?:\.[0-9]+)?/g; + _numberRx.lastIndex = 0; + + var s = this.session.getLine(row); + while (_numberRx.lastIndex < column) { + var m = _numberRx.exec(s); + if(m.index <= column && m.index+m[0].length >= column){ + var number = { + value: m[0], + start: m.index, + end: m.index+m[0].length + }; + return number; + } + } + return null; + }; + this.modifyNumber = function(amount) { + var row = this.selection.getCursor().row; + var column = this.selection.getCursor().column; + var charRange = new Range(row, column-1, row, column); + + var c = this.session.getTextRange(charRange); + if (!isNaN(parseFloat(c)) && isFinite(c)) { + var nr = this.getNumberAt(row, column); + if (nr) { + var fp = nr.value.indexOf(".") >= 0 ? nr.start + nr.value.indexOf(".") + 1 : nr.end; + var decimals = nr.start + nr.value.length - fp; + + var t = parseFloat(nr.value); + t *= Math.pow(10, decimals); + + + if(fp !== nr.end && column < fp){ + amount *= Math.pow(10, nr.end - column - 1); + } else { + amount *= Math.pow(10, nr.end - column); + } + + t += amount; + t /= Math.pow(10, decimals); + var nnr = t.toFixed(decimals); + var replaceRange = new Range(row, nr.start, row, nr.end); + this.session.replace(replaceRange, nnr); + this.moveCursorTo(row, Math.max(nr.start +1, column + nnr.length - nr.value.length)); + + } + } + }; + this.removeLines = function() { + var rows = this.$getSelectedRows(); + var range; + if (rows.first === 0 || rows.last+1 < this.session.getLength()) + range = new Range(rows.first, 0, rows.last+1, 0); + else + range = new Range( + rows.first-1, this.session.getLine(rows.first-1).length, + rows.last, this.session.getLine(rows.last).length + ); + this.session.remove(range); + this.clearSelection(); + }; + + this.duplicateSelection = function() { + var sel = this.selection; + var doc = this.session; + var range = sel.getRange(); + var reverse = sel.isBackwards(); + if (range.isEmpty()) { + var row = range.start.row; + doc.duplicateLines(row, row); + } else { + var point = reverse ? range.start : range.end; + var endPoint = doc.insert(point, doc.getTextRange(range), false); + range.start = point; + range.end = endPoint; + + sel.setSelectionRange(range, reverse); + } + }; + this.moveLinesDown = function() { + this.$moveLines(function(firstRow, lastRow) { + return this.session.moveLinesDown(firstRow, lastRow); + }); + }; + this.moveLinesUp = function() { + this.$moveLines(function(firstRow, lastRow) { + return this.session.moveLinesUp(firstRow, lastRow); + }); + }; + this.moveText = function(range, toPosition, copy) { + return this.session.moveText(range, toPosition, copy); + }; + this.copyLinesUp = function() { + this.$moveLines(function(firstRow, lastRow) { + this.session.duplicateLines(firstRow, lastRow); + return 0; + }); + }; + this.copyLinesDown = function() { + this.$moveLines(function(firstRow, lastRow) { + return this.session.duplicateLines(firstRow, lastRow); + }); + }; + this.$moveLines = function(mover) { + var selection = this.selection; + if (!selection.inMultiSelectMode || this.inVirtualSelectionMode) { + var range = selection.toOrientedRange(); + var rows = this.$getSelectedRows(range); + var linesMoved = mover.call(this, rows.first, rows.last); + range.moveBy(linesMoved, 0); + selection.fromOrientedRange(range); + } else { + var ranges = selection.rangeList.ranges; + selection.rangeList.detach(this.session); + + for (var i = ranges.length; i--; ) { + var rangeIndex = i; + var rows = ranges[i].collapseRows(); + var last = rows.end.row; + var first = rows.start.row; + while (i--) { + rows = ranges[i].collapseRows(); + if (first - rows.end.row <= 1) + first = rows.end.row; + else + break; + } + i++; + + var linesMoved = mover.call(this, first, last); + while (rangeIndex >= i) { + ranges[rangeIndex].moveBy(linesMoved, 0); + rangeIndex--; + } + } + selection.fromOrientedRange(selection.ranges[0]); + selection.rangeList.attach(this.session); + } + }; + this.$getSelectedRows = function() { + var range = this.getSelectionRange().collapseRows(); + + return { + first: this.session.getRowFoldStart(range.start.row), + last: this.session.getRowFoldEnd(range.end.row) + }; + }; + + this.onCompositionStart = function(text) { + this.renderer.showComposition(this.getCursorPosition()); + }; + + this.onCompositionUpdate = function(text) { + this.renderer.setCompositionText(text); + }; + + this.onCompositionEnd = function() { + this.renderer.hideComposition(); + }; + this.getFirstVisibleRow = function() { + return this.renderer.getFirstVisibleRow(); + }; + this.getLastVisibleRow = function() { + return this.renderer.getLastVisibleRow(); + }; + this.isRowVisible = function(row) { + return (row >= this.getFirstVisibleRow() && row <= this.getLastVisibleRow()); + }; + this.isRowFullyVisible = function(row) { + return (row >= this.renderer.getFirstFullyVisibleRow() && row <= this.renderer.getLastFullyVisibleRow()); + }; + this.$getVisibleRowCount = function() { + return this.renderer.getScrollBottomRow() - this.renderer.getScrollTopRow() + 1; + }; + + this.$moveByPage = function(dir, select) { + var renderer = this.renderer; + var config = this.renderer.layerConfig; + var rows = dir * Math.floor(config.height / config.lineHeight); + + this.$blockScrolling++; + if (select === true) { + this.selection.$moveSelection(function(){ + this.moveCursorBy(rows, 0); + }); + } else if (select === false) { + this.selection.moveCursorBy(rows, 0); + this.selection.clearSelection(); + } + this.$blockScrolling--; + + var scrollTop = renderer.scrollTop; + + renderer.scrollBy(0, rows * config.lineHeight); + if (select != null) + renderer.scrollCursorIntoView(null, 0.5); + + renderer.animateScrolling(scrollTop); + }; + this.selectPageDown = function() { + this.$moveByPage(1, true); + }; + this.selectPageUp = function() { + this.$moveByPage(-1, true); + }; + this.gotoPageDown = function() { + this.$moveByPage(1, false); + }; + this.gotoPageUp = function() { + this.$moveByPage(-1, false); + }; + this.scrollPageDown = function() { + this.$moveByPage(1); + }; + this.scrollPageUp = function() { + this.$moveByPage(-1); + }; + this.scrollToRow = function(row) { + this.renderer.scrollToRow(row); + }; + this.scrollToLine = function(line, center, animate, callback) { + this.renderer.scrollToLine(line, center, animate, callback); + }; + this.centerSelection = function() { + var range = this.getSelectionRange(); + var pos = { + row: Math.floor(range.start.row + (range.end.row - range.start.row) / 2), + column: Math.floor(range.start.column + (range.end.column - range.start.column) / 2) + }; + this.renderer.alignCursor(pos, 0.5); + }; + this.getCursorPosition = function() { + return this.selection.getCursor(); + }; + this.getCursorPositionScreen = function() { + return this.session.documentToScreenPosition(this.getCursorPosition()); + }; + this.getSelectionRange = function() { + return this.selection.getRange(); + }; + this.selectAll = function() { + this.$blockScrolling += 1; + this.selection.selectAll(); + this.$blockScrolling -= 1; + }; + this.clearSelection = function() { + this.selection.clearSelection(); + }; + this.moveCursorTo = function(row, column) { + this.selection.moveCursorTo(row, column); + }; + this.moveCursorToPosition = function(pos) { + this.selection.moveCursorToPosition(pos); + }; + this.jumpToMatching = function(select) { + var cursor = this.getCursorPosition(); + + var range = this.session.getBracketRange(cursor); + if (!range) { + range = this.find({ + needle: /[{}()\[\]]/g, + preventScroll:true, + start: {row: cursor.row, column: cursor.column - 1} + }); + if (!range) + return; + var pos = range.start; + if (pos.row == cursor.row && Math.abs(pos.column - cursor.column) < 2) + range = this.session.getBracketRange(pos); + } + + pos = range && range.cursor || pos; + if (pos) { + if (select) { + if (range && range.isEqual(this.getSelectionRange())) + this.clearSelection(); + else + this.selection.selectTo(pos.row, pos.column); + } else { + this.selection.moveTo(pos.row, pos.column); + } + } + }; + this.gotoLine = function(lineNumber, column, animate) { + this.selection.clearSelection(); + this.session.unfold({row: lineNumber - 1, column: column || 0}); + + this.$blockScrolling += 1; + this.exitMultiSelectMode && this.exitMultiSelectMode(); + this.moveCursorTo(lineNumber - 1, column || 0); + this.$blockScrolling -= 1; + + if (!this.isRowFullyVisible(lineNumber - 1)) + this.scrollToLine(lineNumber - 1, true, animate); + }; + this.navigateTo = function(row, column) { + this.selection.moveTo(row, column); + }; + this.navigateUp = function(times) { + if (this.selection.isMultiLine() && !this.selection.isBackwards()) { + var selectionStart = this.selection.anchor.getPosition(); + return this.moveCursorToPosition(selectionStart); + } + this.selection.clearSelection(); + this.selection.moveCursorBy(-times || -1, 0); + }; + this.navigateDown = function(times) { + if (this.selection.isMultiLine() && this.selection.isBackwards()) { + var selectionEnd = this.selection.anchor.getPosition(); + return this.moveCursorToPosition(selectionEnd); + } + this.selection.clearSelection(); + this.selection.moveCursorBy(times || 1, 0); + }; + this.navigateLeft = function(times) { + if (!this.selection.isEmpty()) { + var selectionStart = this.getSelectionRange().start; + this.moveCursorToPosition(selectionStart); + } + else { + times = times || 1; + while (times--) { + this.selection.moveCursorLeft(); + } + } + this.clearSelection(); + }; + this.navigateRight = function(times) { + if (!this.selection.isEmpty()) { + var selectionEnd = this.getSelectionRange().end; + this.moveCursorToPosition(selectionEnd); + } + else { + times = times || 1; + while (times--) { + this.selection.moveCursorRight(); + } + } + this.clearSelection(); + }; + this.navigateLineStart = function() { + this.selection.moveCursorLineStart(); + this.clearSelection(); + }; + this.navigateLineEnd = function() { + this.selection.moveCursorLineEnd(); + this.clearSelection(); + }; + this.navigateFileEnd = function() { + this.selection.moveCursorFileEnd(); + this.clearSelection(); + }; + this.navigateFileStart = function() { + this.selection.moveCursorFileStart(); + this.clearSelection(); + }; + this.navigateWordRight = function() { + this.selection.moveCursorWordRight(); + this.clearSelection(); + }; + this.navigateWordLeft = function() { + this.selection.moveCursorWordLeft(); + this.clearSelection(); + }; + this.replace = function(replacement, options) { + if (options) + this.$search.set(options); + + var range = this.$search.find(this.session); + var replaced = 0; + if (!range) + return replaced; + + if (this.$tryReplace(range, replacement)) { + replaced = 1; + } + if (range !== null) { + this.selection.setSelectionRange(range); + this.renderer.scrollSelectionIntoView(range.start, range.end); + } + + return replaced; + }; + this.replaceAll = function(replacement, options) { + if (options) { + this.$search.set(options); + } + + var ranges = this.$search.findAll(this.session); + var replaced = 0; + if (!ranges.length) + return replaced; + + this.$blockScrolling += 1; + + var selection = this.getSelectionRange(); + this.selection.moveTo(0, 0); + + for (var i = ranges.length - 1; i >= 0; --i) { + if(this.$tryReplace(ranges[i], replacement)) { + replaced++; + } + } + + this.selection.setSelectionRange(selection); + this.$blockScrolling -= 1; + + return replaced; + }; + + this.$tryReplace = function(range, replacement) { + var input = this.session.getTextRange(range); + replacement = this.$search.replace(input, replacement); + if (replacement !== null) { + range.end = this.session.replace(range, replacement); + return range; + } else { + return null; + } + }; + this.getLastSearchOptions = function() { + return this.$search.getOptions(); + }; + this.find = function(needle, options, animate) { + if (!options) + options = {}; + + if (typeof needle == "string" || needle instanceof RegExp) + options.needle = needle; + else if (typeof needle == "object") + oop.mixin(options, needle); + + var range = this.selection.getRange(); + if (options.needle == null) { + needle = this.session.getTextRange(range) + || this.$search.$options.needle; + if (!needle) { + range = this.session.getWordRange(range.start.row, range.start.column); + needle = this.session.getTextRange(range); + } + this.$search.set({needle: needle}); + } + + this.$search.set(options); + if (!options.start) + this.$search.set({start: range}); + + var newRange = this.$search.find(this.session); + if (options.preventScroll) + return newRange; + if (newRange) { + this.revealRange(newRange, animate); + return newRange; + } + if (options.backwards) + range.start = range.end; + else + range.end = range.start; + this.selection.setRange(range); + }; + this.findNext = function(options, animate) { + this.find({skipCurrent: true, backwards: false}, options, animate); + }; + this.findPrevious = function(options, animate) { + this.find(options, {skipCurrent: true, backwards: true}, animate); + }; + + this.revealRange = function(range, animate) { + this.$blockScrolling += 1; + this.session.unfold(range); + this.selection.setSelectionRange(range); + this.$blockScrolling -= 1; + + var scrollTop = this.renderer.scrollTop; + this.renderer.scrollSelectionIntoView(range.start, range.end, 0.5); + if (animate !== false) + this.renderer.animateScrolling(scrollTop); + }; + this.undo = function() { + this.$blockScrolling++; + this.session.getUndoManager().undo(); + this.$blockScrolling--; + this.renderer.scrollCursorIntoView(null, 0.5); + }; + this.redo = function() { + this.$blockScrolling++; + this.session.getUndoManager().redo(); + this.$blockScrolling--; + this.renderer.scrollCursorIntoView(null, 0.5); + }; + this.destroy = function() { + this.renderer.destroy(); + this._signal("destroy", this); + }; + this.setAutoScrollEditorIntoView = function(enable) { + if (!enable) + return; + var rect; + var self = this; + var shouldScroll = false; + if (!this.$scrollAnchor) + this.$scrollAnchor = document.createElement("div"); + var scrollAnchor = this.$scrollAnchor; + scrollAnchor.style.cssText = "position:absolute"; + this.container.insertBefore(scrollAnchor, this.container.firstChild); + var onChangeSelection = this.on("changeSelection", function() { + shouldScroll = true; + }); + var onBeforeRender = this.renderer.on("beforeRender", function() { + if (shouldScroll) + rect = self.renderer.container.getBoundingClientRect(); + }); + var onAfterRender = this.renderer.on("afterRender", function() { + if (shouldScroll && rect && self.isFocused()) { + var renderer = self.renderer; + var pos = renderer.$cursorLayer.$pixelPos; + var config = renderer.layerConfig; + var top = pos.top - config.offset; + if (pos.top >= 0 && top + rect.top < 0) { + shouldScroll = true; + } else if (pos.top < config.height && + pos.top + rect.top + config.lineHeight > window.innerHeight) { + shouldScroll = false; + } else { + shouldScroll = null; + } + if (shouldScroll != null) { + scrollAnchor.style.top = top + "px"; + scrollAnchor.style.left = pos.left + "px"; + scrollAnchor.style.height = config.lineHeight + "px"; + scrollAnchor.scrollIntoView(shouldScroll); + } + shouldScroll = rect = null; + } + }); + this.setAutoScrollEditorIntoView = function(enable) { + if (enable) + return; + delete this.setAutoScrollEditorIntoView; + this.removeEventListener("changeSelection", onChangeSelection); + this.renderer.removeEventListener("afterRender", onAfterRender); + this.renderer.removeEventListener("beforeRender", onBeforeRender); + }; + }; + + + this.$resetCursorStyle = function() { + var style = this.$cursorStyle || "ace"; + var cursorLayer = this.renderer.$cursorLayer; + if (!cursorLayer) + return; + cursorLayer.setSmoothBlinking(style == "smooth"); + cursorLayer.isBlinking = !this.$readOnly && style != "wide"; + }; + +}).call(Editor.prototype); + + + +config.defineOptions(Editor.prototype, "editor", { + selectionStyle: { + set: function(style) { + this.onSelectionChange(); + this._signal("changeSelectionStyle", {data: style}); + }, + initialValue: "line" + }, + highlightActiveLine: { + set: function() {this.$updateHighlightActiveLine();}, + initialValue: true + }, + highlightSelectedWord: { + set: function(shouldHighlight) {this.$onSelectionChange();}, + initialValue: true + }, + readOnly: { + set: function(readOnly) { + this.$resetCursorStyle(); + }, + initialValue: false + }, + cursorStyle: { + set: function(val) { this.$resetCursorStyle(); }, + values: ["ace", "slim", "smooth", "wide"], + initialValue: "ace" + }, + mergeUndoDeltas: { + values: [false, true, "always"], + initialValue: true + }, + behavioursEnabled: {initialValue: true}, + wrapBehavioursEnabled: {initialValue: true}, + autoScrollEditorIntoView: { + set: function(val) {this.setAutoScrollEditorIntoView(val)} + }, + + hScrollBarAlwaysVisible: "renderer", + vScrollBarAlwaysVisible: "renderer", + highlightGutterLine: "renderer", + animatedScroll: "renderer", + showInvisibles: "renderer", + showPrintMargin: "renderer", + printMarginColumn: "renderer", + printMargin: "renderer", + fadeFoldWidgets: "renderer", + showFoldWidgets: "renderer", + showLineNumbers: "renderer", + showGutter: "renderer", + displayIndentGuides: "renderer", + fontSize: "renderer", + fontFamily: "renderer", + maxLines: "renderer", + minLines: "renderer", + scrollPastEnd: "renderer", + fixedWidthGutter: "renderer", + theme: "renderer", + + scrollSpeed: "$mouseHandler", + dragDelay: "$mouseHandler", + dragEnabled: "$mouseHandler", + focusTimout: "$mouseHandler", + tooltipFollowsMouse: "$mouseHandler", + + firstLineNumber: "session", + overwrite: "session", + newLineMode: "session", + useWorker: "session", + useSoftTabs: "session", + tabSize: "session", + wrap: "session", + foldStyle: "session", + mode: "session" +}); + +exports.Editor = Editor; +}); + +ace.define('ace/lib/lang', ['require', 'exports', 'module' ], function(require, exports, module) { + + +exports.last = function(a) { + return a[a.length - 1]; +}; + +exports.stringReverse = function(string) { + return string.split("").reverse().join(""); +}; + +exports.stringRepeat = function (string, count) { + var result = ''; + while (count > 0) { + if (count & 1) + result += string; + + if (count >>= 1) + string += string; + } + return result; +}; + +var trimBeginRegexp = /^\s\s*/; +var trimEndRegexp = /\s\s*$/; + +exports.stringTrimLeft = function (string) { + return string.replace(trimBeginRegexp, ''); +}; + +exports.stringTrimRight = function (string) { + return string.replace(trimEndRegexp, ''); +}; + +exports.copyObject = function(obj) { + var copy = {}; + for (var key in obj) { + copy[key] = obj[key]; + } + return copy; +}; + +exports.copyArray = function(array){ + var copy = []; + for (var i=0, l=array.length; i= 0) { + anchor = this.$clickSelection.start; + if (range.start.row != cursor.row || range.start.column != cursor.column) + cursor = range.end; + } else if (cmpStart == -1 && cmpEnd == 1) { + cursor = range.end; + anchor = range.start; + } else { + var orientedRange = calcRangeOrientation(this.$clickSelection, cursor); + cursor = orientedRange.cursor; + anchor = orientedRange.anchor; + } + editor.selection.setSelectionAnchor(anchor.row, anchor.column); + } + editor.selection.selectToPosition(cursor); + + editor.renderer.scrollCursorIntoView(); + }; + + this.selectEnd = + this.selectAllEnd = + this.selectByWordsEnd = + this.selectByLinesEnd = function() { + this.$clickSelection = null; + this.editor.unsetStyle("ace_selecting"); + if (this.editor.renderer.scroller.releaseCapture) { + this.editor.renderer.scroller.releaseCapture(); + } + }; + + this.focusWait = function() { + var distance = calcDistance(this.mousedownEvent.x, this.mousedownEvent.y, this.x, this.y); + var time = Date.now(); + + if (distance > DRAG_OFFSET || time - this.mousedownEvent.time > this.$focusTimout) + this.startSelect(this.mousedownEvent.getDocumentPosition()); + }; + + this.onDoubleClick = function(ev) { + var pos = ev.getDocumentPosition(); + var editor = this.editor; + var session = editor.session; + + var range = session.getBracketRange(pos); + if (range) { + if (range.isEmpty()) { + range.start.column--; + range.end.column++; + } + this.setState("select"); + } else { + range = editor.selection.getWordRange(pos.row, pos.column); + this.setState("selectByWords"); + } + this.$clickSelection = range; + this[this.state] && this[this.state](ev); + }; + + this.onTripleClick = function(ev) { + var pos = ev.getDocumentPosition(); + var editor = this.editor; + + this.setState("selectByLines"); + this.$clickSelection = editor.selection.getLineRange(pos.row); + this[this.state] && this[this.state](ev); + }; + + this.onQuadClick = function(ev) { + var editor = this.editor; + + editor.selectAll(); + this.$clickSelection = editor.getSelectionRange(); + this.setState("selectAll"); + }; + + this.onMouseWheel = function(ev) { + if (ev.getAccelKey()) + return; + if (ev.getShiftKey() && ev.wheelY && !ev.wheelX) { + ev.wheelX = ev.wheelY; + ev.wheelY = 0; + } + + var t = ev.domEvent.timeStamp; + var dt = t - (this.$lastScrollTime||0); + + var editor = this.editor; + var isScrolable = editor.renderer.isScrollableBy(ev.wheelX * ev.speed, ev.wheelY * ev.speed); + if (isScrolable || dt < 200) { + this.$lastScrollTime = t; + editor.renderer.scrollBy(ev.wheelX * ev.speed, ev.wheelY * ev.speed); + return ev.stop(); + } + }; + +}).call(DefaultHandlers.prototype); + +exports.DefaultHandlers = DefaultHandlers; + +function calcDistance(ax, ay, bx, by) { + return Math.sqrt(Math.pow(bx - ax, 2) + Math.pow(by - ay, 2)); +} + +function calcRangeOrientation(range, cursor) { + if (range.start.row == range.end.row) + var cmp = 2 * cursor.column - range.start.column - range.end.column; + else if (range.start.row == range.end.row - 1 && !range.start.column && !range.end.column) + var cmp = cursor.column - 4; + else + var cmp = 2 * cursor.row - range.start.row - range.end.row; + + if (cmp < 0) + return {cursor: range.start, anchor: range.end}; + else + return {cursor: range.end, anchor: range.start}; +} + +}); + +ace.define('ace/mouse/default_gutter_handler', ['require', 'exports', 'module' , 'ace/lib/dom', 'ace/lib/oop', 'ace/lib/event', 'ace/tooltip'], function(require, exports, module) { + +var dom = require("../lib/dom"); +var oop = require("../lib/oop"); +var event = require("../lib/event"); +var Tooltip = require("../tooltip").Tooltip; + +function GutterHandler(mouseHandler) { + var editor = mouseHandler.editor; + var gutter = editor.renderer.$gutterLayer; + var tooltip = new GutterTooltip(editor.container); + + mouseHandler.editor.setDefaultHandler("guttermousedown", function(e) { + if (!editor.isFocused() || e.getButton() != 0) + return; + var gutterRegion = gutter.getRegion(e); + + if (gutterRegion == "foldWidgets") + return; + + var row = e.getDocumentPosition().row; + var selection = editor.session.selection; + + if (e.getShiftKey()) + selection.selectTo(row, 0); + else { + if (e.domEvent.detail == 2) { + editor.selectAll(); + return e.preventDefault(); + } + mouseHandler.$clickSelection = editor.selection.getLineRange(row); + } + mouseHandler.setState("selectByLines"); + mouseHandler.captureMouse(e); + return e.preventDefault(); + }); + + + var tooltipTimeout, mouseEvent, tooltipAnnotation; + + function showTooltip() { + var row = mouseEvent.getDocumentPosition().row; + var annotation = gutter.$annotations[row]; + if (!annotation) + return hideTooltip(); + + var maxRow = editor.session.getLength(); + if (row == maxRow) { + var screenRow = editor.renderer.pixelToScreenCoordinates(0, mouseEvent.y).row; + var pos = mouseEvent.$pos; + if (screenRow > editor.session.documentToScreenRow(pos.row, pos.column)) + return hideTooltip(); + } + + if (tooltipAnnotation == annotation) + return; + tooltipAnnotation = annotation.text.join("
    "); + + tooltip.setHtml(tooltipAnnotation); + tooltip.show(); + editor.on("mousewheel", hideTooltip); + + if (mouseHandler.$tooltipFollowsMouse) { + moveTooltip(mouseEvent); + } else { + var gutterElement = gutter.$cells[editor.session.documentToScreenRow(row, 0)].element; + var rect = gutterElement.getBoundingClientRect(); + var style = tooltip.getElement().style; + style.left = rect.right + "px"; + style.top = rect.bottom + "px"; + } + } + + function hideTooltip() { + if (tooltipTimeout) + tooltipTimeout = clearTimeout(tooltipTimeout); + if (tooltipAnnotation) { + tooltip.hide(); + tooltipAnnotation = null; + editor.removeEventListener("mousewheel", hideTooltip); + } + } + + function moveTooltip(e) { + tooltip.setPosition(e.x, e.y); + } + + mouseHandler.editor.setDefaultHandler("guttermousemove", function(e) { + var target = e.domEvent.target || e.domEvent.srcElement; + if (dom.hasCssClass(target, "ace_fold-widget")) + return hideTooltip(); + + if (tooltipAnnotation && mouseHandler.$tooltipFollowsMouse) + moveTooltip(e); + + mouseEvent = e; + if (tooltipTimeout) + return; + tooltipTimeout = setTimeout(function() { + tooltipTimeout = null; + if (mouseEvent && !mouseHandler.isMousePressed) + showTooltip(); + else + hideTooltip(); + }, 50); + }); + + event.addListener(editor.renderer.$gutter, "mouseout", function(e) { + mouseEvent = null; + if (!tooltipAnnotation || tooltipTimeout) + return; + + tooltipTimeout = setTimeout(function() { + tooltipTimeout = null; + hideTooltip(); + }, 50); + }); + + editor.on("changeSession", hideTooltip); +} + +function GutterTooltip(parentNode) { + Tooltip.call(this, parentNode); +} + +oop.inherits(GutterTooltip, Tooltip); + +(function(){ + this.setPosition = function(x, y) { + var windowWidth = window.innerWidth || document.documentElement.clientWidth; + var windowHeight = window.innerHeight || document.documentElement.clientHeight; + var width = this.getWidth(); + var height = this.getHeight(); + x += 15; + y += 15; + if (x + width > windowWidth) { + x -= (x + width) - windowWidth; + } + if (y + height > windowHeight) { + y -= 20 + height; + } + Tooltip.prototype.setPosition.call(this, x, y); + }; + +}).call(GutterTooltip.prototype); + + + +exports.GutterHandler = GutterHandler; + +}); + +ace.define('ace/tooltip', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/dom'], function(require, exports, module) { + + +var oop = require("./lib/oop"); +var dom = require("./lib/dom"); +function Tooltip (parentNode) { + this.isOpen = false; + this.$element = null; + this.$parentNode = parentNode; +} + +(function() { + this.$init = function() { + this.$element = dom.createElement("div"); + this.$element.className = "ace_tooltip"; + this.$element.style.display = "none"; + this.$parentNode.appendChild(this.$element); + return this.$element; + }; + this.getElement = function() { + return this.$element || this.$init(); + }; + this.setText = function(text) { + dom.setInnerText(this.getElement(), text); + }; + this.setHtml = function(html) { + this.getElement().innerHTML = html; + }; + this.setPosition = function(x, y) { + this.getElement().style.left = x + "px"; + this.getElement().style.top = y + "px"; + }; + this.setClassName = function(className) { + dom.addCssClass(this.getElement(), className); + }; + this.show = function(text, x, y) { + if (text != null) + this.setText(text); + if (x != null && y != null) + this.setPosition(x, y); + if (!this.isOpen) { + this.getElement().style.display = "block"; + this.isOpen = true; + } + }; + + this.hide = function() { + if (this.isOpen) { + this.getElement().style.display = "none"; + this.isOpen = false; + } + }; + this.getHeight = function() { + return this.getElement().offsetHeight; + }; + this.getWidth = function() { + return this.getElement().offsetWidth; + }; + +}).call(Tooltip.prototype); + +exports.Tooltip = Tooltip; +}); + +ace.define('ace/mouse/mouse_event', ['require', 'exports', 'module' , 'ace/lib/event', 'ace/lib/useragent'], function(require, exports, module) { + + +var event = require("../lib/event"); +var useragent = require("../lib/useragent"); +var MouseEvent = exports.MouseEvent = function(domEvent, editor) { + this.domEvent = domEvent; + this.editor = editor; + + this.x = this.clientX = domEvent.clientX; + this.y = this.clientY = domEvent.clientY; + + this.$pos = null; + this.$inSelection = null; + + this.propagationStopped = false; + this.defaultPrevented = false; +}; + +(function() { + + this.stopPropagation = function() { + event.stopPropagation(this.domEvent); + this.propagationStopped = true; + }; + + this.preventDefault = function() { + event.preventDefault(this.domEvent); + this.defaultPrevented = true; + }; + + this.stop = function() { + this.stopPropagation(); + this.preventDefault(); + }; + this.getDocumentPosition = function() { + if (this.$pos) + return this.$pos; + + this.$pos = this.editor.renderer.screenToTextCoordinates(this.clientX, this.clientY); + return this.$pos; + }; + this.inSelection = function() { + if (this.$inSelection !== null) + return this.$inSelection; + + var editor = this.editor; + + + var selectionRange = editor.getSelectionRange(); + if (selectionRange.isEmpty()) + this.$inSelection = false; + else { + var pos = this.getDocumentPosition(); + this.$inSelection = selectionRange.contains(pos.row, pos.column); + } + + return this.$inSelection; + }; + this.getButton = function() { + return event.getButton(this.domEvent); + }; + this.getShiftKey = function() { + return this.domEvent.shiftKey; + }; + + this.getAccelKey = useragent.isMac + ? function() { return this.domEvent.metaKey; } + : function() { return this.domEvent.ctrlKey; }; + +}).call(MouseEvent.prototype); + +}); + +ace.define('ace/mouse/dragdrop_handler', ['require', 'exports', 'module' , 'ace/lib/dom', 'ace/lib/event', 'ace/lib/useragent'], function(require, exports, module) { + + +var dom = require("../lib/dom"); +var event = require("../lib/event"); +var useragent = require("../lib/useragent"); + +var AUTOSCROLL_DELAY = 200; +var SCROLL_CURSOR_DELAY = 200; +var SCROLL_CURSOR_HYSTERESIS = 5; + +function DragdropHandler(mouseHandler) { + + var editor = mouseHandler.editor; + + var blankImage = dom.createElement("img"); + blankImage.src = "data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw=="; + if (useragent.isOpera) + blankImage.style.cssText = "width:1px;height:1px;position:fixed;top:0;left:0;z-index:2147483647;opacity:0;"; + + var exports = ["dragWait", "dragWaitEnd", "startDrag", "dragReadyEnd", "onMouseDrag"]; + + exports.forEach(function(x) { + mouseHandler[x] = this[x]; + }, this); + editor.addEventListener("mousedown", this.onMouseDown.bind(mouseHandler)); + + + var mouseTarget = editor.container; + var dragSelectionMarker, x, y; + var timerId, range; + var dragCursor, counter = 0; + var dragOperation; + var isInternal; + var autoScrollStartTime; + var cursorMovedTime; + var cursorPointOnCaretMoved; + + this.onDragStart = function(e) { + if (this.cancelDrag || !mouseTarget.draggable) { + var self = this; + setTimeout(function(){ + self.startSelect(); + self.captureMouse(e); + }, 0); + return e.preventDefault(); + } + range = editor.getSelectionRange(); + + var dataTransfer = e.dataTransfer; + dataTransfer.effectAllowed = editor.getReadOnly() ? "copy" : "copyMove"; + if (useragent.isOpera) { + editor.container.appendChild(blankImage); + blankImage._top = blankImage.offsetTop; + } + dataTransfer.setDragImage && dataTransfer.setDragImage(blankImage, 0, 0); + if (useragent.isOpera) { + editor.container.removeChild(blankImage); + } + dataTransfer.clearData(); + dataTransfer.setData("Text", editor.session.getTextRange()); + + isInternal = true; + this.setState("drag"); + }; + + this.onDragEnd = function(e) { + mouseTarget.draggable = false; + isInternal = false; + this.setState(null); + if (!editor.getReadOnly()) { + var dropEffect = e.dataTransfer.dropEffect; + if (!dragOperation && dropEffect == "move") + editor.session.remove(editor.getSelectionRange()); + editor.renderer.$cursorLayer.setBlinking(true); + } + this.editor.unsetStyle("ace_dragging"); + }; + + this.onDragEnter = function(e) { + if (editor.getReadOnly() || !canAccept(e.dataTransfer)) + return; + if (!dragSelectionMarker) + addDragMarker(); + counter++; + e.dataTransfer.dropEffect = dragOperation = getDropEffect(e); + return event.preventDefault(e); + }; + + this.onDragOver = function(e) { + if (editor.getReadOnly() || !canAccept(e.dataTransfer)) + return; + if (!dragSelectionMarker) { + addDragMarker(); + counter++; + } + if (onMouseMoveTimer !== null) + onMouseMoveTimer = null; + x = e.clientX; + y = e.clientY; + + e.dataTransfer.dropEffect = dragOperation = getDropEffect(e); + return event.preventDefault(e); + }; + + this.onDragLeave = function(e) { + counter--; + if (counter <= 0 && dragSelectionMarker) { + clearDragMarker(); + dragOperation = null; + return event.preventDefault(e); + } + }; + + this.onDrop = function(e) { + if (!dragSelectionMarker) + return; + var dataTransfer = e.dataTransfer; + if (isInternal) { + switch (dragOperation) { + case "move": + if (range.contains(dragCursor.row, dragCursor.column)) { + range = { + start: dragCursor, + end: dragCursor + }; + } else { + range = editor.moveText(range, dragCursor); + } + break; + case "copy": + range = editor.moveText(range, dragCursor, true); + break; + } + } else { + var dropData = dataTransfer.getData('Text'); + range = { + start: dragCursor, + end: editor.session.insert(dragCursor, dropData) + }; + editor.focus(); + dragOperation = null; + } + clearDragMarker(); + return event.preventDefault(e); + }; + + event.addListener(mouseTarget, "dragstart", this.onDragStart.bind(mouseHandler)); + event.addListener(mouseTarget, "dragend", this.onDragEnd.bind(mouseHandler)); + event.addListener(mouseTarget, "dragenter", this.onDragEnter.bind(mouseHandler)); + event.addListener(mouseTarget, "dragover", this.onDragOver.bind(mouseHandler)); + event.addListener(mouseTarget, "dragleave", this.onDragLeave.bind(mouseHandler)); + event.addListener(mouseTarget, "drop", this.onDrop.bind(mouseHandler)); + + function scrollCursorIntoView(cursor, prevCursor) { + var now = Date.now(); + var vMovement = !prevCursor || cursor.row != prevCursor.row; + var hMovement = !prevCursor || cursor.column != prevCursor.column; + if (!cursorMovedTime || vMovement || hMovement) { + editor.$blockScrolling += 1; + editor.moveCursorToPosition(cursor); + editor.$blockScrolling -= 1; + cursorMovedTime = now; + cursorPointOnCaretMoved = {x: x, y: y}; + } else { + var distance = calcDistance(cursorPointOnCaretMoved.x, cursorPointOnCaretMoved.y, x, y); + if (distance > SCROLL_CURSOR_HYSTERESIS) { + cursorMovedTime = null; + } else if (now - cursorMovedTime >= SCROLL_CURSOR_DELAY) { + editor.renderer.scrollCursorIntoView(); + cursorMovedTime = null; + } + } + } + + function autoScroll(cursor, prevCursor) { + var now = Date.now(); + var lineHeight = editor.renderer.layerConfig.lineHeight; + var characterWidth = editor.renderer.layerConfig.characterWidth; + var editorRect = editor.renderer.scroller.getBoundingClientRect(); + var offsets = { + x: { + left: x - editorRect.left, + right: editorRect.right - x + }, + y: { + top: y - editorRect.top, + bottom: editorRect.bottom - y + } + }; + var nearestXOffset = Math.min(offsets.x.left, offsets.x.right); + var nearestYOffset = Math.min(offsets.y.top, offsets.y.bottom); + var scrollCursor = {row: cursor.row, column: cursor.column}; + if (nearestXOffset / characterWidth <= 2) { + scrollCursor.column += (offsets.x.left < offsets.x.right ? -3 : +2); + } + if (nearestYOffset / lineHeight <= 1) { + scrollCursor.row += (offsets.y.top < offsets.y.bottom ? -1 : +1); + } + var vScroll = cursor.row != scrollCursor.row; + var hScroll = cursor.column != scrollCursor.column; + var vMovement = !prevCursor || cursor.row != prevCursor.row; + if (vScroll || (hScroll && !vMovement)) { + if (!autoScrollStartTime) + autoScrollStartTime = now; + else if (now - autoScrollStartTime >= AUTOSCROLL_DELAY) + editor.renderer.scrollCursorIntoView(scrollCursor); + } else { + autoScrollStartTime = null; + } + } + + function onDragInterval() { + var prevCursor = dragCursor; + dragCursor = editor.renderer.screenToTextCoordinates(x, y); + scrollCursorIntoView(dragCursor, prevCursor); + autoScroll(dragCursor, prevCursor); + } + + function addDragMarker() { + range = editor.selection.toOrientedRange(); + dragSelectionMarker = editor.session.addMarker(range, "ace_selection", editor.getSelectionStyle()); + editor.clearSelection(); + if (editor.isFocused()) + editor.renderer.$cursorLayer.setBlinking(false); + clearInterval(timerId); + timerId = setInterval(onDragInterval, 20); + counter = 0; + event.addListener(document, "mousemove", onMouseMove); + } + + function clearDragMarker() { + clearInterval(timerId); + editor.session.removeMarker(dragSelectionMarker); + dragSelectionMarker = null; + editor.$blockScrolling += 1; + editor.selection.fromOrientedRange(range); + editor.$blockScrolling -= 1; + if (editor.isFocused() && !isInternal) + editor.renderer.$cursorLayer.setBlinking(!editor.getReadOnly()); + range = null; + counter = 0; + autoScrollStartTime = null; + cursorMovedTime = null; + event.removeListener(document, "mousemove", onMouseMove); + } + var onMouseMoveTimer = null; + function onMouseMove() { + if (onMouseMoveTimer == null) { + onMouseMoveTimer = setTimeout(function() { + if (onMouseMoveTimer != null && dragSelectionMarker) + clearDragMarker(); + }, 20); + } + } + + function canAccept(dataTransfer) { + var types = dataTransfer.types; + return !types || Array.prototype.some.call(types, function(type) { + return type == 'text/plain' || type == 'Text'; + }); + } + + function getDropEffect(e) { + var copyAllowed = ['copy', 'copymove', 'all', 'uninitialized']; + var moveAllowed = ['move', 'copymove', 'linkmove', 'all', 'uninitialized']; + + var copyModifierState = useragent.isMac ? e.altKey : e.ctrlKey; + var effectAllowed = "uninitialized"; + try { + effectAllowed = e.dataTransfer.effectAllowed.toLowerCase(); + } catch (e) {} + var dropEffect = "none"; + + if (copyModifierState && copyAllowed.indexOf(effectAllowed) >= 0) + dropEffect = "copy"; + else if (moveAllowed.indexOf(effectAllowed) >= 0) + dropEffect = "move"; + else if (copyAllowed.indexOf(effectAllowed) >= 0) + dropEffect = "copy"; + + return dropEffect; + } +} + +(function() { + + this.dragWait = function() { + var interval = Date.now() - this.mousedownEvent.time; + if (interval > this.editor.getDragDelay()) + this.startDrag(); + }; + + this.dragWaitEnd = function() { + var target = this.editor.container; + target.draggable = false; + this.startSelect(this.mousedownEvent.getDocumentPosition()); + this.selectEnd(); + }; + + this.dragReadyEnd = function(e) { + this.editor.renderer.$cursorLayer.setBlinking(!this.editor.getReadOnly()); + this.editor.unsetStyle("ace_dragging"); + this.dragWaitEnd(); + }; + + this.startDrag = function(){ + this.cancelDrag = false; + var target = this.editor.container; + target.draggable = true; + this.editor.renderer.$cursorLayer.setBlinking(false); + this.editor.setStyle("ace_dragging"); + this.setState("dragReady"); + }; + + this.onMouseDrag = function(e) { + var target = this.editor.container; + if (useragent.isIE && this.state == "dragReady") { + var distance = calcDistance(this.mousedownEvent.x, this.mousedownEvent.y, this.x, this.y); + if (distance > 3) + target.dragDrop(); + } + if (this.state === "dragWait") { + var distance = calcDistance(this.mousedownEvent.x, this.mousedownEvent.y, this.x, this.y); + if (distance > 0) { + target.draggable = false; + this.startSelect(this.mousedownEvent.getDocumentPosition()); + } + } + }; + + this.onMouseDown = function(e) { + if (!this.$dragEnabled) + return; + this.mousedownEvent = e; + var editor = this.editor; + + var inSelection = e.inSelection(); + var button = e.getButton(); + var clickCount = e.domEvent.detail || 1; + if (clickCount === 1 && button === 0 && inSelection) { + if (e.editor.inMultiSelectMode && (e.getAccelKey() || e.getShiftKey())) + return; + this.mousedownEvent.time = Date.now(); + var eventTarget = e.domEvent.target || e.domEvent.srcElement; + if ("unselectable" in eventTarget) + eventTarget.unselectable = "on"; + if (editor.getDragDelay()) { + if (useragent.isWebKit) { + this.cancelDrag = true; + var mouseTarget = editor.container; + mouseTarget.draggable = true; + } + this.setState("dragWait"); + } else { + this.startDrag(); + } + this.captureMouse(e, this.onMouseDrag.bind(this)); + e.defaultPrevented = true; + } + }; + +}).call(DragdropHandler.prototype); + + +function calcDistance(ax, ay, bx, by) { + return Math.sqrt(Math.pow(bx - ax, 2) + Math.pow(by - ay, 2)); +} + +exports.DragdropHandler = DragdropHandler; + +}); + +ace.define('ace/config', ['require', 'exports', 'module' , 'ace/lib/lang', 'ace/lib/oop', 'ace/lib/net', 'ace/lib/event_emitter'], function(require, exports, module) { +"no use strict"; + +var lang = require("./lib/lang"); +var oop = require("./lib/oop"); +var net = require("./lib/net"); +var EventEmitter = require("./lib/event_emitter").EventEmitter; + +var global = (function() { + return this; +})(); + +var options = { + packaged: false, + workerPath: null, + modePath: null, + themePath: null, + basePath: "", + suffix: ".js", + $moduleUrls: {} +}; + +exports.get = function(key) { + if (!options.hasOwnProperty(key)) + throw new Error("Unknown config key: " + key); + + return options[key]; +}; + +exports.set = function(key, value) { + if (!options.hasOwnProperty(key)) + throw new Error("Unknown config key: " + key); + + options[key] = value; +}; + +exports.all = function() { + return lang.copyObject(options); +}; +oop.implement(exports, EventEmitter); + +exports.moduleUrl = function(name, component) { + if (options.$moduleUrls[name]) + return options.$moduleUrls[name]; + + var parts = name.split("/"); + component = component || parts[parts.length - 2] || ""; + var sep = component == "snippets" ? "/" : "-"; + var base = parts[parts.length - 1]; + if (sep == "-") { + var re = new RegExp("^" + component + "[\\-_]|[\\-_]" + component + "$", "g"); + base = base.replace(re, ""); + } + + if ((!base || base == component) && parts.length > 1) + base = parts[parts.length - 2]; + var path = options[component + "Path"]; + if (path == null) { + path = options.basePath; + } else if (sep == "/") { + component = sep = ""; + } + if (path && path.slice(-1) != "/") + path += "/"; + return path + component + sep + base + this.get("suffix"); +}; + +exports.setModuleUrl = function(name, subst) { + return options.$moduleUrls[name] = subst; +}; + +exports.$loading = {}; +exports.loadModule = function(moduleName, onLoad) { + var module, moduleType; + if (Array.isArray(moduleName)) { + moduleType = moduleName[0]; + moduleName = moduleName[1]; + } + + try { + module = require(moduleName); + } catch (e) {} + if (module && !exports.$loading[moduleName]) + return onLoad && onLoad(module); + + if (!exports.$loading[moduleName]) + exports.$loading[moduleName] = []; + + exports.$loading[moduleName].push(onLoad); + + if (exports.$loading[moduleName].length > 1) + return; + + var afterLoad = function() { + require([moduleName], function(module) { + exports._emit("load.module", {name: moduleName, module: module}); + var listeners = exports.$loading[moduleName]; + exports.$loading[moduleName] = null; + listeners.forEach(function(onLoad) { + onLoad && onLoad(module); + }); + }); + }; + + if (!exports.get("packaged")) + return afterLoad(); + net.loadScript(exports.moduleUrl(moduleName, moduleType), afterLoad); +}; +function init(packaged) { + options.packaged = packaged || require.packaged || module.packaged || (global.define && define.packaged); + + if (!global.document) + return ""; + + var scriptOptions = {}; + var scriptUrl = ""; + + var scripts = document.getElementsByTagName("script"); + for (var i=0; i i) { + this.$docRowCache.splice(i, l); + this.$screenRowCache.splice(i, l); + } + }; + + this.$getRowCacheIndex = function(cacheArray, val) { + var low = 0; + var hi = cacheArray.length - 1; + + while (low <= hi) { + var mid = (low + hi) >> 1; + var c = cacheArray[mid]; + + if (val > c) + low = mid + 1; + else if (val < c) + hi = mid - 1; + else + return mid; + } + + return low -1; + }; + + this.resetCaches = function() { + this.$modified = true; + this.$wrapData = []; + this.$rowLengthCache = []; + this.$resetRowCache(0); + if (this.bgTokenizer) + this.bgTokenizer.start(0); + }; + + this.onChangeFold = function(e) { + var fold = e.data; + this.$resetRowCache(fold.start.row); + }; + + this.onChange = function(e) { + var delta = e.data; + this.$modified = true; + + this.$resetRowCache(delta.range.start.row); + + var removedFolds = this.$updateInternalDataOnChange(e); + if (!this.$fromUndo && this.$undoManager && !delta.ignore) { + this.$deltasDoc.push(delta); + if (removedFolds && removedFolds.length != 0) { + this.$deltasFold.push({ + action: "removeFolds", + folds: removedFolds + }); + } + + this.$informUndoManager.schedule(); + } + + this.bgTokenizer.$updateOnChange(delta); + this._signal("change", e); + }; + this.setValue = function(text) { + this.doc.setValue(text); + this.selection.moveTo(0, 0); + + this.$resetRowCache(0); + this.$deltas = []; + this.$deltasDoc = []; + this.$deltasFold = []; + this.setUndoManager(this.$undoManager); + this.getUndoManager().reset(); + }; + this.getValue = + this.toString = function() { + return this.doc.getValue(); + }; + this.getSelection = function() { + return this.selection; + }; + this.getState = function(row) { + return this.bgTokenizer.getState(row); + }; + this.getTokens = function(row) { + return this.bgTokenizer.getTokens(row); + }; + this.getTokenAt = function(row, column) { + var tokens = this.bgTokenizer.getTokens(row); + var token, c = 0; + if (column == null) { + i = tokens.length - 1; + c = this.getLine(row).length; + } else { + for (var i = 0; i < tokens.length; i++) { + c += tokens[i].value.length; + if (c >= column) + break; + } + } + token = tokens[i]; + if (!token) + return null; + token.index = i; + token.start = c - token.value.length; + return token; + }; + this.setUndoManager = function(undoManager) { + this.$undoManager = undoManager; + this.$deltas = []; + this.$deltasDoc = []; + this.$deltasFold = []; + + if (this.$informUndoManager) + this.$informUndoManager.cancel(); + + if (undoManager) { + var self = this; + + this.$syncInformUndoManager = function() { + self.$informUndoManager.cancel(); + + if (self.$deltasFold.length) { + self.$deltas.push({ + group: "fold", + deltas: self.$deltasFold + }); + self.$deltasFold = []; + } + + if (self.$deltasDoc.length) { + self.$deltas.push({ + group: "doc", + deltas: self.$deltasDoc + }); + self.$deltasDoc = []; + } + + if (self.$deltas.length > 0) { + undoManager.execute({ + action: "aceupdate", + args: [self.$deltas, self], + merge: self.mergeUndoDeltas + }); + } + self.mergeUndoDeltas = false; + self.$deltas = []; + }; + this.$informUndoManager = lang.delayedCall(this.$syncInformUndoManager); + } + }; + this.markUndoGroup = function() { + if (this.$syncInformUndoManager) + this.$syncInformUndoManager(); + }; + + this.$defaultUndoManager = { + undo: function() {}, + redo: function() {}, + reset: function() {} + }; + this.getUndoManager = function() { + return this.$undoManager || this.$defaultUndoManager; + }; + this.getTabString = function() { + if (this.getUseSoftTabs()) { + return lang.stringRepeat(" ", this.getTabSize()); + } else { + return "\t"; + } + }; + this.setUseSoftTabs = function(val) { + this.setOption("useSoftTabs", val); + }; + this.getUseSoftTabs = function() { + return this.$useSoftTabs && !this.$mode.$indentWithTabs; + }; + this.setTabSize = function(tabSize) { + this.setOption("tabSize", tabSize); + }; + this.getTabSize = function() { + return this.$tabSize; + }; + this.isTabStop = function(position) { + return this.$useSoftTabs && (position.column % this.$tabSize === 0); + }; + + this.$overwrite = false; + this.setOverwrite = function(overwrite) { + this.setOption("overwrite", overwrite); + }; + this.getOverwrite = function() { + return this.$overwrite; + }; + this.toggleOverwrite = function() { + this.setOverwrite(!this.$overwrite); + }; + this.addGutterDecoration = function(row, className) { + if (!this.$decorations[row]) + this.$decorations[row] = ""; + this.$decorations[row] += " " + className; + this._signal("changeBreakpoint", {}); + }; + this.removeGutterDecoration = function(row, className) { + this.$decorations[row] = (this.$decorations[row] || "").replace(" " + className, ""); + this._signal("changeBreakpoint", {}); + }; + this.getBreakpoints = function() { + return this.$breakpoints; + }; + this.setBreakpoints = function(rows) { + this.$breakpoints = []; + for (var i=0; i 0) + inToken = !!line.charAt(column - 1).match(this.tokenRe); + + if (!inToken) + inToken = !!line.charAt(column).match(this.tokenRe); + + if (inToken) + var re = this.tokenRe; + else if (/^\s+$/.test(line.slice(column-1, column+1))) + var re = /\s/; + else + var re = this.nonTokenRe; + + var start = column; + if (start > 0) { + do { + start--; + } + while (start >= 0 && line.charAt(start).match(re)); + start++; + } + + var end = column; + while (end < line.length && line.charAt(end).match(re)) { + end++; + } + + return new Range(row, start, row, end); + }; + this.getAWordRange = function(row, column) { + var wordRange = this.getWordRange(row, column); + var line = this.getLine(wordRange.end.row); + + while (line.charAt(wordRange.end.column).match(/[ \t]/)) { + wordRange.end.column += 1; + } + return wordRange; + }; + this.setNewLineMode = function(newLineMode) { + this.doc.setNewLineMode(newLineMode); + }; + this.getNewLineMode = function() { + return this.doc.getNewLineMode(); + }; + this.setUseWorker = function(useWorker) { this.setOption("useWorker", useWorker); }; + this.getUseWorker = function() { return this.$useWorker; }; + this.onReloadTokenizer = function(e) { + var rows = e.data; + this.bgTokenizer.start(rows.first); + this._signal("tokenizerUpdate", e); + }; + + this.$modes = {}; + this.$mode = null; + this.$modeId = null; + this.setMode = function(mode, cb) { + if (mode && typeof mode === "object") { + if (mode.getTokenizer) + return this.$onChangeMode(mode); + var options = mode; + var path = options.path; + } else { + path = mode || "ace/mode/text"; + } + if (!this.$modes["ace/mode/text"]) + this.$modes["ace/mode/text"] = new TextMode(); + + if (this.$modes[path] && !options) { + this.$onChangeMode(this.$modes[path]); + cb && cb(); + return; + } + this.$modeId = path; + config.loadModule(["mode", path], function(m) { + if (this.$modeId !== path) + return cb && cb(); + if (this.$modes[path] && !options) + return this.$onChangeMode(this.$modes[path]); + if (m && m.Mode) { + m = new m.Mode(options); + if (!options) { + this.$modes[path] = m; + m.$id = path; + } + this.$onChangeMode(m); + cb && cb(); + } + }.bind(this)); + if (!this.$mode) + this.$onChangeMode(this.$modes["ace/mode/text"], true); + }; + + this.$onChangeMode = function(mode, $isPlaceholder) { + if (!$isPlaceholder) + this.$modeId = mode.$id; + if (this.$mode === mode) + return; + + this.$mode = mode; + + this.$stopWorker(); + + if (this.$useWorker) + this.$startWorker(); + + var tokenizer = mode.getTokenizer(); + + if(tokenizer.addEventListener !== undefined) { + var onReloadTokenizer = this.onReloadTokenizer.bind(this); + tokenizer.addEventListener("update", onReloadTokenizer); + } + + if (!this.bgTokenizer) { + this.bgTokenizer = new BackgroundTokenizer(tokenizer); + var _self = this; + this.bgTokenizer.addEventListener("update", function(e) { + _self._signal("tokenizerUpdate", e); + }); + } else { + this.bgTokenizer.setTokenizer(tokenizer); + } + + this.bgTokenizer.setDocument(this.getDocument()); + + this.tokenRe = mode.tokenRe; + this.nonTokenRe = mode.nonTokenRe; + + + if (!$isPlaceholder) { + this.$options.wrapMethod.set.call(this, this.$wrapMethod); + this.$setFolding(mode.foldingRules); + this.bgTokenizer.start(0); + this._emit("changeMode"); + } + }; + + + this.$stopWorker = function() { + if (this.$worker) + this.$worker.terminate(); + + this.$worker = null; + }; + + this.$startWorker = function() { + if (typeof Worker !== "undefined" && !require.noWorker) { + try { + this.$worker = this.$mode.createWorker(this); + } catch (e) { + console.log("Could not load worker"); + console.log(e); + this.$worker = null; + } + } + else + this.$worker = null; + }; + this.getMode = function() { + return this.$mode; + }; + + this.$scrollTop = 0; + this.setScrollTop = function(scrollTop) { + if (this.$scrollTop === scrollTop || isNaN(scrollTop)) + return; + + this.$scrollTop = scrollTop; + this._signal("changeScrollTop", scrollTop); + }; + this.getScrollTop = function() { + return this.$scrollTop; + }; + + this.$scrollLeft = 0; + this.setScrollLeft = function(scrollLeft) { + if (this.$scrollLeft === scrollLeft || isNaN(scrollLeft)) + return; + + this.$scrollLeft = scrollLeft; + this._signal("changeScrollLeft", scrollLeft); + }; + this.getScrollLeft = function() { + return this.$scrollLeft; + }; + this.getScreenWidth = function() { + this.$computeWidth(); + if (this.lineWidgets) + return Math.max(this.getLineWidgetMaxWidth(), this.screenWidth); + return this.screenWidth; + }; + + this.getLineWidgetMaxWidth = function() { + if (this.lineWidgetsWidth != null) return this.lineWidgetsWidth; + var width = 0; + this.lineWidgets.forEach(function(w) { + if (w && w.screenWidth > width) + width = w.screenWidth; + }); + return this.lineWidgetWidth = width; + }; + + this.$computeWidth = function(force) { + if (this.$modified || force) { + this.$modified = false; + + if (this.$useWrapMode) + return this.screenWidth = this.$wrapLimit; + + var lines = this.doc.getAllLines(); + var cache = this.$rowLengthCache; + var longestScreenLine = 0; + var foldIndex = 0; + var foldLine = this.$foldData[foldIndex]; + var foldStart = foldLine ? foldLine.start.row : Infinity; + var len = lines.length; + + for (var i = 0; i < len; i++) { + if (i > foldStart) { + i = foldLine.end.row + 1; + if (i >= len) + break; + foldLine = this.$foldData[foldIndex++]; + foldStart = foldLine ? foldLine.start.row : Infinity; + } + + if (cache[i] == null) + cache[i] = this.$getStringScreenWidth(lines[i])[0]; + + if (cache[i] > longestScreenLine) + longestScreenLine = cache[i]; + } + this.screenWidth = longestScreenLine; + } + }; + this.getLine = function(row) { + return this.doc.getLine(row); + }; + this.getLines = function(firstRow, lastRow) { + return this.doc.getLines(firstRow, lastRow); + }; + this.getLength = function() { + return this.doc.getLength(); + }; + this.getTextRange = function(range) { + return this.doc.getTextRange(range || this.selection.getRange()); + }; + this.insert = function(position, text) { + return this.doc.insert(position, text); + }; + this.remove = function(range) { + return this.doc.remove(range); + }; + this.undoChanges = function(deltas, dontSelect) { + if (!deltas.length) + return; + + this.$fromUndo = true; + var lastUndoRange = null; + for (var i = deltas.length - 1; i != -1; i--) { + var delta = deltas[i]; + if (delta.group == "doc") { + this.doc.revertDeltas(delta.deltas); + lastUndoRange = + this.$getUndoSelection(delta.deltas, true, lastUndoRange); + } else { + delta.deltas.forEach(function(foldDelta) { + this.addFolds(foldDelta.folds); + }, this); + } + } + this.$fromUndo = false; + lastUndoRange && + this.$undoSelect && + !dontSelect && + this.selection.setSelectionRange(lastUndoRange); + return lastUndoRange; + }; + this.redoChanges = function(deltas, dontSelect) { + if (!deltas.length) + return; + + this.$fromUndo = true; + var lastUndoRange = null; + for (var i = 0; i < deltas.length; i++) { + var delta = deltas[i]; + if (delta.group == "doc") { + this.doc.applyDeltas(delta.deltas); + lastUndoRange = + this.$getUndoSelection(delta.deltas, false, lastUndoRange); + } + } + this.$fromUndo = false; + lastUndoRange && + this.$undoSelect && + !dontSelect && + this.selection.setSelectionRange(lastUndoRange); + return lastUndoRange; + }; + this.setUndoSelect = function(enable) { + this.$undoSelect = enable; + }; + + this.$getUndoSelection = function(deltas, isUndo, lastUndoRange) { + function isInsert(delta) { + var insert = + delta.action === "insertText" || delta.action === "insertLines"; + return isUndo ? !insert : insert; + } + + var delta = deltas[0]; + var range, point; + var lastDeltaIsInsert = false; + if (isInsert(delta)) { + range = Range.fromPoints(delta.range.start, delta.range.end); + lastDeltaIsInsert = true; + } else { + range = Range.fromPoints(delta.range.start, delta.range.start); + lastDeltaIsInsert = false; + } + + for (var i = 1; i < deltas.length; i++) { + delta = deltas[i]; + if (isInsert(delta)) { + point = delta.range.start; + if (range.compare(point.row, point.column) == -1) { + range.setStart(delta.range.start); + } + point = delta.range.end; + if (range.compare(point.row, point.column) == 1) { + range.setEnd(delta.range.end); + } + lastDeltaIsInsert = true; + } else { + point = delta.range.start; + if (range.compare(point.row, point.column) == -1) { + range = + Range.fromPoints(delta.range.start, delta.range.start); + } + lastDeltaIsInsert = false; + } + } + if (lastUndoRange != null) { + if (Range.comparePoints(lastUndoRange.start, range.start) === 0) { + lastUndoRange.start.column += range.end.column - range.start.column; + lastUndoRange.end.column += range.end.column - range.start.column; + } + + var cmp = lastUndoRange.compareRange(range); + if (cmp == 1) { + range.setStart(lastUndoRange.start); + } else if (cmp == -1) { + range.setEnd(lastUndoRange.end); + } + } + + return range; + }; + this.replace = function(range, text) { + return this.doc.replace(range, text); + }; + this.moveText = function(fromRange, toPosition, copy) { + var text = this.getTextRange(fromRange); + var folds = this.getFoldsInRange(fromRange); + + var toRange = Range.fromPoints(toPosition, toPosition); + if (!copy) { + this.remove(fromRange); + var rowDiff = fromRange.start.row - fromRange.end.row; + var collDiff = rowDiff ? -fromRange.end.column : fromRange.start.column - fromRange.end.column; + if (collDiff) { + if (toRange.start.row == fromRange.end.row && toRange.start.column > fromRange.end.column) + toRange.start.column += collDiff; + if (toRange.end.row == fromRange.end.row && toRange.end.column > fromRange.end.column) + toRange.end.column += collDiff; + } + if (rowDiff && toRange.start.row >= fromRange.end.row) { + toRange.start.row += rowDiff; + toRange.end.row += rowDiff; + } + } + + toRange.end = this.insert(toRange.start, text); + if (folds.length) { + var oldStart = fromRange.start; + var newStart = toRange.start; + var rowDiff = newStart.row - oldStart.row; + var collDiff = newStart.column - oldStart.column; + this.addFolds(folds.map(function(x) { + x = x.clone(); + if (x.start.row == oldStart.row) + x.start.column += collDiff; + if (x.end.row == oldStart.row) + x.end.column += collDiff; + x.start.row += rowDiff; + x.end.row += rowDiff; + return x; + })); + } + + return toRange; + }; + this.indentRows = function(startRow, endRow, indentString) { + indentString = indentString.replace(/\t/g, this.getTabString()); + for (var row=startRow; row<=endRow; row++) + this.insert({row: row, column:0}, indentString); + }; + this.outdentRows = function (range) { + var rowRange = range.collapseRows(); + var deleteRange = new Range(0, 0, 0, 0); + var size = this.getTabSize(); + + for (var i = rowRange.start.row; i <= rowRange.end.row; ++i) { + var line = this.getLine(i); + + deleteRange.start.row = i; + deleteRange.end.row = i; + for (var j = 0; j < size; ++j) + if (line.charAt(j) != ' ') + break; + if (j < size && line.charAt(j) == '\t') { + deleteRange.start.column = j; + deleteRange.end.column = j + 1; + } else { + deleteRange.start.column = 0; + deleteRange.end.column = j; + } + this.remove(deleteRange); + } + }; + + this.$moveLines = function(firstRow, lastRow, dir) { + firstRow = this.getRowFoldStart(firstRow); + lastRow = this.getRowFoldEnd(lastRow); + if (dir < 0) { + var row = this.getRowFoldStart(firstRow + dir); + if (row < 0) return 0; + var diff = row-firstRow; + } else if (dir > 0) { + var row = this.getRowFoldEnd(lastRow + dir); + if (row > this.doc.getLength()-1) return 0; + var diff = row-lastRow; + } else { + firstRow = this.$clipRowToDocument(firstRow); + lastRow = this.$clipRowToDocument(lastRow); + var diff = lastRow - firstRow + 1; + } + + var range = new Range(firstRow, 0, lastRow, Number.MAX_VALUE); + var folds = this.getFoldsInRange(range).map(function(x){ + x = x.clone(); + x.start.row += diff; + x.end.row += diff; + return x; + }); + + var lines = dir == 0 + ? this.doc.getLines(firstRow, lastRow) + : this.doc.removeLines(firstRow, lastRow); + this.doc.insertLines(firstRow+diff, lines); + folds.length && this.addFolds(folds); + return diff; + }; + this.moveLinesUp = function(firstRow, lastRow) { + return this.$moveLines(firstRow, lastRow, -1); + }; + this.moveLinesDown = function(firstRow, lastRow) { + return this.$moveLines(firstRow, lastRow, 1); + }; + this.duplicateLines = function(firstRow, lastRow) { + return this.$moveLines(firstRow, lastRow, 0); + }; + + + this.$clipRowToDocument = function(row) { + return Math.max(0, Math.min(row, this.doc.getLength()-1)); + }; + + this.$clipColumnToRow = function(row, column) { + if (column < 0) + return 0; + return Math.min(this.doc.getLine(row).length, column); + }; + + + this.$clipPositionToDocument = function(row, column) { + column = Math.max(0, column); + + if (row < 0) { + row = 0; + column = 0; + } else { + var len = this.doc.getLength(); + if (row >= len) { + row = len - 1; + column = this.doc.getLine(len-1).length; + } else { + column = Math.min(this.doc.getLine(row).length, column); + } + } + + return { + row: row, + column: column + }; + }; + + this.$clipRangeToDocument = function(range) { + if (range.start.row < 0) { + range.start.row = 0; + range.start.column = 0; + } else { + range.start.column = this.$clipColumnToRow( + range.start.row, + range.start.column + ); + } + + var len = this.doc.getLength() - 1; + if (range.end.row > len) { + range.end.row = len; + range.end.column = this.doc.getLine(len).length; + } else { + range.end.column = this.$clipColumnToRow( + range.end.row, + range.end.column + ); + } + return range; + }; + this.$wrapLimit = 80; + this.$useWrapMode = false; + this.$wrapLimitRange = { + min : null, + max : null + }; + this.setUseWrapMode = function(useWrapMode) { + if (useWrapMode != this.$useWrapMode) { + this.$useWrapMode = useWrapMode; + this.$modified = true; + this.$resetRowCache(0); + if (useWrapMode) { + var len = this.getLength(); + this.$wrapData = Array(len); + this.$updateWrapData(0, len - 1); + } + + this._signal("changeWrapMode"); + } + }; + this.getUseWrapMode = function() { + return this.$useWrapMode; + }; + this.setWrapLimitRange = function(min, max) { + if (this.$wrapLimitRange.min !== min || this.$wrapLimitRange.max !== max) { + this.$wrapLimitRange = { + min: min, + max: max + }; + this.$modified = true; + this._signal("changeWrapMode"); + } + }; + this.adjustWrapLimit = function(desiredLimit, $printMargin) { + var limits = this.$wrapLimitRange + if (limits.max < 0) + limits = {min: $printMargin, max: $printMargin}; + var wrapLimit = this.$constrainWrapLimit(desiredLimit, limits.min, limits.max); + if (wrapLimit != this.$wrapLimit && wrapLimit > 1) { + this.$wrapLimit = wrapLimit; + this.$modified = true; + if (this.$useWrapMode) { + this.$updateWrapData(0, this.getLength() - 1); + this.$resetRowCache(0); + this._signal("changeWrapLimit"); + } + return true; + } + return false; + }; + + this.$constrainWrapLimit = function(wrapLimit, min, max) { + if (min) + wrapLimit = Math.max(min, wrapLimit); + + if (max) + wrapLimit = Math.min(max, wrapLimit); + + return wrapLimit; + }; + this.getWrapLimit = function() { + return this.$wrapLimit; + }; + this.setWrapLimit = function (limit) { + this.setWrapLimitRange(limit, limit); + }; + this.getWrapLimitRange = function() { + return { + min : this.$wrapLimitRange.min, + max : this.$wrapLimitRange.max + }; + }; + + this.$updateInternalDataOnChange = function(e) { + var useWrapMode = this.$useWrapMode; + var len; + var action = e.data.action; + var firstRow = e.data.range.start.row; + var lastRow = e.data.range.end.row; + var start = e.data.range.start; + var end = e.data.range.end; + var removedFolds = null; + + if (action.indexOf("Lines") != -1) { + if (action == "insertLines") { + lastRow = firstRow + (e.data.lines.length); + } else { + lastRow = firstRow; + } + len = e.data.lines ? e.data.lines.length : lastRow - firstRow; + } else { + len = lastRow - firstRow; + } + + this.$updating = true; + if (len != 0) { + if (action.indexOf("remove") != -1) { + this[useWrapMode ? "$wrapData" : "$rowLengthCache"].splice(firstRow, len); + + var foldLines = this.$foldData; + removedFolds = this.getFoldsInRange(e.data.range); + this.removeFolds(removedFolds); + + var foldLine = this.getFoldLine(end.row); + var idx = 0; + if (foldLine) { + foldLine.addRemoveChars(end.row, end.column, start.column - end.column); + foldLine.shiftRow(-len); + + var foldLineBefore = this.getFoldLine(firstRow); + if (foldLineBefore && foldLineBefore !== foldLine) { + foldLineBefore.merge(foldLine); + foldLine = foldLineBefore; + } + idx = foldLines.indexOf(foldLine) + 1; + } + + for (idx; idx < foldLines.length; idx++) { + var foldLine = foldLines[idx]; + if (foldLine.start.row >= end.row) { + foldLine.shiftRow(-len); + } + } + + lastRow = firstRow; + } else { + var args = Array(len); + args.unshift(firstRow, 0); + var arr = useWrapMode ? this.$wrapData : this.$rowLengthCache + arr.splice.apply(arr, args); + var foldLines = this.$foldData; + var foldLine = this.getFoldLine(firstRow); + var idx = 0; + if (foldLine) { + var cmp = foldLine.range.compareInside(start.row, start.column) + if (cmp == 0) { + foldLine = foldLine.split(start.row, start.column); + foldLine.shiftRow(len); + foldLine.addRemoveChars( + lastRow, 0, end.column - start.column); + } else + if (cmp == -1) { + foldLine.addRemoveChars(firstRow, 0, end.column - start.column); + foldLine.shiftRow(len); + } + idx = foldLines.indexOf(foldLine) + 1; + } + + for (idx; idx < foldLines.length; idx++) { + var foldLine = foldLines[idx]; + if (foldLine.start.row >= firstRow) { + foldLine.shiftRow(len); + } + } + } + } else { + len = Math.abs(e.data.range.start.column - e.data.range.end.column); + if (action.indexOf("remove") != -1) { + removedFolds = this.getFoldsInRange(e.data.range); + this.removeFolds(removedFolds); + + len = -len; + } + var foldLine = this.getFoldLine(firstRow); + if (foldLine) { + foldLine.addRemoveChars(firstRow, start.column, len); + } + } + + if (useWrapMode && this.$wrapData.length != this.doc.getLength()) { + console.error("doc.getLength() and $wrapData.length have to be the same!"); + } + this.$updating = false; + + if (useWrapMode) + this.$updateWrapData(firstRow, lastRow); + else + this.$updateRowLengthCache(firstRow, lastRow); + + return removedFolds; + }; + + this.$updateRowLengthCache = function(firstRow, lastRow, b) { + this.$rowLengthCache[firstRow] = null; + this.$rowLengthCache[lastRow] = null; + }; + + this.$updateWrapData = function(firstRow, lastRow) { + var lines = this.doc.getAllLines(); + var tabSize = this.getTabSize(); + var wrapData = this.$wrapData; + var wrapLimit = this.$wrapLimit; + var tokens; + var foldLine; + + var row = firstRow; + lastRow = Math.min(lastRow, lines.length - 1); + while (row <= lastRow) { + foldLine = this.getFoldLine(row, foldLine); + if (!foldLine) { + tokens = this.$getDisplayTokens(lines[row]); + wrapData[row] = this.$computeWrapSplits(tokens, wrapLimit, tabSize); + row ++; + } else { + tokens = []; + foldLine.walk(function(placeholder, row, column, lastColumn) { + var walkTokens; + if (placeholder != null) { + walkTokens = this.$getDisplayTokens( + placeholder, tokens.length); + walkTokens[0] = PLACEHOLDER_START; + for (var i = 1; i < walkTokens.length; i++) { + walkTokens[i] = PLACEHOLDER_BODY; + } + } else { + walkTokens = this.$getDisplayTokens( + lines[row].substring(lastColumn, column), + tokens.length); + } + tokens = tokens.concat(walkTokens); + }.bind(this), + foldLine.end.row, + lines[foldLine.end.row].length + 1 + ); + + wrapData[foldLine.start.row] = this.$computeWrapSplits(tokens, wrapLimit, tabSize); + row = foldLine.end.row + 1; + } + } + }; + var CHAR = 1, + CHAR_EXT = 2, + PLACEHOLDER_START = 3, + PLACEHOLDER_BODY = 4, + PUNCTUATION = 9, + SPACE = 10, + TAB = 11, + TAB_SPACE = 12; + + + this.$computeWrapSplits = function(tokens, wrapLimit) { + if (tokens.length == 0) { + return []; + } + + var splits = []; + var displayLength = tokens.length; + var lastSplit = 0, lastDocSplit = 0; + + var isCode = this.$wrapAsCode; + + function addSplit(screenPos) { + var displayed = tokens.slice(lastSplit, screenPos); + var len = displayed.length; + displayed.join(""). + replace(/12/g, function() { + len -= 1; + }). + replace(/2/g, function() { + len -= 1; + }); + + lastDocSplit += len; + splits.push(lastDocSplit); + lastSplit = screenPos; + } + + while (displayLength - lastSplit > wrapLimit) { + var split = lastSplit + wrapLimit; + if (tokens[split - 1] >= SPACE && tokens[split] >= SPACE) { + addSplit(split); + continue; + } + if (tokens[split] == PLACEHOLDER_START || tokens[split] == PLACEHOLDER_BODY) { + for (split; split != lastSplit - 1; split--) { + if (tokens[split] == PLACEHOLDER_START) { + break; + } + } + if (split > lastSplit) { + addSplit(split); + continue; + } + split = lastSplit + wrapLimit; + for (split; split < tokens.length; split++) { + if (tokens[split] != PLACEHOLDER_BODY) { + break; + } + } + if (split == tokens.length) { + break; // Breaks the while-loop. + } + addSplit(split); + continue; + } + var minSplit = Math.max(split - (isCode ? 10 : wrapLimit-(wrapLimit>>2)), lastSplit - 1); + while (split > minSplit && tokens[split] < PLACEHOLDER_START) { + split --; + } + if (isCode) { + while (split > minSplit && tokens[split] < PLACEHOLDER_START) { + split --; + } + while (split > minSplit && tokens[split] == PUNCTUATION) { + split --; + } + } else { + while (split > minSplit && tokens[split] < SPACE) { + split --; + } + } + if (split > minSplit) { + addSplit(++split); + continue; + } + split = lastSplit + wrapLimit; + addSplit(split); + } + return splits; + }; + this.$getDisplayTokens = function(str, offset) { + var arr = []; + var tabSize; + offset = offset || 0; + + for (var i = 0; i < str.length; i++) { + var c = str.charCodeAt(i); + if (c == 9) { + tabSize = this.getScreenTabSize(arr.length + offset); + arr.push(TAB); + for (var n = 1; n < tabSize; n++) { + arr.push(TAB_SPACE); + } + } + else if (c == 32) { + arr.push(SPACE); + } else if((c > 39 && c < 48) || (c > 57 && c < 64)) { + arr.push(PUNCTUATION); + } + else if (c >= 0x1100 && isFullWidth(c)) { + arr.push(CHAR, CHAR_EXT); + } else { + arr.push(CHAR); + } + } + return arr; + }; + this.$getStringScreenWidth = function(str, maxScreenColumn, screenColumn) { + if (maxScreenColumn == 0) + return [0, 0]; + if (maxScreenColumn == null) + maxScreenColumn = Infinity; + screenColumn = screenColumn || 0; + + var c, column; + for (column = 0; column < str.length; column++) { + c = str.charCodeAt(column); + if (c == 9) { + screenColumn += this.getScreenTabSize(screenColumn); + } + else if (c >= 0x1100 && isFullWidth(c)) { + screenColumn += 2; + } else { + screenColumn += 1; + } + if (screenColumn > maxScreenColumn) { + break; + } + } + + return [screenColumn, column]; + }; + + this.lineWidgets = null; + this.getRowLength = function(row) { + if (this.lineWidgets) + var h = this.lineWidgets[row] && this.lineWidgets[row].rowCount || 0; + else + h = 0 + if (!this.$useWrapMode || !this.$wrapData[row]) { + return 1 + h; + } else { + return this.$wrapData[row].length + 1 + h; + } + }; + this.getRowLineCount = function(row) { + if (!this.$useWrapMode || !this.$wrapData[row]) { + return 1; + } else { + return this.$wrapData[row].length + 1; + } + }; + this.getScreenLastRowColumn = function(screenRow) { + var pos = this.screenToDocumentPosition(screenRow, Number.MAX_VALUE); + return this.documentToScreenColumn(pos.row, pos.column); + }; + this.getDocumentLastRowColumn = function(docRow, docColumn) { + var screenRow = this.documentToScreenRow(docRow, docColumn); + return this.getScreenLastRowColumn(screenRow); + }; + this.getDocumentLastRowColumnPosition = function(docRow, docColumn) { + var screenRow = this.documentToScreenRow(docRow, docColumn); + return this.screenToDocumentPosition(screenRow, Number.MAX_VALUE / 10); + }; + this.getRowSplitData = function(row) { + if (!this.$useWrapMode) { + return undefined; + } else { + return this.$wrapData[row]; + } + }; + this.getScreenTabSize = function(screenColumn) { + return this.$tabSize - screenColumn % this.$tabSize; + }; + + + this.screenToDocumentRow = function(screenRow, screenColumn) { + return this.screenToDocumentPosition(screenRow, screenColumn).row; + }; + + + this.screenToDocumentColumn = function(screenRow, screenColumn) { + return this.screenToDocumentPosition(screenRow, screenColumn).column; + }; + this.screenToDocumentPosition = function(screenRow, screenColumn) { + if (screenRow < 0) + return {row: 0, column: 0}; + + var line; + var docRow = 0; + var docColumn = 0; + var column; + var row = 0; + var rowLength = 0; + + var rowCache = this.$screenRowCache; + var i = this.$getRowCacheIndex(rowCache, screenRow); + var l = rowCache.length; + if (l && i >= 0) { + var row = rowCache[i]; + var docRow = this.$docRowCache[i]; + var doCache = screenRow > rowCache[l - 1]; + } else { + var doCache = !l; + } + + var maxRow = this.getLength() - 1; + var foldLine = this.getNextFoldLine(docRow); + var foldStart = foldLine ? foldLine.start.row : Infinity; + + while (row <= screenRow) { + rowLength = this.getRowLength(docRow); + if (row + rowLength > screenRow || docRow >= maxRow) { + break; + } else { + row += rowLength; + docRow++; + if (docRow > foldStart) { + docRow = foldLine.end.row+1; + foldLine = this.getNextFoldLine(docRow, foldLine); + foldStart = foldLine ? foldLine.start.row : Infinity; + } + } + + if (doCache) { + this.$docRowCache.push(docRow); + this.$screenRowCache.push(row); + } + } + + if (foldLine && foldLine.start.row <= docRow) { + line = this.getFoldDisplayLine(foldLine); + docRow = foldLine.start.row; + } else if (row + rowLength <= screenRow || docRow > maxRow) { + return { + row: maxRow, + column: this.getLine(maxRow).length + } + } else { + line = this.getLine(docRow); + foldLine = null; + } + + if (this.$useWrapMode) { + var splits = this.$wrapData[docRow]; + if (splits) { + var splitIndex = Math.floor(screenRow - row); + column = splits[splitIndex]; + if(splitIndex > 0 && splits.length) { + docColumn = splits[splitIndex - 1] || splits[splits.length - 1]; + line = line.substring(docColumn); + } + } + } + + docColumn += this.$getStringScreenWidth(line, screenColumn)[1]; + if (this.$useWrapMode && docColumn >= column) + docColumn = column - 1; + + if (foldLine) + return foldLine.idxToPosition(docColumn); + + return {row: docRow, column: docColumn}; + }; + this.documentToScreenPosition = function(docRow, docColumn) { + if (typeof docColumn === "undefined") + var pos = this.$clipPositionToDocument(docRow.row, docRow.column); + else + pos = this.$clipPositionToDocument(docRow, docColumn); + + docRow = pos.row; + docColumn = pos.column; + + var screenRow = 0; + var foldStartRow = null; + var fold = null; + fold = this.getFoldAt(docRow, docColumn, 1); + if (fold) { + docRow = fold.start.row; + docColumn = fold.start.column; + } + + var rowEnd, row = 0; + + + var rowCache = this.$docRowCache; + var i = this.$getRowCacheIndex(rowCache, docRow); + var l = rowCache.length; + if (l && i >= 0) { + var row = rowCache[i]; + var screenRow = this.$screenRowCache[i]; + var doCache = docRow > rowCache[l - 1]; + } else { + var doCache = !l; + } + + var foldLine = this.getNextFoldLine(row); + var foldStart = foldLine ?foldLine.start.row :Infinity; + + while (row < docRow) { + if (row >= foldStart) { + rowEnd = foldLine.end.row + 1; + if (rowEnd > docRow) + break; + foldLine = this.getNextFoldLine(rowEnd, foldLine); + foldStart = foldLine ?foldLine.start.row :Infinity; + } + else { + rowEnd = row + 1; + } + + screenRow += this.getRowLength(row); + row = rowEnd; + + if (doCache) { + this.$docRowCache.push(row); + this.$screenRowCache.push(screenRow); + } + } + var textLine = ""; + if (foldLine && row >= foldStart) { + textLine = this.getFoldDisplayLine(foldLine, docRow, docColumn); + foldStartRow = foldLine.start.row; + } else { + textLine = this.getLine(docRow).substring(0, docColumn); + foldStartRow = docRow; + } + if (this.$useWrapMode) { + var wrapRow = this.$wrapData[foldStartRow]; + if (wrapRow) { + var screenRowOffset = 0; + while (textLine.length >= wrapRow[screenRowOffset]) { + screenRow ++; + screenRowOffset++; + } + textLine = textLine.substring( + wrapRow[screenRowOffset - 1] || 0, textLine.length + ); + } + } + + return { + row: screenRow, + column: this.$getStringScreenWidth(textLine)[0] + }; + }; + this.documentToScreenColumn = function(row, docColumn) { + return this.documentToScreenPosition(row, docColumn).column; + }; + this.documentToScreenRow = function(docRow, docColumn) { + return this.documentToScreenPosition(docRow, docColumn).row; + }; + this.getScreenLength = function() { + var screenRows = 0; + var fold = null; + if (!this.$useWrapMode) { + screenRows = this.getLength(); + var foldData = this.$foldData; + for (var i = 0; i < foldData.length; i++) { + fold = foldData[i]; + screenRows -= fold.end.row - fold.start.row; + } + } else { + var lastRow = this.$wrapData.length; + var row = 0, i = 0; + var fold = this.$foldData[i++]; + var foldStart = fold ? fold.start.row :Infinity; + + while (row < lastRow) { + var splits = this.$wrapData[row]; + screenRows += splits ? splits.length + 1 : 1; + row ++; + if (row > foldStart) { + row = fold.end.row+1; + fold = this.$foldData[i++]; + foldStart = fold ?fold.start.row :Infinity; + } + } + } + if (this.lineWidgets) + screenRows += this.$getWidgetScreenLength(); + + return screenRows; + }; + this.$setFontMetrics = function(fm) { + } + function isFullWidth(c) { + if (c < 0x1100) + return false; + return c >= 0x1100 && c <= 0x115F || + c >= 0x11A3 && c <= 0x11A7 || + c >= 0x11FA && c <= 0x11FF || + c >= 0x2329 && c <= 0x232A || + c >= 0x2E80 && c <= 0x2E99 || + c >= 0x2E9B && c <= 0x2EF3 || + c >= 0x2F00 && c <= 0x2FD5 || + c >= 0x2FF0 && c <= 0x2FFB || + c >= 0x3000 && c <= 0x303E || + c >= 0x3041 && c <= 0x3096 || + c >= 0x3099 && c <= 0x30FF || + c >= 0x3105 && c <= 0x312D || + c >= 0x3131 && c <= 0x318E || + c >= 0x3190 && c <= 0x31BA || + c >= 0x31C0 && c <= 0x31E3 || + c >= 0x31F0 && c <= 0x321E || + c >= 0x3220 && c <= 0x3247 || + c >= 0x3250 && c <= 0x32FE || + c >= 0x3300 && c <= 0x4DBF || + c >= 0x4E00 && c <= 0xA48C || + c >= 0xA490 && c <= 0xA4C6 || + c >= 0xA960 && c <= 0xA97C || + c >= 0xAC00 && c <= 0xD7A3 || + c >= 0xD7B0 && c <= 0xD7C6 || + c >= 0xD7CB && c <= 0xD7FB || + c >= 0xF900 && c <= 0xFAFF || + c >= 0xFE10 && c <= 0xFE19 || + c >= 0xFE30 && c <= 0xFE52 || + c >= 0xFE54 && c <= 0xFE66 || + c >= 0xFE68 && c <= 0xFE6B || + c >= 0xFF01 && c <= 0xFF60 || + c >= 0xFFE0 && c <= 0xFFE6; + }; + +}).call(EditSession.prototype); + +require("./edit_session/folding").Folding.call(EditSession.prototype); +require("./edit_session/bracket_match").BracketMatch.call(EditSession.prototype); + + +config.defineOptions(EditSession.prototype, "session", { + wrap: { + set: function(value) { + if (!value || value == "off") + value = false; + else if (value == "free") + value = true; + else if (value == "printMargin") + value = -1; + else if (typeof value == "string") + value = parseInt(value, 10) || false; + + if (this.$wrap == value) + return; + if (!value) { + this.setUseWrapMode(false); + } else { + var col = typeof value == "number" ? value : null; + this.setWrapLimitRange(col, col); + this.setUseWrapMode(true); + } + this.$wrap = value; + }, + get: function() { + if (this.getUseWrapMode()) { + if (this.$wrap == -1) + return "printMargin"; + if (!this.getWrapLimitRange().min) + return "free"; + return this.$wrap; + } + return "off"; + }, + handlesSet: true + }, + wrapMethod: { + set: function(val) { + val = val == "auto" + ? this.$mode.type != "text" + : val != "text"; + if (val != this.$wrapAsCode) { + this.$wrapAsCode = val; + if (this.$useWrapMode) { + this.$modified = true; + this.$resetRowCache(0); + this.$updateWrapData(0, this.getLength() - 1); + } + } + }, + initialValue: "auto" + }, + firstLineNumber: { + set: function() {this._signal("changeBreakpoint");}, + initialValue: 1 + }, + useWorker: { + set: function(useWorker) { + this.$useWorker = useWorker; + + this.$stopWorker(); + if (useWorker) + this.$startWorker(); + }, + initialValue: true + }, + useSoftTabs: {initialValue: true}, + tabSize: { + set: function(tabSize) { + if (isNaN(tabSize) || this.$tabSize === tabSize) return; + + this.$modified = true; + this.$rowLengthCache = []; + this.$tabSize = tabSize; + this._signal("changeTabSize"); + }, + initialValue: 4, + handlesSet: true + }, + overwrite: { + set: function(val) {this._signal("changeOverwrite");}, + initialValue: false + }, + newLineMode: { + set: function(val) {this.doc.setNewLineMode(val)}, + get: function() {return this.doc.getNewLineMode()}, + handlesSet: true + }, + mode: { + set: function(val) { this.setMode(val) }, + get: function() { return this.$modeId } + } +}); + +exports.EditSession = EditSession; +}); + +ace.define('ace/selection', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/lib/event_emitter', 'ace/range'], function(require, exports, module) { + + +var oop = require("./lib/oop"); +var lang = require("./lib/lang"); +var EventEmitter = require("./lib/event_emitter").EventEmitter; +var Range = require("./range").Range; +var Selection = function(session) { + this.session = session; + this.doc = session.getDocument(); + + this.clearSelection(); + this.lead = this.selectionLead = this.doc.createAnchor(0, 0); + this.anchor = this.selectionAnchor = this.doc.createAnchor(0, 0); + + var self = this; + this.lead.on("change", function(e) { + self._emit("changeCursor"); + if (!self.$isEmpty) + self._emit("changeSelection"); + if (!self.$keepDesiredColumnOnChange && e.old.column != e.value.column) + self.$desiredColumn = null; + }); + + this.selectionAnchor.on("change", function() { + if (!self.$isEmpty) + self._emit("changeSelection"); + }); +}; + +(function() { + + oop.implement(this, EventEmitter); + this.isEmpty = function() { + return (this.$isEmpty || ( + this.anchor.row == this.lead.row && + this.anchor.column == this.lead.column + )); + }; + this.isMultiLine = function() { + if (this.isEmpty()) { + return false; + } + + return this.getRange().isMultiLine(); + }; + this.getCursor = function() { + return this.lead.getPosition(); + }; + this.setSelectionAnchor = function(row, column) { + this.anchor.setPosition(row, column); + + if (this.$isEmpty) { + this.$isEmpty = false; + this._emit("changeSelection"); + } + }; + this.getSelectionAnchor = function() { + if (this.$isEmpty) + return this.getSelectionLead() + else + return this.anchor.getPosition(); + }; + this.getSelectionLead = function() { + return this.lead.getPosition(); + }; + this.shiftSelection = function(columns) { + if (this.$isEmpty) { + this.moveCursorTo(this.lead.row, this.lead.column + columns); + return; + }; + + var anchor = this.getSelectionAnchor(); + var lead = this.getSelectionLead(); + + var isBackwards = this.isBackwards(); + + if (!isBackwards || anchor.column !== 0) + this.setSelectionAnchor(anchor.row, anchor.column + columns); + + if (isBackwards || lead.column !== 0) { + this.$moveSelection(function() { + this.moveCursorTo(lead.row, lead.column + columns); + }); + } + }; + this.isBackwards = function() { + var anchor = this.anchor; + var lead = this.lead; + return (anchor.row > lead.row || (anchor.row == lead.row && anchor.column > lead.column)); + }; + this.getRange = function() { + var anchor = this.anchor; + var lead = this.lead; + + if (this.isEmpty()) + return Range.fromPoints(lead, lead); + + if (this.isBackwards()) { + return Range.fromPoints(lead, anchor); + } + else { + return Range.fromPoints(anchor, lead); + } + }; + this.clearSelection = function() { + if (!this.$isEmpty) { + this.$isEmpty = true; + this._emit("changeSelection"); + } + }; + this.selectAll = function() { + var lastRow = this.doc.getLength() - 1; + this.setSelectionAnchor(0, 0); + this.moveCursorTo(lastRow, this.doc.getLine(lastRow).length); + }; + this.setRange = + this.setSelectionRange = function(range, reverse) { + if (reverse) { + this.setSelectionAnchor(range.end.row, range.end.column); + this.selectTo(range.start.row, range.start.column); + } else { + this.setSelectionAnchor(range.start.row, range.start.column); + this.selectTo(range.end.row, range.end.column); + } + if (this.getRange().isEmpty()) + this.$isEmpty = true; + this.$desiredColumn = null; + }; + + this.$moveSelection = function(mover) { + var lead = this.lead; + if (this.$isEmpty) + this.setSelectionAnchor(lead.row, lead.column); + + mover.call(this); + }; + this.selectTo = function(row, column) { + this.$moveSelection(function() { + this.moveCursorTo(row, column); + }); + }; + this.selectToPosition = function(pos) { + this.$moveSelection(function() { + this.moveCursorToPosition(pos); + }); + }; + this.moveTo = function(row, column) { + this.clearSelection(); + this.moveCursorTo(row, column); + }; + this.moveToPosition = function(pos) { + this.clearSelection(); + this.moveCursorToPosition(pos); + }; + this.selectUp = function() { + this.$moveSelection(this.moveCursorUp); + }; + this.selectDown = function() { + this.$moveSelection(this.moveCursorDown); + }; + this.selectRight = function() { + this.$moveSelection(this.moveCursorRight); + }; + this.selectLeft = function() { + this.$moveSelection(this.moveCursorLeft); + }; + this.selectLineStart = function() { + this.$moveSelection(this.moveCursorLineStart); + }; + this.selectLineEnd = function() { + this.$moveSelection(this.moveCursorLineEnd); + }; + this.selectFileEnd = function() { + this.$moveSelection(this.moveCursorFileEnd); + }; + this.selectFileStart = function() { + this.$moveSelection(this.moveCursorFileStart); + }; + this.selectWordRight = function() { + this.$moveSelection(this.moveCursorWordRight); + }; + this.selectWordLeft = function() { + this.$moveSelection(this.moveCursorWordLeft); + }; + this.getWordRange = function(row, column) { + if (typeof column == "undefined") { + var cursor = row || this.lead; + row = cursor.row; + column = cursor.column; + } + return this.session.getWordRange(row, column); + }; + this.selectWord = function() { + this.setSelectionRange(this.getWordRange()); + }; + this.selectAWord = function() { + var cursor = this.getCursor(); + var range = this.session.getAWordRange(cursor.row, cursor.column); + this.setSelectionRange(range); + }; + + this.getLineRange = function(row, excludeLastChar) { + var rowStart = typeof row == "number" ? row : this.lead.row; + var rowEnd; + + var foldLine = this.session.getFoldLine(rowStart); + if (foldLine) { + rowStart = foldLine.start.row; + rowEnd = foldLine.end.row; + } else { + rowEnd = rowStart; + } + if (excludeLastChar === true) + return new Range(rowStart, 0, rowEnd, this.session.getLine(rowEnd).length); + else + return new Range(rowStart, 0, rowEnd + 1, 0); + }; + this.selectLine = function() { + this.setSelectionRange(this.getLineRange()); + }; + this.moveCursorUp = function() { + this.moveCursorBy(-1, 0); + }; + this.moveCursorDown = function() { + this.moveCursorBy(1, 0); + }; + this.moveCursorLeft = function() { + var cursor = this.lead.getPosition(), + fold; + + if (fold = this.session.getFoldAt(cursor.row, cursor.column, -1)) { + this.moveCursorTo(fold.start.row, fold.start.column); + } else if (cursor.column == 0) { + if (cursor.row > 0) { + this.moveCursorTo(cursor.row - 1, this.doc.getLine(cursor.row - 1).length); + } + } + else { + var tabSize = this.session.getTabSize(); + if (this.session.isTabStop(cursor) && this.doc.getLine(cursor.row).slice(cursor.column-tabSize, cursor.column).split(" ").length-1 == tabSize) + this.moveCursorBy(0, -tabSize); + else + this.moveCursorBy(0, -1); + } + }; + this.moveCursorRight = function() { + var cursor = this.lead.getPosition(), + fold; + if (fold = this.session.getFoldAt(cursor.row, cursor.column, 1)) { + this.moveCursorTo(fold.end.row, fold.end.column); + } + else if (this.lead.column == this.doc.getLine(this.lead.row).length) { + if (this.lead.row < this.doc.getLength() - 1) { + this.moveCursorTo(this.lead.row + 1, 0); + } + } + else { + var tabSize = this.session.getTabSize(); + var cursor = this.lead; + if (this.session.isTabStop(cursor) && this.doc.getLine(cursor.row).slice(cursor.column, cursor.column+tabSize).split(" ").length-1 == tabSize) + this.moveCursorBy(0, tabSize); + else + this.moveCursorBy(0, 1); + } + }; + this.moveCursorLineStart = function() { + var row = this.lead.row; + var column = this.lead.column; + var screenRow = this.session.documentToScreenRow(row, column); + var firstColumnPosition = this.session.screenToDocumentPosition(screenRow, 0); + var beforeCursor = this.session.getDisplayLine( + row, null, firstColumnPosition.row, + firstColumnPosition.column + ); + + var leadingSpace = beforeCursor.match(/^\s*/); + if (leadingSpace[0].length != column && !this.session.$useEmacsStyleLineStart) + firstColumnPosition.column += leadingSpace[0].length; + this.moveCursorToPosition(firstColumnPosition); + }; + this.moveCursorLineEnd = function() { + var lead = this.lead; + var lineEnd = this.session.getDocumentLastRowColumnPosition(lead.row, lead.column); + if (this.lead.column == lineEnd.column) { + var line = this.session.getLine(lineEnd.row); + if (lineEnd.column == line.length) { + var textEnd = line.search(/\s+$/); + if (textEnd > 0) + lineEnd.column = textEnd; + } + } + + this.moveCursorTo(lineEnd.row, lineEnd.column); + }; + this.moveCursorFileEnd = function() { + var row = this.doc.getLength() - 1; + var column = this.doc.getLine(row).length; + this.moveCursorTo(row, column); + }; + this.moveCursorFileStart = function() { + this.moveCursorTo(0, 0); + }; + this.moveCursorLongWordRight = function() { + var row = this.lead.row; + var column = this.lead.column; + var line = this.doc.getLine(row); + var rightOfCursor = line.substring(column); + + var match; + this.session.nonTokenRe.lastIndex = 0; + this.session.tokenRe.lastIndex = 0; + var fold = this.session.getFoldAt(row, column, 1); + if (fold) { + this.moveCursorTo(fold.end.row, fold.end.column); + return; + } + if (match = this.session.nonTokenRe.exec(rightOfCursor)) { + column += this.session.nonTokenRe.lastIndex; + this.session.nonTokenRe.lastIndex = 0; + rightOfCursor = line.substring(column); + } + if (column >= line.length) { + this.moveCursorTo(row, line.length); + this.moveCursorRight(); + if (row < this.doc.getLength() - 1) + this.moveCursorWordRight(); + return; + } + if (match = this.session.tokenRe.exec(rightOfCursor)) { + column += this.session.tokenRe.lastIndex; + this.session.tokenRe.lastIndex = 0; + } + + this.moveCursorTo(row, column); + }; + this.moveCursorLongWordLeft = function() { + var row = this.lead.row; + var column = this.lead.column; + var fold; + if (fold = this.session.getFoldAt(row, column, -1)) { + this.moveCursorTo(fold.start.row, fold.start.column); + return; + } + + var str = this.session.getFoldStringAt(row, column, -1); + if (str == null) { + str = this.doc.getLine(row).substring(0, column) + } + + var leftOfCursor = lang.stringReverse(str); + var match; + this.session.nonTokenRe.lastIndex = 0; + this.session.tokenRe.lastIndex = 0; + if (match = this.session.nonTokenRe.exec(leftOfCursor)) { + column -= this.session.nonTokenRe.lastIndex; + leftOfCursor = leftOfCursor.slice(this.session.nonTokenRe.lastIndex); + this.session.nonTokenRe.lastIndex = 0; + } + if (column <= 0) { + this.moveCursorTo(row, 0); + this.moveCursorLeft(); + if (row > 0) + this.moveCursorWordLeft(); + return; + } + if (match = this.session.tokenRe.exec(leftOfCursor)) { + column -= this.session.tokenRe.lastIndex; + this.session.tokenRe.lastIndex = 0; + } + + this.moveCursorTo(row, column); + }; + + this.$shortWordEndIndex = function(rightOfCursor) { + var match, index = 0, ch; + var whitespaceRe = /\s/; + var tokenRe = this.session.tokenRe; + + tokenRe.lastIndex = 0; + if (match = this.session.tokenRe.exec(rightOfCursor)) { + index = this.session.tokenRe.lastIndex; + } else { + while ((ch = rightOfCursor[index]) && whitespaceRe.test(ch)) + index ++; + + if (index < 1) { + tokenRe.lastIndex = 0; + while ((ch = rightOfCursor[index]) && !tokenRe.test(ch)) { + tokenRe.lastIndex = 0; + index ++; + if (whitespaceRe.test(ch)) { + if (index > 2) { + index-- + break; + } else { + while ((ch = rightOfCursor[index]) && whitespaceRe.test(ch)) + index ++; + if (index > 2) + break + } + } + } + } + } + tokenRe.lastIndex = 0; + + return index; + }; + + this.moveCursorShortWordRight = function() { + var row = this.lead.row; + var column = this.lead.column; + var line = this.doc.getLine(row); + var rightOfCursor = line.substring(column); + + var fold = this.session.getFoldAt(row, column, 1); + if (fold) + return this.moveCursorTo(fold.end.row, fold.end.column); + + if (column == line.length) { + var l = this.doc.getLength(); + do { + row++; + rightOfCursor = this.doc.getLine(row) + } while (row < l && /^\s*$/.test(rightOfCursor)) + + if (!/^\s+/.test(rightOfCursor)) + rightOfCursor = "" + column = 0; + } + + var index = this.$shortWordEndIndex(rightOfCursor); + + this.moveCursorTo(row, column + index); + }; + + this.moveCursorShortWordLeft = function() { + var row = this.lead.row; + var column = this.lead.column; + + var fold; + if (fold = this.session.getFoldAt(row, column, -1)) + return this.moveCursorTo(fold.start.row, fold.start.column); + + var line = this.session.getLine(row).substring(0, column); + if (column == 0) { + do { + row--; + line = this.doc.getLine(row); + } while (row > 0 && /^\s*$/.test(line)) + + column = line.length; + if (!/\s+$/.test(line)) + line = "" + } + + var leftOfCursor = lang.stringReverse(line); + var index = this.$shortWordEndIndex(leftOfCursor); + + return this.moveCursorTo(row, column - index); + }; + + this.moveCursorWordRight = function() { + if (this.session.$selectLongWords) + this.moveCursorLongWordRight(); + else + this.moveCursorShortWordRight(); + }; + + this.moveCursorWordLeft = function() { + if (this.session.$selectLongWords) + this.moveCursorLongWordLeft(); + else + this.moveCursorShortWordLeft(); + }; + this.moveCursorBy = function(rows, chars) { + var screenPos = this.session.documentToScreenPosition( + this.lead.row, + this.lead.column + ); + + if (chars === 0) { + if (this.$desiredColumn) + screenPos.column = this.$desiredColumn; + else + this.$desiredColumn = screenPos.column; + } + + var docPos = this.session.screenToDocumentPosition(screenPos.row + rows, screenPos.column); + + if (rows !== 0 && chars === 0 && docPos.row === this.lead.row && docPos.column === this.lead.column) { + if (this.session.lineWidgets && this.session.lineWidgets[docPos.row]) + docPos.row++; + } + this.moveCursorTo(docPos.row, docPos.column + chars, chars === 0); + }; + this.moveCursorToPosition = function(position) { + this.moveCursorTo(position.row, position.column); + }; + this.moveCursorTo = function(row, column, keepDesiredColumn) { + var fold = this.session.getFoldAt(row, column, 1); + if (fold) { + row = fold.start.row; + column = fold.start.column; + } + + this.$keepDesiredColumnOnChange = true; + this.lead.setPosition(row, column); + this.$keepDesiredColumnOnChange = false; + + if (!keepDesiredColumn) + this.$desiredColumn = null; + }; + this.moveCursorToScreen = function(row, column, keepDesiredColumn) { + var pos = this.session.screenToDocumentPosition(row, column); + this.moveCursorTo(pos.row, pos.column, keepDesiredColumn); + }; + this.detach = function() { + this.lead.detach(); + this.anchor.detach(); + this.session = this.doc = null; + } + + this.fromOrientedRange = function(range) { + this.setSelectionRange(range, range.cursor == range.start); + this.$desiredColumn = range.desiredColumn || this.$desiredColumn; + } + + this.toOrientedRange = function(range) { + var r = this.getRange(); + if (range) { + range.start.column = r.start.column; + range.start.row = r.start.row; + range.end.column = r.end.column; + range.end.row = r.end.row; + } else { + range = r; + } + + range.cursor = this.isBackwards() ? range.start : range.end; + range.desiredColumn = this.$desiredColumn; + return range; + } + this.getRangeOfMovements = function(func) { + var start = this.getCursor(); + try { + func.call(null, this); + var end = this.getCursor(); + return Range.fromPoints(start,end); + } catch(e) { + return Range.fromPoints(start,start); + } finally { + this.moveCursorToPosition(start); + } + } + + this.toJSON = function() { + if (this.rangeCount) { + var data = this.ranges.map(function(r) { + var r1 = r.clone(); + r1.isBackwards = r.cursor == r.start; + return r1; + }); + } else { + var data = this.getRange(); + data.isBackwards = this.isBackwards(); + } + return data; + }; + + this.fromJSON = function(data) { + if (data.start == undefined) { + if (this.rangeList) { + this.toSingleRange(data[0]); + for (var i = data.length; i--; ) { + var r = Range.fromPoints(data[i].start, data[i].end); + if (data.isBackwards) + r.cursor = r.start; + this.addRange(r, true); + } + return; + } else + data = data[0]; + } + if (this.rangeList) + this.toSingleRange(data); + this.setSelectionRange(data, data.isBackwards); + }; + + this.isEqual = function(data) { + if ((data.length || this.rangeCount) && data.length != this.rangeCount) + return false; + if (!data.length || !this.ranges) + return this.getRange().isEqual(data); + + for (var i = this.ranges.length; i--; ) { + if (!this.ranges[i].isEqual(data[i])) + return false + } + return true; + } + +}).call(Selection.prototype); + +exports.Selection = Selection; +}); + +ace.define('ace/range', ['require', 'exports', 'module' ], function(require, exports, module) { + +var comparePoints = function(p1, p2) { + return p1.row - p2.row || p1.column - p2.column; +}; +var Range = function(startRow, startColumn, endRow, endColumn) { + this.start = { + row: startRow, + column: startColumn + }; + + this.end = { + row: endRow, + column: endColumn + }; +}; + +(function() { + this.isEqual = function(range) { + return this.start.row === range.start.row && + this.end.row === range.end.row && + this.start.column === range.start.column && + this.end.column === range.end.column; + }; + this.toString = function() { + return ("Range: [" + this.start.row + "/" + this.start.column + + "] -> [" + this.end.row + "/" + this.end.column + "]"); + }; + + this.contains = function(row, column) { + return this.compare(row, column) == 0; + }; + this.compareRange = function(range) { + var cmp, + end = range.end, + start = range.start; + + cmp = this.compare(end.row, end.column); + if (cmp == 1) { + cmp = this.compare(start.row, start.column); + if (cmp == 1) { + return 2; + } else if (cmp == 0) { + return 1; + } else { + return 0; + } + } else if (cmp == -1) { + return -2; + } else { + cmp = this.compare(start.row, start.column); + if (cmp == -1) { + return -1; + } else if (cmp == 1) { + return 42; + } else { + return 0; + } + } + }; + this.comparePoint = function(p) { + return this.compare(p.row, p.column); + }; + this.containsRange = function(range) { + return this.comparePoint(range.start) == 0 && this.comparePoint(range.end) == 0; + }; + this.intersects = function(range) { + var cmp = this.compareRange(range); + return (cmp == -1 || cmp == 0 || cmp == 1); + }; + this.isEnd = function(row, column) { + return this.end.row == row && this.end.column == column; + }; + this.isStart = function(row, column) { + return this.start.row == row && this.start.column == column; + }; + this.setStart = function(row, column) { + if (typeof row == "object") { + this.start.column = row.column; + this.start.row = row.row; + } else { + this.start.row = row; + this.start.column = column; + } + }; + this.setEnd = function(row, column) { + if (typeof row == "object") { + this.end.column = row.column; + this.end.row = row.row; + } else { + this.end.row = row; + this.end.column = column; + } + }; + this.inside = function(row, column) { + if (this.compare(row, column) == 0) { + if (this.isEnd(row, column) || this.isStart(row, column)) { + return false; + } else { + return true; + } + } + return false; + }; + this.insideStart = function(row, column) { + if (this.compare(row, column) == 0) { + if (this.isEnd(row, column)) { + return false; + } else { + return true; + } + } + return false; + }; + this.insideEnd = function(row, column) { + if (this.compare(row, column) == 0) { + if (this.isStart(row, column)) { + return false; + } else { + return true; + } + } + return false; + }; + this.compare = function(row, column) { + if (!this.isMultiLine()) { + if (row === this.start.row) { + return column < this.start.column ? -1 : (column > this.end.column ? 1 : 0); + }; + } + + if (row < this.start.row) + return -1; + + if (row > this.end.row) + return 1; + + if (this.start.row === row) + return column >= this.start.column ? 0 : -1; + + if (this.end.row === row) + return column <= this.end.column ? 0 : 1; + + return 0; + }; + this.compareStart = function(row, column) { + if (this.start.row == row && this.start.column == column) { + return -1; + } else { + return this.compare(row, column); + } + }; + this.compareEnd = function(row, column) { + if (this.end.row == row && this.end.column == column) { + return 1; + } else { + return this.compare(row, column); + } + }; + this.compareInside = function(row, column) { + if (this.end.row == row && this.end.column == column) { + return 1; + } else if (this.start.row == row && this.start.column == column) { + return -1; + } else { + return this.compare(row, column); + } + }; + this.clipRows = function(firstRow, lastRow) { + if (this.end.row > lastRow) + var end = {row: lastRow + 1, column: 0}; + else if (this.end.row < firstRow) + var end = {row: firstRow, column: 0}; + + if (this.start.row > lastRow) + var start = {row: lastRow + 1, column: 0}; + else if (this.start.row < firstRow) + var start = {row: firstRow, column: 0}; + + return Range.fromPoints(start || this.start, end || this.end); + }; + this.extend = function(row, column) { + var cmp = this.compare(row, column); + + if (cmp == 0) + return this; + else if (cmp == -1) + var start = {row: row, column: column}; + else + var end = {row: row, column: column}; + + return Range.fromPoints(start || this.start, end || this.end); + }; + + this.isEmpty = function() { + return (this.start.row === this.end.row && this.start.column === this.end.column); + }; + this.isMultiLine = function() { + return (this.start.row !== this.end.row); + }; + this.clone = function() { + return Range.fromPoints(this.start, this.end); + }; + this.collapseRows = function() { + if (this.end.column == 0) + return new Range(this.start.row, 0, Math.max(this.start.row, this.end.row-1), 0) + else + return new Range(this.start.row, 0, this.end.row, 0) + }; + this.toScreenRange = function(session) { + var screenPosStart = session.documentToScreenPosition(this.start); + var screenPosEnd = session.documentToScreenPosition(this.end); + + return new Range( + screenPosStart.row, screenPosStart.column, + screenPosEnd.row, screenPosEnd.column + ); + }; + this.moveBy = function(row, column) { + this.start.row += row; + this.start.column += column; + this.end.row += row; + this.end.column += column; + }; + +}).call(Range.prototype); +Range.fromPoints = function(start, end) { + return new Range(start.row, start.column, end.row, end.column); +}; +Range.comparePoints = comparePoints; + +Range.comparePoints = function(p1, p2) { + return p1.row - p2.row || p1.column - p2.column; +}; + + +exports.Range = Range; +}); + +ace.define('ace/mode/text', ['require', 'exports', 'module' , 'ace/tokenizer', 'ace/mode/text_highlight_rules', 'ace/mode/behaviour', 'ace/unicode', 'ace/lib/lang', 'ace/token_iterator', 'ace/range'], function(require, exports, module) { + + +var Tokenizer = require("../tokenizer").Tokenizer; +var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules; +var Behaviour = require("./behaviour").Behaviour; +var unicode = require("../unicode"); +var lang = require("../lib/lang"); +var TokenIterator = require("../token_iterator").TokenIterator; +var Range = require("../range").Range; + +var Mode = function() { + this.HighlightRules = TextHighlightRules; + this.$behaviour = new Behaviour(); +}; + +(function() { + + this.tokenRe = new RegExp("^[" + + unicode.packages.L + + unicode.packages.Mn + unicode.packages.Mc + + unicode.packages.Nd + + unicode.packages.Pc + "\\$_]+", "g" + ); + + this.nonTokenRe = new RegExp("^(?:[^" + + unicode.packages.L + + unicode.packages.Mn + unicode.packages.Mc + + unicode.packages.Nd + + unicode.packages.Pc + "\\$_]|\\s])+", "g" + ); + + this.getTokenizer = function() { + if (!this.$tokenizer) { + this.$highlightRules = new this.HighlightRules(); + this.$tokenizer = new Tokenizer(this.$highlightRules.getRules()); + } + return this.$tokenizer; + }; + + this.lineCommentStart = ""; + this.blockComment = ""; + + this.toggleCommentLines = function(state, session, startRow, endRow) { + var doc = session.doc; + + var ignoreBlankLines = true; + var shouldRemove = true; + var minIndent = Infinity; + var tabSize = session.getTabSize(); + var insertAtTabStop = false; + + if (!this.lineCommentStart) { + if (!this.blockComment) + return false; + var lineCommentStart = this.blockComment.start; + var lineCommentEnd = this.blockComment.end; + var regexpStart = new RegExp("^(\\s*)(?:" + lang.escapeRegExp(lineCommentStart) + ")"); + var regexpEnd = new RegExp("(?:" + lang.escapeRegExp(lineCommentEnd) + ")\\s*$"); + + var comment = function(line, i) { + if (testRemove(line, i)) + return; + if (!ignoreBlankLines || /\S/.test(line)) { + doc.insertInLine({row: i, column: line.length}, lineCommentEnd); + doc.insertInLine({row: i, column: minIndent}, lineCommentStart); + } + }; + + var uncomment = function(line, i) { + var m; + if (m = line.match(regexpEnd)) + doc.removeInLine(i, line.length - m[0].length, line.length); + if (m = line.match(regexpStart)) + doc.removeInLine(i, m[1].length, m[0].length); + }; + + var testRemove = function(line, row) { + if (regexpStart.test(line)) + return true; + var tokens = session.getTokens(row); + for (var i = 0; i < tokens.length; i++) { + if (tokens[i].type === 'comment') + return true; + } + }; + } else { + if (Array.isArray(this.lineCommentStart)) { + var regexpStart = this.lineCommentStart.map(lang.escapeRegExp).join("|"); + var lineCommentStart = this.lineCommentStart[0]; + } else { + var regexpStart = lang.escapeRegExp(this.lineCommentStart); + var lineCommentStart = this.lineCommentStart; + } + regexpStart = new RegExp("^(\\s*)(?:" + regexpStart + ") ?"); + + insertAtTabStop = session.getUseSoftTabs(); + + var uncomment = function(line, i) { + var m = line.match(regexpStart); + if (!m) return; + var start = m[1].length, end = m[0].length; + if (!shouldInsertSpace(line, start, end) && m[0][end - 1] == " ") + end--; + doc.removeInLine(i, start, end); + }; + var commentWithSpace = lineCommentStart + " "; + var comment = function(line, i) { + if (!ignoreBlankLines || /\S/.test(line)) { + if (shouldInsertSpace(line, minIndent, minIndent)) + doc.insertInLine({row: i, column: minIndent}, commentWithSpace); + else + doc.insertInLine({row: i, column: minIndent}, lineCommentStart); + } + }; + var testRemove = function(line, i) { + return regexpStart.test(line); + }; + + var shouldInsertSpace = function(line, before, after) { + var spaces = 0; + while (before-- && line.charAt(before) == " ") + spaces++; + if (spaces % tabSize != 0) + return false; + var spaces = 0; + while (line.charAt(after++) == " ") + spaces++; + if (tabSize > 2) + return spaces % tabSize != tabSize - 1; + else + return spaces % tabSize == 0; + return true; + }; + } + + function iter(fun) { + for (var i = startRow; i <= endRow; i++) + fun(doc.getLine(i), i); + } + + + var minEmptyLength = Infinity; + iter(function(line, i) { + var indent = line.search(/\S/); + if (indent !== -1) { + if (indent < minIndent) + minIndent = indent; + if (shouldRemove && !testRemove(line, i)) + shouldRemove = false; + } else if (minEmptyLength > line.length) { + minEmptyLength = line.length; + } + }); + + if (minIndent == Infinity) { + minIndent = minEmptyLength; + ignoreBlankLines = false; + shouldRemove = false; + } + + if (insertAtTabStop && minIndent % tabSize != 0) + minIndent = Math.floor(minIndent / tabSize) * tabSize; + + iter(shouldRemove ? uncomment : comment); + }; + + this.toggleBlockComment = function(state, session, range, cursor) { + var comment = this.blockComment; + if (!comment) + return; + if (!comment.start && comment[0]) + comment = comment[0]; + + var iterator = new TokenIterator(session, cursor.row, cursor.column); + var token = iterator.getCurrentToken(); + + var sel = session.selection; + var initialRange = session.selection.toOrientedRange(); + var startRow, colDiff; + + if (token && /comment/.test(token.type)) { + var startRange, endRange; + while (token && /comment/.test(token.type)) { + var i = token.value.indexOf(comment.start); + if (i != -1) { + var row = iterator.getCurrentTokenRow(); + var column = iterator.getCurrentTokenColumn() + i; + startRange = new Range(row, column, row, column + comment.start.length); + break; + } + token = iterator.stepBackward(); + } + + var iterator = new TokenIterator(session, cursor.row, cursor.column); + var token = iterator.getCurrentToken(); + while (token && /comment/.test(token.type)) { + var i = token.value.indexOf(comment.end); + if (i != -1) { + var row = iterator.getCurrentTokenRow(); + var column = iterator.getCurrentTokenColumn() + i; + endRange = new Range(row, column, row, column + comment.end.length); + break; + } + token = iterator.stepForward(); + } + if (endRange) + session.remove(endRange); + if (startRange) { + session.remove(startRange); + startRow = startRange.start.row; + colDiff = -comment.start.length; + } + } else { + colDiff = comment.start.length; + startRow = range.start.row; + session.insert(range.end, comment.end); + session.insert(range.start, comment.start); + } + if (initialRange.start.row == startRow) + initialRange.start.column += colDiff; + if (initialRange.end.row == startRow) + initialRange.end.column += colDiff; + session.selection.fromOrientedRange(initialRange); + }; + + this.getNextLineIndent = function(state, line, tab) { + return this.$getIndent(line); + }; + + this.checkOutdent = function(state, line, input) { + return false; + }; + + this.autoOutdent = function(state, doc, row) { + }; + + this.$getIndent = function(line) { + return line.match(/^\s*/)[0]; + }; + + this.createWorker = function(session) { + return null; + }; + + this.createModeDelegates = function (mapping) { + this.$embeds = []; + this.$modes = {}; + for (var i in mapping) { + if (mapping[i]) { + this.$embeds.push(i); + this.$modes[i] = new mapping[i](); + } + } + + var delegations = ['toggleBlockComment', 'toggleCommentLines', 'getNextLineIndent', + 'checkOutdent', 'autoOutdent', 'transformAction', 'getCompletions']; + + for (var i = 0; i < delegations.length; i++) { + (function(scope) { + var functionName = delegations[i]; + var defaultHandler = scope[functionName]; + scope[delegations[i]] = function() { + return this.$delegator(functionName, arguments, defaultHandler); + }; + } (this)); + } + }; + + this.$delegator = function(method, args, defaultHandler) { + var state = args[0]; + if (typeof state != "string") + state = state[0]; + for (var i = 0; i < this.$embeds.length; i++) { + if (!this.$modes[this.$embeds[i]]) continue; + + var split = state.split(this.$embeds[i]); + if (!split[0] && split[1]) { + args[0] = split[1]; + var mode = this.$modes[this.$embeds[i]]; + return mode[method].apply(mode, args); + } + } + var ret = defaultHandler.apply(this, args); + return defaultHandler ? ret : undefined; + }; + + this.transformAction = function(state, action, editor, session, param) { + if (this.$behaviour) { + var behaviours = this.$behaviour.getBehaviours(); + for (var key in behaviours) { + if (behaviours[key][action]) { + var ret = behaviours[key][action].apply(this, arguments); + if (ret) { + return ret; + } + } + } + } + }; + + this.getKeywords = function(append) { + if (!this.completionKeywords) { + var rules = this.$tokenizer.rules; + var completionKeywords = []; + for (var rule in rules) { + var ruleItr = rules[rule]; + for (var r = 0, l = ruleItr.length; r < l; r++) { + if (typeof ruleItr[r].token === "string") { + if (/keyword|support|storage/.test(ruleItr[r].token)) + completionKeywords.push(ruleItr[r].regex); + } + else if (typeof ruleItr[r].token === "object") { + for (var a = 0, aLength = ruleItr[r].token.length; a < aLength; a++) { + if (/keyword|support|storage/.test(ruleItr[r].token[a])) { + var rule = ruleItr[r].regex.match(/\(.+?\)/g)[a]; + completionKeywords.push(rule.substr(1, rule.length - 2)); + } + } + } + } + } + this.completionKeywords = completionKeywords; + } + if (!append) + return this.$keywordList; + return completionKeywords.concat(this.$keywordList || []); + }; + + this.$createKeywordList = function() { + if (!this.$highlightRules) + this.getTokenizer(); + return this.$keywordList = this.$highlightRules.$keywordList || []; + }; + + this.getCompletions = function(state, session, pos, prefix) { + var keywords = this.$keywordList || this.$createKeywordList(); + return keywords.map(function(word) { + return { + name: word, + value: word, + score: 0, + meta: "keyword" + }; + }); + }; + + this.$id = "ace/mode/text"; +}).call(Mode.prototype); + +exports.Mode = Mode; +}); + +ace.define('ace/tokenizer', ['require', 'exports', 'module' ], function(require, exports, module) { +var MAX_TOKEN_COUNT = 1000; +var Tokenizer = function(rules) { + this.states = rules; + + this.regExps = {}; + this.matchMappings = {}; + for (var key in this.states) { + var state = this.states[key]; + var ruleRegExps = []; + var matchTotal = 0; + var mapping = this.matchMappings[key] = {defaultToken: "text"}; + var flag = "g"; + + var splitterRurles = []; + for (var i = 0; i < state.length; i++) { + var rule = state[i]; + if (rule.defaultToken) + mapping.defaultToken = rule.defaultToken; + if (rule.caseInsensitive) + flag = "gi"; + if (rule.regex == null) + continue; + + if (rule.regex instanceof RegExp) + rule.regex = rule.regex.toString().slice(1, -1); + var adjustedregex = rule.regex; + var matchcount = new RegExp("(?:(" + adjustedregex + ")|(.))").exec("a").length - 2; + if (Array.isArray(rule.token)) { + if (rule.token.length == 1 || matchcount == 1) { + rule.token = rule.token[0]; + } else if (matchcount - 1 != rule.token.length) { + throw new Error("number of classes and regexp groups in '" + + rule.token + "'\n'" + rule.regex + "' doesn't match\n" + + (matchcount - 1) + "!=" + rule.token.length); + } else { + rule.tokenArray = rule.token; + rule.token = null; + rule.onMatch = this.$arrayTokens; + } + } else if (typeof rule.token == "function" && !rule.onMatch) { + if (matchcount > 1) + rule.onMatch = this.$applyToken; + else + rule.onMatch = rule.token; + } + + if (matchcount > 1) { + if (/\\\d/.test(rule.regex)) { + adjustedregex = rule.regex.replace(/\\([0-9]+)/g, function(match, digit) { + return "\\" + (parseInt(digit, 10) + matchTotal + 1); + }); + } else { + matchcount = 1; + adjustedregex = this.removeCapturingGroups(rule.regex); + } + if (!rule.splitRegex && typeof rule.token != "string") + splitterRurles.push(rule); // flag will be known only at the very end + } + + mapping[matchTotal] = i; + matchTotal += matchcount; + + ruleRegExps.push(adjustedregex); + if (!rule.onMatch) + rule.onMatch = null; + } + + splitterRurles.forEach(function(rule) { + rule.splitRegex = this.createSplitterRegexp(rule.regex, flag); + }, this); + + this.regExps[key] = new RegExp("(" + ruleRegExps.join(")|(") + ")|($)", flag); + } +}; + +(function() { + this.$setMaxTokenCount = function(m) { + MAX_TOKEN_COUNT = m | 0; + }; + + this.$applyToken = function(str) { + var values = this.splitRegex.exec(str).slice(1); + var types = this.token.apply(this, values); + if (typeof types === "string") + return [{type: types, value: str}]; + + var tokens = []; + for (var i = 0, l = types.length; i < l; i++) { + if (values[i]) + tokens[tokens.length] = { + type: types[i], + value: values[i] + }; + } + return tokens; + }, + + this.$arrayTokens = function(str) { + if (!str) + return []; + var values = this.splitRegex.exec(str); + if (!values) + return "text"; + var tokens = []; + var types = this.tokenArray; + for (var i = 0, l = types.length; i < l; i++) { + if (values[i + 1]) + tokens[tokens.length] = { + type: types[i], + value: values[i + 1] + }; + } + return tokens; + }; + + this.removeCapturingGroups = function(src) { + var r = src.replace( + /\[(?:\\.|[^\]])*?\]|\\.|\(\?[:=!]|(\()/g, + function(x, y) {return y ? "(?:" : x;} + ); + return r; + }; + + this.createSplitterRegexp = function(src, flag) { + if (src.indexOf("(?=") != -1) { + var stack = 0; + var inChClass = false; + var lastCapture = {}; + src.replace(/(\\.)|(\((?:\?[=!])?)|(\))|([\[\]])/g, function( + m, esc, parenOpen, parenClose, square, index + ) { + if (inChClass) { + inChClass = square != "]"; + } else if (square) { + inChClass = true; + } else if (parenClose) { + if (stack == lastCapture.stack) { + lastCapture.end = index+1; + lastCapture.stack = -1; + } + stack--; + } else if (parenOpen) { + stack++; + if (parenOpen.length != 1) { + lastCapture.stack = stack + lastCapture.start = index; + } + } + return m; + }); + + if (lastCapture.end != null && /^\)*$/.test(src.substr(lastCapture.end))) + src = src.substring(0, lastCapture.start) + src.substr(lastCapture.end); + } + return new RegExp(src, (flag||"").replace("g", "")); + }; + this.getLineTokens = function(line, startState) { + if (startState && typeof startState != "string") { + var stack = startState.slice(0); + startState = stack[0]; + } else + var stack = []; + + var currentState = startState || "start"; + var state = this.states[currentState]; + if (!state) { + currentState = "start"; + state = this.states[currentState]; + } + var mapping = this.matchMappings[currentState]; + var re = this.regExps[currentState]; + re.lastIndex = 0; + + var match, tokens = []; + var lastIndex = 0; + + var token = {type: null, value: ""}; + + while (match = re.exec(line)) { + var type = mapping.defaultToken; + var rule = null; + var value = match[0]; + var index = re.lastIndex; + + if (index - value.length > lastIndex) { + var skipped = line.substring(lastIndex, index - value.length); + if (token.type == type) { + token.value += skipped; + } else { + if (token.type) + tokens.push(token); + token = {type: type, value: skipped}; + } + } + + for (var i = 0; i < match.length-2; i++) { + if (match[i + 1] === undefined) + continue; + + rule = state[mapping[i]]; + + if (rule.onMatch) + type = rule.onMatch(value, currentState, stack); + else + type = rule.token; + + if (rule.next) { + if (typeof rule.next == "string") + currentState = rule.next; + else + currentState = rule.next(currentState, stack); + + state = this.states[currentState]; + if (!state) { + window.console && console.error && console.error(currentState, "doesn't exist"); + currentState = "start"; + state = this.states[currentState]; + } + mapping = this.matchMappings[currentState]; + lastIndex = index; + re = this.regExps[currentState]; + re.lastIndex = index; + } + break; + } + + if (value) { + if (typeof type == "string") { + if ((!rule || rule.merge !== false) && token.type === type) { + token.value += value; + } else { + if (token.type) + tokens.push(token); + token = {type: type, value: value}; + } + } else if (type) { + if (token.type) + tokens.push(token); + token = {type: null, value: ""}; + for (var i = 0; i < type.length; i++) + tokens.push(type[i]); + } + } + + if (lastIndex == line.length) + break; + + lastIndex = index; + + if (tokens.length > MAX_TOKEN_COUNT) { + while (lastIndex < line.length) { + if (token.type) + tokens.push(token); + token = { + value: line.substring(lastIndex, lastIndex += 2000), + type: "overflow" + }; + } + currentState = "start"; + stack = []; + break; + } + } + + if (token.type) + tokens.push(token); + + if (stack.length > 1) { + if (stack[0] !== currentState) + stack.unshift(currentState); + } + return { + tokens : tokens, + state : stack.length ? stack : currentState + }; + }; + +}).call(Tokenizer.prototype); + +exports.Tokenizer = Tokenizer; +}); + +ace.define('ace/mode/text_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/lang'], function(require, exports, module) { + + +var lang = require("../lib/lang"); + +var TextHighlightRules = function() { + + this.$rules = { + "start" : [{ + token : "empty_line", + regex : '^$' + }, { + defaultToken : "text" + }] + }; +}; + +(function() { + + this.addRules = function(rules, prefix) { + if (!prefix) { + for (var key in rules) + this.$rules[key] = rules[key]; + return; + } + for (var key in rules) { + var state = rules[key]; + for (var i = 0; i < state.length; i++) { + var rule = state[i]; + if (rule.next) { + if (typeof rule.next != "string") { + if (rule.nextState && rule.nextState.indexOf(prefix) !== 0) + rule.nextState = prefix + rule.nextState; + } else { + if (rule.next.indexOf(prefix) !== 0) + rule.next = prefix + rule.next; + } + + } + } + this.$rules[prefix + key] = state; + } + }; + + this.getRules = function() { + return this.$rules; + }; + + this.embedRules = function (HighlightRules, prefix, escapeRules, states, append) { + var embedRules = typeof HighlightRules == "function" + ? new HighlightRules().getRules() + : HighlightRules; + if (states) { + for (var i = 0; i < states.length; i++) + states[i] = prefix + states[i]; + } else { + states = []; + for (var key in embedRules) + states.push(prefix + key); + } + + this.addRules(embedRules, prefix); + + if (escapeRules) { + var addRules = Array.prototype[append ? "push" : "unshift"]; + for (var i = 0; i < states.length; i++) + addRules.apply(this.$rules[states[i]], lang.deepCopy(escapeRules)); + } + + if (!this.$embeds) + this.$embeds = []; + this.$embeds.push(prefix); + }; + + this.getEmbeds = function() { + return this.$embeds; + }; + + var pushState = function(currentState, stack) { + if (currentState != "start" || stack.length) + stack.unshift(this.nextState, currentState); + return this.nextState; + }; + var popState = function(currentState, stack) { + stack.shift(); + return stack.shift() || "start"; + }; + + this.normalizeRules = function() { + var id = 0; + var rules = this.$rules; + function processState(key) { + var state = rules[key]; + state.processed = true; + for (var i = 0; i < state.length; i++) { + var rule = state[i]; + if (!rule.regex && rule.start) { + rule.regex = rule.start; + if (!rule.next) + rule.next = []; + rule.next.push({ + defaultToken: rule.token + }, { + token: rule.token + ".end", + regex: rule.end || rule.start, + next: "pop" + }); + rule.token = rule.token + ".start"; + rule.push = true; + } + var next = rule.next || rule.push; + if (next && Array.isArray(next)) { + var stateName = rule.stateName; + if (!stateName) { + stateName = rule.token; + if (typeof stateName != "string") + stateName = stateName[0] || ""; + if (rules[stateName]) + stateName += id++; + } + rules[stateName] = next; + rule.next = stateName; + processState(stateName); + } else if (next == "pop") { + rule.next = popState; + } + + if (rule.push) { + rule.nextState = rule.next || rule.push; + rule.next = pushState; + delete rule.push; + } + + if (rule.rules) { + for (var r in rule.rules) { + if (rules[r]) { + if (rules[r].push) + rules[r].push.apply(rules[r], rule.rules[r]); + } else { + rules[r] = rule.rules[r]; + } + } + } + if (rule.include || typeof rule == "string") { + var includeName = rule.include || rule; + var toInsert = rules[includeName]; + } else if (Array.isArray(rule)) + toInsert = rule; + + if (toInsert) { + var args = [i, 1].concat(toInsert); + if (rule.noEscape) + args = args.filter(function(x) {return !x.next;}); + state.splice.apply(state, args); + i--; + toInsert = null + } + + if (rule.keywordMap) { + rule.token = this.createKeywordMapper( + rule.keywordMap, rule.defaultToken || "text", rule.caseInsensitive + ); + delete rule.defaultToken; + } + } + }; + Object.keys(rules).forEach(processState, this); + }; + + this.createKeywordMapper = function(map, defaultToken, ignoreCase, splitChar) { + var keywords = Object.create(null); + Object.keys(map).forEach(function(className) { + var a = map[className]; + if (ignoreCase) + a = a.toLowerCase(); + var list = a.split(splitChar || "|"); + for (var i = list.length; i--; ) + keywords[list[i]] = className; + }); + if (Object.getPrototypeOf(keywords)) { + keywords.__proto__ = null; + } + this.$keywordList = Object.keys(keywords); + map = null; + return ignoreCase + ? function(value) {return keywords[value.toLowerCase()] || defaultToken } + : function(value) {return keywords[value] || defaultToken }; + } + + this.getKeywords = function() { + return this.$keywords; + }; + +}).call(TextHighlightRules.prototype); + +exports.TextHighlightRules = TextHighlightRules; +}); + +ace.define('ace/mode/behaviour', ['require', 'exports', 'module' ], function(require, exports, module) { + + +var Behaviour = function() { + this.$behaviours = {}; +}; + +(function () { + + this.add = function (name, action, callback) { + switch (undefined) { + case this.$behaviours: + this.$behaviours = {}; + case this.$behaviours[name]: + this.$behaviours[name] = {}; + } + this.$behaviours[name][action] = callback; + } + + this.addBehaviours = function (behaviours) { + for (var key in behaviours) { + for (var action in behaviours[key]) { + this.add(key, action, behaviours[key][action]); + } + } + } + + this.remove = function (name) { + if (this.$behaviours && this.$behaviours[name]) { + delete this.$behaviours[name]; + } + } + + this.inherit = function (mode, filter) { + if (typeof mode === "function") { + var behaviours = new mode().getBehaviours(filter); + } else { + var behaviours = mode.getBehaviours(filter); + } + this.addBehaviours(behaviours); + } + + this.getBehaviours = function (filter) { + if (!filter) { + return this.$behaviours; + } else { + var ret = {} + for (var i = 0; i < filter.length; i++) { + if (this.$behaviours[filter[i]]) { + ret[filter[i]] = this.$behaviours[filter[i]]; + } + } + return ret; + } + } + +}).call(Behaviour.prototype); + +exports.Behaviour = Behaviour; +}); +ace.define('ace/unicode', ['require', 'exports', 'module' ], function(require, exports, module) { +exports.packages = {}; + +addUnicodePackage({ + L: "0041-005A0061-007A00AA00B500BA00C0-00D600D8-00F600F8-02C102C6-02D102E0-02E402EC02EE0370-037403760377037A-037D03860388-038A038C038E-03A103A3-03F503F7-0481048A-05250531-055605590561-058705D0-05EA05F0-05F20621-064A066E066F0671-06D306D506E506E606EE06EF06FA-06FC06FF07100712-072F074D-07A507B107CA-07EA07F407F507FA0800-0815081A082408280904-0939093D09500958-0961097109720979-097F0985-098C098F09900993-09A809AA-09B009B209B6-09B909BD09CE09DC09DD09DF-09E109F009F10A05-0A0A0A0F0A100A13-0A280A2A-0A300A320A330A350A360A380A390A59-0A5C0A5E0A72-0A740A85-0A8D0A8F-0A910A93-0AA80AAA-0AB00AB20AB30AB5-0AB90ABD0AD00AE00AE10B05-0B0C0B0F0B100B13-0B280B2A-0B300B320B330B35-0B390B3D0B5C0B5D0B5F-0B610B710B830B85-0B8A0B8E-0B900B92-0B950B990B9A0B9C0B9E0B9F0BA30BA40BA8-0BAA0BAE-0BB90BD00C05-0C0C0C0E-0C100C12-0C280C2A-0C330C35-0C390C3D0C580C590C600C610C85-0C8C0C8E-0C900C92-0CA80CAA-0CB30CB5-0CB90CBD0CDE0CE00CE10D05-0D0C0D0E-0D100D12-0D280D2A-0D390D3D0D600D610D7A-0D7F0D85-0D960D9A-0DB10DB3-0DBB0DBD0DC0-0DC60E01-0E300E320E330E40-0E460E810E820E840E870E880E8A0E8D0E94-0E970E99-0E9F0EA1-0EA30EA50EA70EAA0EAB0EAD-0EB00EB20EB30EBD0EC0-0EC40EC60EDC0EDD0F000F40-0F470F49-0F6C0F88-0F8B1000-102A103F1050-1055105A-105D106110651066106E-10701075-1081108E10A0-10C510D0-10FA10FC1100-1248124A-124D1250-12561258125A-125D1260-1288128A-128D1290-12B012B2-12B512B8-12BE12C012C2-12C512C8-12D612D8-13101312-13151318-135A1380-138F13A0-13F41401-166C166F-167F1681-169A16A0-16EA1700-170C170E-17111720-17311740-17511760-176C176E-17701780-17B317D717DC1820-18771880-18A818AA18B0-18F51900-191C1950-196D1970-19741980-19AB19C1-19C71A00-1A161A20-1A541AA71B05-1B331B45-1B4B1B83-1BA01BAE1BAF1C00-1C231C4D-1C4F1C5A-1C7D1CE9-1CEC1CEE-1CF11D00-1DBF1E00-1F151F18-1F1D1F20-1F451F48-1F4D1F50-1F571F591F5B1F5D1F5F-1F7D1F80-1FB41FB6-1FBC1FBE1FC2-1FC41FC6-1FCC1FD0-1FD31FD6-1FDB1FE0-1FEC1FF2-1FF41FF6-1FFC2071207F2090-209421022107210A-211321152119-211D212421262128212A-212D212F-2139213C-213F2145-2149214E218321842C00-2C2E2C30-2C5E2C60-2CE42CEB-2CEE2D00-2D252D30-2D652D6F2D80-2D962DA0-2DA62DA8-2DAE2DB0-2DB62DB8-2DBE2DC0-2DC62DC8-2DCE2DD0-2DD62DD8-2DDE2E2F300530063031-3035303B303C3041-3096309D-309F30A1-30FA30FC-30FF3105-312D3131-318E31A0-31B731F0-31FF3400-4DB54E00-9FCBA000-A48CA4D0-A4FDA500-A60CA610-A61FA62AA62BA640-A65FA662-A66EA67F-A697A6A0-A6E5A717-A71FA722-A788A78BA78CA7FB-A801A803-A805A807-A80AA80C-A822A840-A873A882-A8B3A8F2-A8F7A8FBA90A-A925A930-A946A960-A97CA984-A9B2A9CFAA00-AA28AA40-AA42AA44-AA4BAA60-AA76AA7AAA80-AAAFAAB1AAB5AAB6AAB9-AABDAAC0AAC2AADB-AADDABC0-ABE2AC00-D7A3D7B0-D7C6D7CB-D7FBF900-FA2DFA30-FA6DFA70-FAD9FB00-FB06FB13-FB17FB1DFB1F-FB28FB2A-FB36FB38-FB3CFB3EFB40FB41FB43FB44FB46-FBB1FBD3-FD3DFD50-FD8FFD92-FDC7FDF0-FDFBFE70-FE74FE76-FEFCFF21-FF3AFF41-FF5AFF66-FFBEFFC2-FFC7FFCA-FFCFFFD2-FFD7FFDA-FFDC", + Ll: "0061-007A00AA00B500BA00DF-00F600F8-00FF01010103010501070109010B010D010F01110113011501170119011B011D011F01210123012501270129012B012D012F01310133013501370138013A013C013E014001420144014601480149014B014D014F01510153015501570159015B015D015F01610163016501670169016B016D016F0171017301750177017A017C017E-0180018301850188018C018D019201950199-019B019E01A101A301A501A801AA01AB01AD01B001B401B601B901BA01BD-01BF01C601C901CC01CE01D001D201D401D601D801DA01DC01DD01DF01E101E301E501E701E901EB01ED01EF01F001F301F501F901FB01FD01FF02010203020502070209020B020D020F02110213021502170219021B021D021F02210223022502270229022B022D022F02310233-0239023C023F0240024202470249024B024D024F-02930295-02AF037103730377037B-037D039003AC-03CE03D003D103D5-03D703D903DB03DD03DF03E103E303E503E703E903EB03ED03EF-03F303F503F803FB03FC0430-045F04610463046504670469046B046D046F04710473047504770479047B047D047F0481048B048D048F04910493049504970499049B049D049F04A104A304A504A704A904AB04AD04AF04B104B304B504B704B904BB04BD04BF04C204C404C604C804CA04CC04CE04CF04D104D304D504D704D904DB04DD04DF04E104E304E504E704E904EB04ED04EF04F104F304F504F704F904FB04FD04FF05010503050505070509050B050D050F05110513051505170519051B051D051F0521052305250561-05871D00-1D2B1D62-1D771D79-1D9A1E011E031E051E071E091E0B1E0D1E0F1E111E131E151E171E191E1B1E1D1E1F1E211E231E251E271E291E2B1E2D1E2F1E311E331E351E371E391E3B1E3D1E3F1E411E431E451E471E491E4B1E4D1E4F1E511E531E551E571E591E5B1E5D1E5F1E611E631E651E671E691E6B1E6D1E6F1E711E731E751E771E791E7B1E7D1E7F1E811E831E851E871E891E8B1E8D1E8F1E911E931E95-1E9D1E9F1EA11EA31EA51EA71EA91EAB1EAD1EAF1EB11EB31EB51EB71EB91EBB1EBD1EBF1EC11EC31EC51EC71EC91ECB1ECD1ECF1ED11ED31ED51ED71ED91EDB1EDD1EDF1EE11EE31EE51EE71EE91EEB1EED1EEF1EF11EF31EF51EF71EF91EFB1EFD1EFF-1F071F10-1F151F20-1F271F30-1F371F40-1F451F50-1F571F60-1F671F70-1F7D1F80-1F871F90-1F971FA0-1FA71FB0-1FB41FB61FB71FBE1FC2-1FC41FC61FC71FD0-1FD31FD61FD71FE0-1FE71FF2-1FF41FF61FF7210A210E210F2113212F21342139213C213D2146-2149214E21842C30-2C5E2C612C652C662C682C6A2C6C2C712C732C742C76-2C7C2C812C832C852C872C892C8B2C8D2C8F2C912C932C952C972C992C9B2C9D2C9F2CA12CA32CA52CA72CA92CAB2CAD2CAF2CB12CB32CB52CB72CB92CBB2CBD2CBF2CC12CC32CC52CC72CC92CCB2CCD2CCF2CD12CD32CD52CD72CD92CDB2CDD2CDF2CE12CE32CE42CEC2CEE2D00-2D25A641A643A645A647A649A64BA64DA64FA651A653A655A657A659A65BA65DA65FA663A665A667A669A66BA66DA681A683A685A687A689A68BA68DA68FA691A693A695A697A723A725A727A729A72BA72DA72F-A731A733A735A737A739A73BA73DA73FA741A743A745A747A749A74BA74DA74FA751A753A755A757A759A75BA75DA75FA761A763A765A767A769A76BA76DA76FA771-A778A77AA77CA77FA781A783A785A787A78CFB00-FB06FB13-FB17FF41-FF5A", + Lu: "0041-005A00C0-00D600D8-00DE01000102010401060108010A010C010E01100112011401160118011A011C011E01200122012401260128012A012C012E01300132013401360139013B013D013F0141014301450147014A014C014E01500152015401560158015A015C015E01600162016401660168016A016C016E017001720174017601780179017B017D018101820184018601870189-018B018E-0191019301940196-0198019C019D019F01A001A201A401A601A701A901AC01AE01AF01B1-01B301B501B701B801BC01C401C701CA01CD01CF01D101D301D501D701D901DB01DE01E001E201E401E601E801EA01EC01EE01F101F401F6-01F801FA01FC01FE02000202020402060208020A020C020E02100212021402160218021A021C021E02200222022402260228022A022C022E02300232023A023B023D023E02410243-02460248024A024C024E03700372037603860388-038A038C038E038F0391-03A103A3-03AB03CF03D2-03D403D803DA03DC03DE03E003E203E403E603E803EA03EC03EE03F403F703F903FA03FD-042F04600462046404660468046A046C046E04700472047404760478047A047C047E0480048A048C048E04900492049404960498049A049C049E04A004A204A404A604A804AA04AC04AE04B004B204B404B604B804BA04BC04BE04C004C104C304C504C704C904CB04CD04D004D204D404D604D804DA04DC04DE04E004E204E404E604E804EA04EC04EE04F004F204F404F604F804FA04FC04FE05000502050405060508050A050C050E05100512051405160518051A051C051E0520052205240531-055610A0-10C51E001E021E041E061E081E0A1E0C1E0E1E101E121E141E161E181E1A1E1C1E1E1E201E221E241E261E281E2A1E2C1E2E1E301E321E341E361E381E3A1E3C1E3E1E401E421E441E461E481E4A1E4C1E4E1E501E521E541E561E581E5A1E5C1E5E1E601E621E641E661E681E6A1E6C1E6E1E701E721E741E761E781E7A1E7C1E7E1E801E821E841E861E881E8A1E8C1E8E1E901E921E941E9E1EA01EA21EA41EA61EA81EAA1EAC1EAE1EB01EB21EB41EB61EB81EBA1EBC1EBE1EC01EC21EC41EC61EC81ECA1ECC1ECE1ED01ED21ED41ED61ED81EDA1EDC1EDE1EE01EE21EE41EE61EE81EEA1EEC1EEE1EF01EF21EF41EF61EF81EFA1EFC1EFE1F08-1F0F1F18-1F1D1F28-1F2F1F38-1F3F1F48-1F4D1F591F5B1F5D1F5F1F68-1F6F1FB8-1FBB1FC8-1FCB1FD8-1FDB1FE8-1FEC1FF8-1FFB21022107210B-210D2110-211221152119-211D212421262128212A-212D2130-2133213E213F214521832C00-2C2E2C602C62-2C642C672C692C6B2C6D-2C702C722C752C7E-2C802C822C842C862C882C8A2C8C2C8E2C902C922C942C962C982C9A2C9C2C9E2CA02CA22CA42CA62CA82CAA2CAC2CAE2CB02CB22CB42CB62CB82CBA2CBC2CBE2CC02CC22CC42CC62CC82CCA2CCC2CCE2CD02CD22CD42CD62CD82CDA2CDC2CDE2CE02CE22CEB2CEDA640A642A644A646A648A64AA64CA64EA650A652A654A656A658A65AA65CA65EA662A664A666A668A66AA66CA680A682A684A686A688A68AA68CA68EA690A692A694A696A722A724A726A728A72AA72CA72EA732A734A736A738A73AA73CA73EA740A742A744A746A748A74AA74CA74EA750A752A754A756A758A75AA75CA75EA760A762A764A766A768A76AA76CA76EA779A77BA77DA77EA780A782A784A786A78BFF21-FF3A", + Lt: "01C501C801CB01F21F88-1F8F1F98-1F9F1FA8-1FAF1FBC1FCC1FFC", + Lm: "02B0-02C102C6-02D102E0-02E402EC02EE0374037A0559064006E506E607F407F507FA081A0824082809710E460EC610FC17D718431AA71C78-1C7D1D2C-1D611D781D9B-1DBF2071207F2090-20942C7D2D6F2E2F30053031-3035303B309D309E30FC-30FEA015A4F8-A4FDA60CA67FA717-A71FA770A788A9CFAA70AADDFF70FF9EFF9F", + Lo: "01BB01C0-01C3029405D0-05EA05F0-05F20621-063F0641-064A066E066F0671-06D306D506EE06EF06FA-06FC06FF07100712-072F074D-07A507B107CA-07EA0800-08150904-0939093D09500958-096109720979-097F0985-098C098F09900993-09A809AA-09B009B209B6-09B909BD09CE09DC09DD09DF-09E109F009F10A05-0A0A0A0F0A100A13-0A280A2A-0A300A320A330A350A360A380A390A59-0A5C0A5E0A72-0A740A85-0A8D0A8F-0A910A93-0AA80AAA-0AB00AB20AB30AB5-0AB90ABD0AD00AE00AE10B05-0B0C0B0F0B100B13-0B280B2A-0B300B320B330B35-0B390B3D0B5C0B5D0B5F-0B610B710B830B85-0B8A0B8E-0B900B92-0B950B990B9A0B9C0B9E0B9F0BA30BA40BA8-0BAA0BAE-0BB90BD00C05-0C0C0C0E-0C100C12-0C280C2A-0C330C35-0C390C3D0C580C590C600C610C85-0C8C0C8E-0C900C92-0CA80CAA-0CB30CB5-0CB90CBD0CDE0CE00CE10D05-0D0C0D0E-0D100D12-0D280D2A-0D390D3D0D600D610D7A-0D7F0D85-0D960D9A-0DB10DB3-0DBB0DBD0DC0-0DC60E01-0E300E320E330E40-0E450E810E820E840E870E880E8A0E8D0E94-0E970E99-0E9F0EA1-0EA30EA50EA70EAA0EAB0EAD-0EB00EB20EB30EBD0EC0-0EC40EDC0EDD0F000F40-0F470F49-0F6C0F88-0F8B1000-102A103F1050-1055105A-105D106110651066106E-10701075-1081108E10D0-10FA1100-1248124A-124D1250-12561258125A-125D1260-1288128A-128D1290-12B012B2-12B512B8-12BE12C012C2-12C512C8-12D612D8-13101312-13151318-135A1380-138F13A0-13F41401-166C166F-167F1681-169A16A0-16EA1700-170C170E-17111720-17311740-17511760-176C176E-17701780-17B317DC1820-18421844-18771880-18A818AA18B0-18F51900-191C1950-196D1970-19741980-19AB19C1-19C71A00-1A161A20-1A541B05-1B331B45-1B4B1B83-1BA01BAE1BAF1C00-1C231C4D-1C4F1C5A-1C771CE9-1CEC1CEE-1CF12135-21382D30-2D652D80-2D962DA0-2DA62DA8-2DAE2DB0-2DB62DB8-2DBE2DC0-2DC62DC8-2DCE2DD0-2DD62DD8-2DDE3006303C3041-3096309F30A1-30FA30FF3105-312D3131-318E31A0-31B731F0-31FF3400-4DB54E00-9FCBA000-A014A016-A48CA4D0-A4F7A500-A60BA610-A61FA62AA62BA66EA6A0-A6E5A7FB-A801A803-A805A807-A80AA80C-A822A840-A873A882-A8B3A8F2-A8F7A8FBA90A-A925A930-A946A960-A97CA984-A9B2AA00-AA28AA40-AA42AA44-AA4BAA60-AA6FAA71-AA76AA7AAA80-AAAFAAB1AAB5AAB6AAB9-AABDAAC0AAC2AADBAADCABC0-ABE2AC00-D7A3D7B0-D7C6D7CB-D7FBF900-FA2DFA30-FA6DFA70-FAD9FB1DFB1F-FB28FB2A-FB36FB38-FB3CFB3EFB40FB41FB43FB44FB46-FBB1FBD3-FD3DFD50-FD8FFD92-FDC7FDF0-FDFBFE70-FE74FE76-FEFCFF66-FF6FFF71-FF9DFFA0-FFBEFFC2-FFC7FFCA-FFCFFFD2-FFD7FFDA-FFDC", + M: "0300-036F0483-04890591-05BD05BF05C105C205C405C505C70610-061A064B-065E067006D6-06DC06DE-06E406E706E806EA-06ED07110730-074A07A6-07B007EB-07F30816-0819081B-08230825-08270829-082D0900-0903093C093E-094E0951-0955096209630981-098309BC09BE-09C409C709C809CB-09CD09D709E209E30A01-0A030A3C0A3E-0A420A470A480A4B-0A4D0A510A700A710A750A81-0A830ABC0ABE-0AC50AC7-0AC90ACB-0ACD0AE20AE30B01-0B030B3C0B3E-0B440B470B480B4B-0B4D0B560B570B620B630B820BBE-0BC20BC6-0BC80BCA-0BCD0BD70C01-0C030C3E-0C440C46-0C480C4A-0C4D0C550C560C620C630C820C830CBC0CBE-0CC40CC6-0CC80CCA-0CCD0CD50CD60CE20CE30D020D030D3E-0D440D46-0D480D4A-0D4D0D570D620D630D820D830DCA0DCF-0DD40DD60DD8-0DDF0DF20DF30E310E34-0E3A0E47-0E4E0EB10EB4-0EB90EBB0EBC0EC8-0ECD0F180F190F350F370F390F3E0F3F0F71-0F840F860F870F90-0F970F99-0FBC0FC6102B-103E1056-1059105E-10601062-10641067-106D1071-10741082-108D108F109A-109D135F1712-17141732-1734175217531772177317B6-17D317DD180B-180D18A91920-192B1930-193B19B0-19C019C819C91A17-1A1B1A55-1A5E1A60-1A7C1A7F1B00-1B041B34-1B441B6B-1B731B80-1B821BA1-1BAA1C24-1C371CD0-1CD21CD4-1CE81CED1CF21DC0-1DE61DFD-1DFF20D0-20F02CEF-2CF12DE0-2DFF302A-302F3099309AA66F-A672A67CA67DA6F0A6F1A802A806A80BA823-A827A880A881A8B4-A8C4A8E0-A8F1A926-A92DA947-A953A980-A983A9B3-A9C0AA29-AA36AA43AA4CAA4DAA7BAAB0AAB2-AAB4AAB7AAB8AABEAABFAAC1ABE3-ABEAABECABEDFB1EFE00-FE0FFE20-FE26", + Mn: "0300-036F0483-04870591-05BD05BF05C105C205C405C505C70610-061A064B-065E067006D6-06DC06DF-06E406E706E806EA-06ED07110730-074A07A6-07B007EB-07F30816-0819081B-08230825-08270829-082D0900-0902093C0941-0948094D0951-095509620963098109BC09C1-09C409CD09E209E30A010A020A3C0A410A420A470A480A4B-0A4D0A510A700A710A750A810A820ABC0AC1-0AC50AC70AC80ACD0AE20AE30B010B3C0B3F0B41-0B440B4D0B560B620B630B820BC00BCD0C3E-0C400C46-0C480C4A-0C4D0C550C560C620C630CBC0CBF0CC60CCC0CCD0CE20CE30D41-0D440D4D0D620D630DCA0DD2-0DD40DD60E310E34-0E3A0E47-0E4E0EB10EB4-0EB90EBB0EBC0EC8-0ECD0F180F190F350F370F390F71-0F7E0F80-0F840F860F870F90-0F970F99-0FBC0FC6102D-10301032-10371039103A103D103E10581059105E-10601071-1074108210851086108D109D135F1712-17141732-1734175217531772177317B7-17BD17C617C9-17D317DD180B-180D18A91920-19221927192819321939-193B1A171A181A561A58-1A5E1A601A621A65-1A6C1A73-1A7C1A7F1B00-1B031B341B36-1B3A1B3C1B421B6B-1B731B801B811BA2-1BA51BA81BA91C2C-1C331C361C371CD0-1CD21CD4-1CE01CE2-1CE81CED1DC0-1DE61DFD-1DFF20D0-20DC20E120E5-20F02CEF-2CF12DE0-2DFF302A-302F3099309AA66FA67CA67DA6F0A6F1A802A806A80BA825A826A8C4A8E0-A8F1A926-A92DA947-A951A980-A982A9B3A9B6-A9B9A9BCAA29-AA2EAA31AA32AA35AA36AA43AA4CAAB0AAB2-AAB4AAB7AAB8AABEAABFAAC1ABE5ABE8ABEDFB1EFE00-FE0FFE20-FE26", + Mc: "0903093E-09400949-094C094E0982098309BE-09C009C709C809CB09CC09D70A030A3E-0A400A830ABE-0AC00AC90ACB0ACC0B020B030B3E0B400B470B480B4B0B4C0B570BBE0BBF0BC10BC20BC6-0BC80BCA-0BCC0BD70C01-0C030C41-0C440C820C830CBE0CC0-0CC40CC70CC80CCA0CCB0CD50CD60D020D030D3E-0D400D46-0D480D4A-0D4C0D570D820D830DCF-0DD10DD8-0DDF0DF20DF30F3E0F3F0F7F102B102C10311038103B103C105610571062-10641067-106D108310841087-108C108F109A-109C17B617BE-17C517C717C81923-19261929-192B193019311933-193819B0-19C019C819C91A19-1A1B1A551A571A611A631A641A6D-1A721B041B351B3B1B3D-1B411B431B441B821BA11BA61BA71BAA1C24-1C2B1C341C351CE11CF2A823A824A827A880A881A8B4-A8C3A952A953A983A9B4A9B5A9BAA9BBA9BD-A9C0AA2FAA30AA33AA34AA4DAA7BABE3ABE4ABE6ABE7ABE9ABEAABEC", + Me: "0488048906DE20DD-20E020E2-20E4A670-A672", + N: "0030-003900B200B300B900BC-00BE0660-066906F0-06F907C0-07C90966-096F09E6-09EF09F4-09F90A66-0A6F0AE6-0AEF0B66-0B6F0BE6-0BF20C66-0C6F0C78-0C7E0CE6-0CEF0D66-0D750E50-0E590ED0-0ED90F20-0F331040-10491090-10991369-137C16EE-16F017E0-17E917F0-17F91810-18191946-194F19D0-19DA1A80-1A891A90-1A991B50-1B591BB0-1BB91C40-1C491C50-1C5920702074-20792080-20892150-21822185-21892460-249B24EA-24FF2776-27932CFD30073021-30293038-303A3192-31953220-32293251-325F3280-328932B1-32BFA620-A629A6E6-A6EFA830-A835A8D0-A8D9A900-A909A9D0-A9D9AA50-AA59ABF0-ABF9FF10-FF19", + Nd: "0030-00390660-066906F0-06F907C0-07C90966-096F09E6-09EF0A66-0A6F0AE6-0AEF0B66-0B6F0BE6-0BEF0C66-0C6F0CE6-0CEF0D66-0D6F0E50-0E590ED0-0ED90F20-0F291040-10491090-109917E0-17E91810-18191946-194F19D0-19DA1A80-1A891A90-1A991B50-1B591BB0-1BB91C40-1C491C50-1C59A620-A629A8D0-A8D9A900-A909A9D0-A9D9AA50-AA59ABF0-ABF9FF10-FF19", + Nl: "16EE-16F02160-21822185-218830073021-30293038-303AA6E6-A6EF", + No: "00B200B300B900BC-00BE09F4-09F90BF0-0BF20C78-0C7E0D70-0D750F2A-0F331369-137C17F0-17F920702074-20792080-20892150-215F21892460-249B24EA-24FF2776-27932CFD3192-31953220-32293251-325F3280-328932B1-32BFA830-A835", + P: "0021-00230025-002A002C-002F003A003B003F0040005B-005D005F007B007D00A100AB00B700BB00BF037E0387055A-055F0589058A05BE05C005C305C605F305F40609060A060C060D061B061E061F066A-066D06D40700-070D07F7-07F90830-083E0964096509700DF40E4F0E5A0E5B0F04-0F120F3A-0F3D0F850FD0-0FD4104A-104F10FB1361-13681400166D166E169B169C16EB-16ED1735173617D4-17D617D8-17DA1800-180A1944194519DE19DF1A1E1A1F1AA0-1AA61AA8-1AAD1B5A-1B601C3B-1C3F1C7E1C7F1CD32010-20272030-20432045-20512053-205E207D207E208D208E2329232A2768-277527C527C627E6-27EF2983-299829D8-29DB29FC29FD2CF9-2CFC2CFE2CFF2E00-2E2E2E302E313001-30033008-30113014-301F3030303D30A030FBA4FEA4FFA60D-A60FA673A67EA6F2-A6F7A874-A877A8CEA8CFA8F8-A8FAA92EA92FA95FA9C1-A9CDA9DEA9DFAA5C-AA5FAADEAADFABEBFD3EFD3FFE10-FE19FE30-FE52FE54-FE61FE63FE68FE6AFE6BFF01-FF03FF05-FF0AFF0C-FF0FFF1AFF1BFF1FFF20FF3B-FF3DFF3FFF5BFF5DFF5F-FF65", + Pd: "002D058A05BE140018062010-20152E172E1A301C303030A0FE31FE32FE58FE63FF0D", + Ps: "0028005B007B0F3A0F3C169B201A201E2045207D208D23292768276A276C276E27702772277427C527E627E827EA27EC27EE2983298529872989298B298D298F299129932995299729D829DA29FC2E222E242E262E283008300A300C300E3010301430163018301A301DFD3EFE17FE35FE37FE39FE3BFE3DFE3FFE41FE43FE47FE59FE5BFE5DFF08FF3BFF5BFF5FFF62", + Pe: "0029005D007D0F3B0F3D169C2046207E208E232A2769276B276D276F27712773277527C627E727E927EB27ED27EF298429862988298A298C298E2990299229942996299829D929DB29FD2E232E252E272E293009300B300D300F3011301530173019301B301E301FFD3FFE18FE36FE38FE3AFE3CFE3EFE40FE42FE44FE48FE5AFE5CFE5EFF09FF3DFF5DFF60FF63", + Pi: "00AB2018201B201C201F20392E022E042E092E0C2E1C2E20", + Pf: "00BB2019201D203A2E032E052E0A2E0D2E1D2E21", + Pc: "005F203F20402054FE33FE34FE4D-FE4FFF3F", + Po: "0021-00230025-0027002A002C002E002F003A003B003F0040005C00A100B700BF037E0387055A-055F058905C005C305C605F305F40609060A060C060D061B061E061F066A-066D06D40700-070D07F7-07F90830-083E0964096509700DF40E4F0E5A0E5B0F04-0F120F850FD0-0FD4104A-104F10FB1361-1368166D166E16EB-16ED1735173617D4-17D617D8-17DA1800-18051807-180A1944194519DE19DF1A1E1A1F1AA0-1AA61AA8-1AAD1B5A-1B601C3B-1C3F1C7E1C7F1CD3201620172020-20272030-2038203B-203E2041-20432047-205120532055-205E2CF9-2CFC2CFE2CFF2E002E012E06-2E082E0B2E0E-2E162E182E192E1B2E1E2E1F2E2A-2E2E2E302E313001-3003303D30FBA4FEA4FFA60D-A60FA673A67EA6F2-A6F7A874-A877A8CEA8CFA8F8-A8FAA92EA92FA95FA9C1-A9CDA9DEA9DFAA5C-AA5FAADEAADFABEBFE10-FE16FE19FE30FE45FE46FE49-FE4CFE50-FE52FE54-FE57FE5F-FE61FE68FE6AFE6BFF01-FF03FF05-FF07FF0AFF0CFF0EFF0FFF1AFF1BFF1FFF20FF3CFF61FF64FF65", + S: "0024002B003C-003E005E0060007C007E00A2-00A900AC00AE-00B100B400B600B800D700F702C2-02C502D2-02DF02E5-02EB02ED02EF-02FF03750384038503F604820606-0608060B060E060F06E906FD06FE07F609F209F309FA09FB0AF10B700BF3-0BFA0C7F0CF10CF20D790E3F0F01-0F030F13-0F170F1A-0F1F0F340F360F380FBE-0FC50FC7-0FCC0FCE0FCF0FD5-0FD8109E109F13601390-139917DB194019E0-19FF1B61-1B6A1B74-1B7C1FBD1FBF-1FC11FCD-1FCF1FDD-1FDF1FED-1FEF1FFD1FFE20442052207A-207C208A-208C20A0-20B8210021012103-21062108210921142116-2118211E-2123212521272129212E213A213B2140-2144214A-214D214F2190-2328232B-23E82400-24262440-244A249C-24E92500-26CD26CF-26E126E326E8-26FF2701-27042706-2709270C-27272729-274B274D274F-27522756-275E2761-276727942798-27AF27B1-27BE27C0-27C427C7-27CA27CC27D0-27E527F0-29822999-29D729DC-29FB29FE-2B4C2B50-2B592CE5-2CEA2E80-2E992E9B-2EF32F00-2FD52FF0-2FFB300430123013302030363037303E303F309B309C319031913196-319F31C0-31E33200-321E322A-32503260-327F328A-32B032C0-32FE3300-33FF4DC0-4DFFA490-A4C6A700-A716A720A721A789A78AA828-A82BA836-A839AA77-AA79FB29FDFCFDFDFE62FE64-FE66FE69FF04FF0BFF1C-FF1EFF3EFF40FF5CFF5EFFE0-FFE6FFE8-FFEEFFFCFFFD", + Sm: "002B003C-003E007C007E00AC00B100D700F703F60606-060820442052207A-207C208A-208C2140-2144214B2190-2194219A219B21A021A321A621AE21CE21CF21D221D421F4-22FF2308-230B23202321237C239B-23B323DC-23E125B725C125F8-25FF266F27C0-27C427C7-27CA27CC27D0-27E527F0-27FF2900-29822999-29D729DC-29FB29FE-2AFF2B30-2B442B47-2B4CFB29FE62FE64-FE66FF0BFF1C-FF1EFF5CFF5EFFE2FFE9-FFEC", + Sc: "002400A2-00A5060B09F209F309FB0AF10BF90E3F17DB20A0-20B8A838FDFCFE69FF04FFE0FFE1FFE5FFE6", + Sk: "005E006000A800AF00B400B802C2-02C502D2-02DF02E5-02EB02ED02EF-02FF0375038403851FBD1FBF-1FC11FCD-1FCF1FDD-1FDF1FED-1FEF1FFD1FFE309B309CA700-A716A720A721A789A78AFF3EFF40FFE3", + So: "00A600A700A900AE00B000B60482060E060F06E906FD06FE07F609FA0B700BF3-0BF80BFA0C7F0CF10CF20D790F01-0F030F13-0F170F1A-0F1F0F340F360F380FBE-0FC50FC7-0FCC0FCE0FCF0FD5-0FD8109E109F13601390-1399194019E0-19FF1B61-1B6A1B74-1B7C210021012103-21062108210921142116-2118211E-2123212521272129212E213A213B214A214C214D214F2195-2199219C-219F21A121A221A421A521A7-21AD21AF-21CD21D021D121D321D5-21F32300-2307230C-231F2322-2328232B-237B237D-239A23B4-23DB23E2-23E82400-24262440-244A249C-24E92500-25B625B8-25C025C2-25F72600-266E2670-26CD26CF-26E126E326E8-26FF2701-27042706-2709270C-27272729-274B274D274F-27522756-275E2761-276727942798-27AF27B1-27BE2800-28FF2B00-2B2F2B452B462B50-2B592CE5-2CEA2E80-2E992E9B-2EF32F00-2FD52FF0-2FFB300430123013302030363037303E303F319031913196-319F31C0-31E33200-321E322A-32503260-327F328A-32B032C0-32FE3300-33FF4DC0-4DFFA490-A4C6A828-A82BA836A837A839AA77-AA79FDFDFFE4FFE8FFEDFFEEFFFCFFFD", + Z: "002000A01680180E2000-200A20282029202F205F3000", + Zs: "002000A01680180E2000-200A202F205F3000", + Zl: "2028", + Zp: "2029", + C: "0000-001F007F-009F00AD03780379037F-0383038B038D03A20526-05300557055805600588058B-059005C8-05CF05EB-05EF05F5-0605061C061D0620065F06DD070E070F074B074C07B2-07BF07FB-07FF082E082F083F-08FF093A093B094F095609570973-097809800984098D098E0991099209A909B109B3-09B509BA09BB09C509C609C909CA09CF-09D609D8-09DB09DE09E409E509FC-0A000A040A0B-0A0E0A110A120A290A310A340A370A3A0A3B0A3D0A43-0A460A490A4A0A4E-0A500A52-0A580A5D0A5F-0A650A76-0A800A840A8E0A920AA90AB10AB40ABA0ABB0AC60ACA0ACE0ACF0AD1-0ADF0AE40AE50AF00AF2-0B000B040B0D0B0E0B110B120B290B310B340B3A0B3B0B450B460B490B4A0B4E-0B550B58-0B5B0B5E0B640B650B72-0B810B840B8B-0B8D0B910B96-0B980B9B0B9D0BA0-0BA20BA5-0BA70BAB-0BAD0BBA-0BBD0BC3-0BC50BC90BCE0BCF0BD1-0BD60BD8-0BE50BFB-0C000C040C0D0C110C290C340C3A-0C3C0C450C490C4E-0C540C570C5A-0C5F0C640C650C70-0C770C800C810C840C8D0C910CA90CB40CBA0CBB0CC50CC90CCE-0CD40CD7-0CDD0CDF0CE40CE50CF00CF3-0D010D040D0D0D110D290D3A-0D3C0D450D490D4E-0D560D58-0D5F0D640D650D76-0D780D800D810D840D97-0D990DB20DBC0DBE0DBF0DC7-0DC90DCB-0DCE0DD50DD70DE0-0DF10DF5-0E000E3B-0E3E0E5C-0E800E830E850E860E890E8B0E8C0E8E-0E930E980EA00EA40EA60EA80EA90EAC0EBA0EBE0EBF0EC50EC70ECE0ECF0EDA0EDB0EDE-0EFF0F480F6D-0F700F8C-0F8F0F980FBD0FCD0FD9-0FFF10C6-10CF10FD-10FF1249124E124F12571259125E125F1289128E128F12B112B612B712BF12C112C612C712D7131113161317135B-135E137D-137F139A-139F13F5-13FF169D-169F16F1-16FF170D1715-171F1737-173F1754-175F176D17711774-177F17B417B517DE17DF17EA-17EF17FA-17FF180F181A-181F1878-187F18AB-18AF18F6-18FF191D-191F192C-192F193C-193F1941-1943196E196F1975-197F19AC-19AF19CA-19CF19DB-19DD1A1C1A1D1A5F1A7D1A7E1A8A-1A8F1A9A-1A9F1AAE-1AFF1B4C-1B4F1B7D-1B7F1BAB-1BAD1BBA-1BFF1C38-1C3A1C4A-1C4C1C80-1CCF1CF3-1CFF1DE7-1DFC1F161F171F1E1F1F1F461F471F4E1F4F1F581F5A1F5C1F5E1F7E1F7F1FB51FC51FD41FD51FDC1FF01FF11FF51FFF200B-200F202A-202E2060-206F20722073208F2095-209F20B9-20CF20F1-20FF218A-218F23E9-23FF2427-243F244B-245F26CE26E226E4-26E727002705270A270B2728274C274E2753-2755275F27602795-279727B027BF27CB27CD-27CF2B4D-2B4F2B5A-2BFF2C2F2C5F2CF2-2CF82D26-2D2F2D66-2D6E2D70-2D7F2D97-2D9F2DA72DAF2DB72DBF2DC72DCF2DD72DDF2E32-2E7F2E9A2EF4-2EFF2FD6-2FEF2FFC-2FFF3040309730983100-3104312E-3130318F31B8-31BF31E4-31EF321F32FF4DB6-4DBF9FCC-9FFFA48D-A48FA4C7-A4CFA62C-A63FA660A661A674-A67BA698-A69FA6F8-A6FFA78D-A7FAA82C-A82FA83A-A83FA878-A87FA8C5-A8CDA8DA-A8DFA8FC-A8FFA954-A95EA97D-A97FA9CEA9DA-A9DDA9E0-A9FFAA37-AA3FAA4EAA4FAA5AAA5BAA7C-AA7FAAC3-AADAAAE0-ABBFABEEABEFABFA-ABFFD7A4-D7AFD7C7-D7CAD7FC-F8FFFA2EFA2FFA6EFA6FFADA-FAFFFB07-FB12FB18-FB1CFB37FB3DFB3FFB42FB45FBB2-FBD2FD40-FD4FFD90FD91FDC8-FDEFFDFEFDFFFE1A-FE1FFE27-FE2FFE53FE67FE6C-FE6FFE75FEFD-FF00FFBF-FFC1FFC8FFC9FFD0FFD1FFD8FFD9FFDD-FFDFFFE7FFEF-FFFBFFFEFFFF", + Cc: "0000-001F007F-009F", + Cf: "00AD0600-060306DD070F17B417B5200B-200F202A-202E2060-2064206A-206FFEFFFFF9-FFFB", + Co: "E000-F8FF", + Cs: "D800-DFFF", + Cn: "03780379037F-0383038B038D03A20526-05300557055805600588058B-059005C8-05CF05EB-05EF05F5-05FF06040605061C061D0620065F070E074B074C07B2-07BF07FB-07FF082E082F083F-08FF093A093B094F095609570973-097809800984098D098E0991099209A909B109B3-09B509BA09BB09C509C609C909CA09CF-09D609D8-09DB09DE09E409E509FC-0A000A040A0B-0A0E0A110A120A290A310A340A370A3A0A3B0A3D0A43-0A460A490A4A0A4E-0A500A52-0A580A5D0A5F-0A650A76-0A800A840A8E0A920AA90AB10AB40ABA0ABB0AC60ACA0ACE0ACF0AD1-0ADF0AE40AE50AF00AF2-0B000B040B0D0B0E0B110B120B290B310B340B3A0B3B0B450B460B490B4A0B4E-0B550B58-0B5B0B5E0B640B650B72-0B810B840B8B-0B8D0B910B96-0B980B9B0B9D0BA0-0BA20BA5-0BA70BAB-0BAD0BBA-0BBD0BC3-0BC50BC90BCE0BCF0BD1-0BD60BD8-0BE50BFB-0C000C040C0D0C110C290C340C3A-0C3C0C450C490C4E-0C540C570C5A-0C5F0C640C650C70-0C770C800C810C840C8D0C910CA90CB40CBA0CBB0CC50CC90CCE-0CD40CD7-0CDD0CDF0CE40CE50CF00CF3-0D010D040D0D0D110D290D3A-0D3C0D450D490D4E-0D560D58-0D5F0D640D650D76-0D780D800D810D840D97-0D990DB20DBC0DBE0DBF0DC7-0DC90DCB-0DCE0DD50DD70DE0-0DF10DF5-0E000E3B-0E3E0E5C-0E800E830E850E860E890E8B0E8C0E8E-0E930E980EA00EA40EA60EA80EA90EAC0EBA0EBE0EBF0EC50EC70ECE0ECF0EDA0EDB0EDE-0EFF0F480F6D-0F700F8C-0F8F0F980FBD0FCD0FD9-0FFF10C6-10CF10FD-10FF1249124E124F12571259125E125F1289128E128F12B112B612B712BF12C112C612C712D7131113161317135B-135E137D-137F139A-139F13F5-13FF169D-169F16F1-16FF170D1715-171F1737-173F1754-175F176D17711774-177F17DE17DF17EA-17EF17FA-17FF180F181A-181F1878-187F18AB-18AF18F6-18FF191D-191F192C-192F193C-193F1941-1943196E196F1975-197F19AC-19AF19CA-19CF19DB-19DD1A1C1A1D1A5F1A7D1A7E1A8A-1A8F1A9A-1A9F1AAE-1AFF1B4C-1B4F1B7D-1B7F1BAB-1BAD1BBA-1BFF1C38-1C3A1C4A-1C4C1C80-1CCF1CF3-1CFF1DE7-1DFC1F161F171F1E1F1F1F461F471F4E1F4F1F581F5A1F5C1F5E1F7E1F7F1FB51FC51FD41FD51FDC1FF01FF11FF51FFF2065-206920722073208F2095-209F20B9-20CF20F1-20FF218A-218F23E9-23FF2427-243F244B-245F26CE26E226E4-26E727002705270A270B2728274C274E2753-2755275F27602795-279727B027BF27CB27CD-27CF2B4D-2B4F2B5A-2BFF2C2F2C5F2CF2-2CF82D26-2D2F2D66-2D6E2D70-2D7F2D97-2D9F2DA72DAF2DB72DBF2DC72DCF2DD72DDF2E32-2E7F2E9A2EF4-2EFF2FD6-2FEF2FFC-2FFF3040309730983100-3104312E-3130318F31B8-31BF31E4-31EF321F32FF4DB6-4DBF9FCC-9FFFA48D-A48FA4C7-A4CFA62C-A63FA660A661A674-A67BA698-A69FA6F8-A6FFA78D-A7FAA82C-A82FA83A-A83FA878-A87FA8C5-A8CDA8DA-A8DFA8FC-A8FFA954-A95EA97D-A97FA9CEA9DA-A9DDA9E0-A9FFAA37-AA3FAA4EAA4FAA5AAA5BAA7C-AA7FAAC3-AADAAAE0-ABBFABEEABEFABFA-ABFFD7A4-D7AFD7C7-D7CAD7FC-D7FFFA2EFA2FFA6EFA6FFADA-FAFFFB07-FB12FB18-FB1CFB37FB3DFB3FFB42FB45FBB2-FBD2FD40-FD4FFD90FD91FDC8-FDEFFDFEFDFFFE1A-FE1FFE27-FE2FFE53FE67FE6C-FE6FFE75FEFDFEFEFF00FFBF-FFC1FFC8FFC9FFD0FFD1FFD8FFD9FFDD-FFDFFFE7FFEF-FFF8FFFEFFFF" +}); + +function addUnicodePackage (pack) { + var codePoint = /\w{4}/g; + for (var name in pack) + exports.packages[name] = pack[name].replace(codePoint, "\\u$&"); +}; + +}); + +ace.define('ace/token_iterator', ['require', 'exports', 'module' ], function(require, exports, module) { +var TokenIterator = function(session, initialRow, initialColumn) { + this.$session = session; + this.$row = initialRow; + this.$rowTokens = session.getTokens(initialRow); + + var token = session.getTokenAt(initialRow, initialColumn); + this.$tokenIndex = token ? token.index : -1; +}; + +(function() { + this.stepBackward = function() { + this.$tokenIndex -= 1; + + while (this.$tokenIndex < 0) { + this.$row -= 1; + if (this.$row < 0) { + this.$row = 0; + return null; + } + + this.$rowTokens = this.$session.getTokens(this.$row); + this.$tokenIndex = this.$rowTokens.length - 1; + } + + return this.$rowTokens[this.$tokenIndex]; + }; + this.stepForward = function() { + this.$tokenIndex += 1; + var rowCount; + while (this.$tokenIndex >= this.$rowTokens.length) { + this.$row += 1; + if (!rowCount) + rowCount = this.$session.getLength(); + if (this.$row >= rowCount) { + this.$row = rowCount - 1; + return null; + } + + this.$rowTokens = this.$session.getTokens(this.$row); + this.$tokenIndex = 0; + } + + return this.$rowTokens[this.$tokenIndex]; + }; + this.getCurrentToken = function () { + return this.$rowTokens[this.$tokenIndex]; + }; + this.getCurrentTokenRow = function () { + return this.$row; + }; + this.getCurrentTokenColumn = function() { + var rowTokens = this.$rowTokens; + var tokenIndex = this.$tokenIndex; + var column = rowTokens[tokenIndex].start; + if (column !== undefined) + return column; + + column = 0; + while (tokenIndex > 0) { + tokenIndex -= 1; + column += rowTokens[tokenIndex].value.length; + } + + return column; + }; + +}).call(TokenIterator.prototype); + +exports.TokenIterator = TokenIterator; +}); + +ace.define('ace/document', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/event_emitter', 'ace/range', 'ace/anchor'], function(require, exports, module) { + + +var oop = require("./lib/oop"); +var EventEmitter = require("./lib/event_emitter").EventEmitter; +var Range = require("./range").Range; +var Anchor = require("./anchor").Anchor; + +var Document = function(text) { + this.$lines = []; + if (text.length === 0) { + this.$lines = [""]; + } else if (Array.isArray(text)) { + this._insertLines(0, text); + } else { + this.insert({row: 0, column:0}, text); + } +}; + +(function() { + + oop.implement(this, EventEmitter); + this.setValue = function(text) { + var len = this.getLength(); + this.remove(new Range(0, 0, len, this.getLine(len-1).length)); + this.insert({row: 0, column:0}, text); + }; + this.getValue = function() { + return this.getAllLines().join(this.getNewLineCharacter()); + }; + this.createAnchor = function(row, column) { + return new Anchor(this, row, column); + }; + if ("aaa".split(/a/).length === 0) + this.$split = function(text) { + return text.replace(/\r\n|\r/g, "\n").split("\n"); + }; + else + this.$split = function(text) { + return text.split(/\r\n|\r|\n/); + }; + + + this.$detectNewLine = function(text) { + var match = text.match(/^.*?(\r\n|\r|\n)/m); + this.$autoNewLine = match ? match[1] : "\n"; + this._signal("changeNewLineMode"); + }; + this.getNewLineCharacter = function() { + switch (this.$newLineMode) { + case "windows": + return "\r\n"; + case "unix": + return "\n"; + default: + return this.$autoNewLine || "\n"; + } + }; + + this.$autoNewLine = ""; + this.$newLineMode = "auto"; + this.setNewLineMode = function(newLineMode) { + if (this.$newLineMode === newLineMode) + return; + + this.$newLineMode = newLineMode; + this._signal("changeNewLineMode"); + }; + this.getNewLineMode = function() { + return this.$newLineMode; + }; + this.isNewLine = function(text) { + return (text == "\r\n" || text == "\r" || text == "\n"); + }; + this.getLine = function(row) { + return this.$lines[row] || ""; + }; + this.getLines = function(firstRow, lastRow) { + return this.$lines.slice(firstRow, lastRow + 1); + }; + this.getAllLines = function() { + return this.getLines(0, this.getLength()); + }; + this.getLength = function() { + return this.$lines.length; + }; + this.getTextRange = function(range) { + if (range.start.row == range.end.row) { + return this.getLine(range.start.row) + .substring(range.start.column, range.end.column); + } + var lines = this.getLines(range.start.row, range.end.row); + lines[0] = (lines[0] || "").substring(range.start.column); + var l = lines.length - 1; + if (range.end.row - range.start.row == l) + lines[l] = lines[l].substring(0, range.end.column); + return lines.join(this.getNewLineCharacter()); + }; + + this.$clipPosition = function(position) { + var length = this.getLength(); + if (position.row >= length) { + position.row = Math.max(0, length - 1); + position.column = this.getLine(length-1).length; + } else if (position.row < 0) + position.row = 0; + return position; + }; + this.insert = function(position, text) { + if (!text || text.length === 0) + return position; + + position = this.$clipPosition(position); + if (this.getLength() <= 1) + this.$detectNewLine(text); + + var lines = this.$split(text); + var firstLine = lines.splice(0, 1)[0]; + var lastLine = lines.length == 0 ? null : lines.splice(lines.length - 1, 1)[0]; + + position = this.insertInLine(position, firstLine); + if (lastLine !== null) { + position = this.insertNewLine(position); // terminate first line + position = this._insertLines(position.row, lines); + position = this.insertInLine(position, lastLine || ""); + } + return position; + }; + this.insertLines = function(row, lines) { + if (row >= this.getLength()) + return this.insert({row: row, column: 0}, "\n" + lines.join("\n")); + return this._insertLines(Math.max(row, 0), lines); + }; + this._insertLines = function(row, lines) { + if (lines.length == 0) + return {row: row, column: 0}; + while (lines.length > 0xF000) { + var end = this._insertLines(row, lines.slice(0, 0xF000)); + lines = lines.slice(0xF000); + row = end.row; + } + + var args = [row, 0]; + args.push.apply(args, lines); + this.$lines.splice.apply(this.$lines, args); + + var range = new Range(row, 0, row + lines.length, 0); + var delta = { + action: "insertLines", + range: range, + lines: lines + }; + this._signal("change", { data: delta }); + return range.end; + }; + this.insertNewLine = function(position) { + position = this.$clipPosition(position); + var line = this.$lines[position.row] || ""; + + this.$lines[position.row] = line.substring(0, position.column); + this.$lines.splice(position.row + 1, 0, line.substring(position.column, line.length)); + + var end = { + row : position.row + 1, + column : 0 + }; + + var delta = { + action: "insertText", + range: Range.fromPoints(position, end), + text: this.getNewLineCharacter() + }; + this._signal("change", { data: delta }); + + return end; + }; + this.insertInLine = function(position, text) { + if (text.length == 0) + return position; + + var line = this.$lines[position.row] || ""; + + this.$lines[position.row] = line.substring(0, position.column) + text + + line.substring(position.column); + + var end = { + row : position.row, + column : position.column + text.length + }; + + var delta = { + action: "insertText", + range: Range.fromPoints(position, end), + text: text + }; + this._signal("change", { data: delta }); + + return end; + }; + this.remove = function(range) { + if (!(range instanceof Range)) + range = Range.fromPoints(range.start, range.end); + range.start = this.$clipPosition(range.start); + range.end = this.$clipPosition(range.end); + + if (range.isEmpty()) + return range.start; + + var firstRow = range.start.row; + var lastRow = range.end.row; + + if (range.isMultiLine()) { + var firstFullRow = range.start.column == 0 ? firstRow : firstRow + 1; + var lastFullRow = lastRow - 1; + + if (range.end.column > 0) + this.removeInLine(lastRow, 0, range.end.column); + + if (lastFullRow >= firstFullRow) + this._removeLines(firstFullRow, lastFullRow); + + if (firstFullRow != firstRow) { + this.removeInLine(firstRow, range.start.column, this.getLine(firstRow).length); + this.removeNewLine(range.start.row); + } + } + else { + this.removeInLine(firstRow, range.start.column, range.end.column); + } + return range.start; + }; + this.removeInLine = function(row, startColumn, endColumn) { + if (startColumn == endColumn) + return; + + var range = new Range(row, startColumn, row, endColumn); + var line = this.getLine(row); + var removed = line.substring(startColumn, endColumn); + var newLine = line.substring(0, startColumn) + line.substring(endColumn, line.length); + this.$lines.splice(row, 1, newLine); + + var delta = { + action: "removeText", + range: range, + text: removed + }; + this._signal("change", { data: delta }); + return range.start; + }; + this.removeLines = function(firstRow, lastRow) { + if (firstRow < 0 || lastRow >= this.getLength()) + return this.remove(new Range(firstRow, 0, lastRow + 1, 0)); + return this._removeLines(firstRow, lastRow); + }; + + this._removeLines = function(firstRow, lastRow) { + var range = new Range(firstRow, 0, lastRow + 1, 0); + var removed = this.$lines.splice(firstRow, lastRow - firstRow + 1); + + var delta = { + action: "removeLines", + range: range, + nl: this.getNewLineCharacter(), + lines: removed + }; + this._signal("change", { data: delta }); + return removed; + }; + this.removeNewLine = function(row) { + var firstLine = this.getLine(row); + var secondLine = this.getLine(row+1); + + var range = new Range(row, firstLine.length, row+1, 0); + var line = firstLine + secondLine; + + this.$lines.splice(row, 2, line); + + var delta = { + action: "removeText", + range: range, + text: this.getNewLineCharacter() + }; + this._signal("change", { data: delta }); + }; + this.replace = function(range, text) { + if (!(range instanceof Range)) + range = Range.fromPoints(range.start, range.end); + if (text.length == 0 && range.isEmpty()) + return range.start; + if (text == this.getTextRange(range)) + return range.end; + + this.remove(range); + if (text) { + var end = this.insert(range.start, text); + } + else { + end = range.start; + } + + return end; + }; + this.applyDeltas = function(deltas) { + for (var i=0; i=0; i--) { + var delta = deltas[i]; + + var range = Range.fromPoints(delta.range.start, delta.range.end); + + if (delta.action == "insertLines") + this._removeLines(range.start.row, range.end.row - 1); + else if (delta.action == "insertText") + this.remove(range); + else if (delta.action == "removeLines") + this._insertLines(range.start.row, delta.lines); + else if (delta.action == "removeText") + this.insert(range.start, delta.text); + } + }; + this.indexToPosition = function(index, startRow) { + var lines = this.$lines || this.getAllLines(); + var newlineLength = this.getNewLineCharacter().length; + for (var i = startRow || 0, l = lines.length; i < l; i++) { + index -= lines[i].length + newlineLength; + if (index < 0) + return {row: i, column: index + lines[i].length + newlineLength}; + } + return {row: l-1, column: lines[l-1].length}; + }; + this.positionToIndex = function(pos, startRow) { + var lines = this.$lines || this.getAllLines(); + var newlineLength = this.getNewLineCharacter().length; + var index = 0; + var row = Math.min(pos.row, lines.length); + for (var i = startRow || 0; i < row; ++i) + index += lines[i].length + newlineLength; + + return index + pos.column; + }; + +}).call(Document.prototype); + +exports.Document = Document; +}); + +ace.define('ace/anchor', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/event_emitter'], function(require, exports, module) { + + +var oop = require("./lib/oop"); +var EventEmitter = require("./lib/event_emitter").EventEmitter; + +var Anchor = exports.Anchor = function(doc, row, column) { + this.$onChange = this.onChange.bind(this); + this.attach(doc); + + if (typeof column == "undefined") + this.setPosition(row.row, row.column); + else + this.setPosition(row, column); +}; + +(function() { + + oop.implement(this, EventEmitter); + this.getPosition = function() { + return this.$clipPositionToDocument(this.row, this.column); + }; + this.getDocument = function() { + return this.document; + }; + this.$insertRight = false; + this.onChange = function(e) { + var delta = e.data; + var range = delta.range; + + if (range.start.row == range.end.row && range.start.row != this.row) + return; + + if (range.start.row > this.row) + return; + + if (range.start.row == this.row && range.start.column > this.column) + return; + + var row = this.row; + var column = this.column; + var start = range.start; + var end = range.end; + + if (delta.action === "insertText") { + if (start.row === row && start.column <= column) { + if (start.column === column && this.$insertRight) { + } else if (start.row === end.row) { + column += end.column - start.column; + } else { + column -= start.column; + row += end.row - start.row; + } + } else if (start.row !== end.row && start.row < row) { + row += end.row - start.row; + } + } else if (delta.action === "insertLines") { + if (start.row === row && column === 0 && this.$insertRight) { + } + else if (start.row <= row) { + row += end.row - start.row; + } + } else if (delta.action === "removeText") { + if (start.row === row && start.column < column) { + if (end.column >= column) + column = start.column; + else + column = Math.max(0, column - (end.column - start.column)); + + } else if (start.row !== end.row && start.row < row) { + if (end.row === row) + column = Math.max(0, column - end.column) + start.column; + row -= (end.row - start.row); + } else if (end.row === row) { + row -= end.row - start.row; + column = Math.max(0, column - end.column) + start.column; + } + } else if (delta.action == "removeLines") { + if (start.row <= row) { + if (end.row <= row) + row -= end.row - start.row; + else { + row = start.row; + column = 0; + } + } + } + + this.setPosition(row, column, true); + }; + this.setPosition = function(row, column, noClip) { + var pos; + if (noClip) { + pos = { + row: row, + column: column + }; + } else { + pos = this.$clipPositionToDocument(row, column); + } + + if (this.row == pos.row && this.column == pos.column) + return; + + var old = { + row: this.row, + column: this.column + }; + + this.row = pos.row; + this.column = pos.column; + this._signal("change", { + old: old, + value: pos + }); + }; + this.detach = function() { + this.document.removeEventListener("change", this.$onChange); + }; + this.attach = function(doc) { + this.document = doc || this.document; + this.document.on("change", this.$onChange); + }; + this.$clipPositionToDocument = function(row, column) { + var pos = {}; + + if (row >= this.document.getLength()) { + pos.row = Math.max(0, this.document.getLength() - 1); + pos.column = this.document.getLine(pos.row).length; + } + else if (row < 0) { + pos.row = 0; + pos.column = 0; + } + else { + pos.row = row; + pos.column = Math.min(this.document.getLine(pos.row).length, Math.max(0, column)); + } + + if (column < 0) + pos.column = 0; + + return pos; + }; + +}).call(Anchor.prototype); + +}); + +ace.define('ace/background_tokenizer', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/event_emitter'], function(require, exports, module) { + + +var oop = require("./lib/oop"); +var EventEmitter = require("./lib/event_emitter").EventEmitter; + +var BackgroundTokenizer = function(tokenizer, editor) { + this.running = false; + this.lines = []; + this.states = []; + this.currentLine = 0; + this.tokenizer = tokenizer; + + var self = this; + + this.$worker = function() { + if (!self.running) { return; } + + var workerStart = new Date(); + var currentLine = self.currentLine; + var endLine = -1; + var doc = self.doc; + + while (self.lines[currentLine]) + currentLine++; + + var startLine = currentLine; + + var len = doc.getLength(); + var processedLines = 0; + self.running = false; + while (currentLine < len) { + self.$tokenizeRow(currentLine); + endLine = currentLine; + do { + currentLine++; + } while (self.lines[currentLine]); + processedLines ++; + if ((processedLines % 5 == 0) && (new Date() - workerStart) > 20) { + self.running = setTimeout(self.$worker, 20); + self.currentLine = currentLine; + return; + } + } + self.currentLine = currentLine; + + if (startLine <= endLine) + self.fireUpdateEvent(startLine, endLine); + }; +}; + +(function(){ + + oop.implement(this, EventEmitter); + this.setTokenizer = function(tokenizer) { + this.tokenizer = tokenizer; + this.lines = []; + this.states = []; + + this.start(0); + }; + this.setDocument = function(doc) { + this.doc = doc; + this.lines = []; + this.states = []; + + this.stop(); + }; + this.fireUpdateEvent = function(firstRow, lastRow) { + var data = { + first: firstRow, + last: lastRow + }; + this._signal("update", {data: data}); + }; + this.start = function(startRow) { + this.currentLine = Math.min(startRow || 0, this.currentLine, this.doc.getLength()); + this.lines.splice(this.currentLine, this.lines.length); + this.states.splice(this.currentLine, this.states.length); + + this.stop(); + this.running = setTimeout(this.$worker, 700); + }; + + this.scheduleStart = function() { + if (!this.running) + this.running = setTimeout(this.$worker, 700); + } + + this.$updateOnChange = function(delta) { + var range = delta.range; + var startRow = range.start.row; + var len = range.end.row - startRow; + + if (len === 0) { + this.lines[startRow] = null; + } else if (delta.action == "removeText" || delta.action == "removeLines") { + this.lines.splice(startRow, len + 1, null); + this.states.splice(startRow, len + 1, null); + } else { + var args = Array(len + 1); + args.unshift(startRow, 1); + this.lines.splice.apply(this.lines, args); + this.states.splice.apply(this.states, args); + } + + this.currentLine = Math.min(startRow, this.currentLine, this.doc.getLength()); + + this.stop(); + }; + this.stop = function() { + if (this.running) + clearTimeout(this.running); + this.running = false; + }; + this.getTokens = function(row) { + return this.lines[row] || this.$tokenizeRow(row); + }; + this.getState = function(row) { + if (this.currentLine == row) + this.$tokenizeRow(row); + return this.states[row] || "start"; + }; + + this.$tokenizeRow = function(row) { + var line = this.doc.getLine(row); + var state = this.states[row - 1]; + + var data = this.tokenizer.getLineTokens(line, state, row); + + if (this.states[row] + "" !== data.state + "") { + this.states[row] = data.state; + this.lines[row + 1] = null; + if (this.currentLine > row + 1) + this.currentLine = row + 1; + } else if (this.currentLine == row) { + this.currentLine = row + 1; + } + + return this.lines[row] = data.tokens; + }; + +}).call(BackgroundTokenizer.prototype); + +exports.BackgroundTokenizer = BackgroundTokenizer; +}); + +ace.define('ace/search_highlight', ['require', 'exports', 'module' , 'ace/lib/lang', 'ace/lib/oop', 'ace/range'], function(require, exports, module) { + + +var lang = require("./lib/lang"); +var oop = require("./lib/oop"); +var Range = require("./range").Range; + +var SearchHighlight = function(regExp, clazz, type) { + this.setRegexp(regExp); + this.clazz = clazz; + this.type = type || "text"; +}; + +(function() { + this.MAX_RANGES = 500; + + this.setRegexp = function(regExp) { + if (this.regExp+"" == regExp+"") + return; + this.regExp = regExp; + this.cache = []; + }; + + this.update = function(html, markerLayer, session, config) { + if (!this.regExp) + return; + var start = config.firstRow, end = config.lastRow; + + for (var i = start; i <= end; i++) { + var ranges = this.cache[i]; + if (ranges == null) { + ranges = lang.getMatchOffsets(session.getLine(i), this.regExp); + if (ranges.length > this.MAX_RANGES) + ranges = ranges.slice(0, this.MAX_RANGES); + ranges = ranges.map(function(match) { + return new Range(i, match.offset, i, match.offset + match.length); + }); + this.cache[i] = ranges.length ? ranges : ""; + } + + for (var j = ranges.length; j --; ) { + markerLayer.drawSingleLineMarker( + html, ranges[j].toScreenRange(session), this.clazz, config); + } + } + }; + +}).call(SearchHighlight.prototype); + +exports.SearchHighlight = SearchHighlight; +}); + +ace.define('ace/edit_session/folding', ['require', 'exports', 'module' , 'ace/range', 'ace/edit_session/fold_line', 'ace/edit_session/fold', 'ace/token_iterator'], function(require, exports, module) { + + +var Range = require("../range").Range; +var FoldLine = require("./fold_line").FoldLine; +var Fold = require("./fold").Fold; +var TokenIterator = require("../token_iterator").TokenIterator; + +function Folding() { + this.getFoldAt = function(row, column, side) { + var foldLine = this.getFoldLine(row); + if (!foldLine) + return null; + + var folds = foldLine.folds; + for (var i = 0; i < folds.length; i++) { + var fold = folds[i]; + if (fold.range.contains(row, column)) { + if (side == 1 && fold.range.isEnd(row, column)) { + continue; + } else if (side == -1 && fold.range.isStart(row, column)) { + continue; + } + return fold; + } + } + }; + this.getFoldsInRange = function(range) { + var start = range.start; + var end = range.end; + var foldLines = this.$foldData; + var foundFolds = []; + + start.column += 1; + end.column -= 1; + + for (var i = 0; i < foldLines.length; i++) { + var cmp = foldLines[i].range.compareRange(range); + if (cmp == 2) { + continue; + } + else if (cmp == -2) { + break; + } + + var folds = foldLines[i].folds; + for (var j = 0; j < folds.length; j++) { + var fold = folds[j]; + cmp = fold.range.compareRange(range); + if (cmp == -2) { + break; + } else if (cmp == 2) { + continue; + } else + if (cmp == 42) { + break; + } + foundFolds.push(fold); + } + } + start.column -= 1; + end.column += 1; + + return foundFolds; + }; + + this.getFoldsInRangeList = function(ranges) { + if (Array.isArray(ranges)) { + var folds = []; + ranges.forEach(function(range) { + folds = folds.concat(this.getFoldsInRange(range)); + }, this); + } else { + var folds = this.getFoldsInRange(ranges); + } + return folds; + } + this.getAllFolds = function() { + var folds = []; + var foldLines = this.$foldData; + + for (var i = 0; i < foldLines.length; i++) + for (var j = 0; j < foldLines[i].folds.length; j++) + folds.push(foldLines[i].folds[j]); + + return folds; + }; + this.getFoldStringAt = function(row, column, trim, foldLine) { + foldLine = foldLine || this.getFoldLine(row); + if (!foldLine) + return null; + + var lastFold = { + end: { column: 0 } + }; + var str, fold; + for (var i = 0; i < foldLine.folds.length; i++) { + fold = foldLine.folds[i]; + var cmp = fold.range.compareEnd(row, column); + if (cmp == -1) { + str = this + .getLine(fold.start.row) + .substring(lastFold.end.column, fold.start.column); + break; + } + else if (cmp === 0) { + return null; + } + lastFold = fold; + } + if (!str) + str = this.getLine(fold.start.row).substring(lastFold.end.column); + + if (trim == -1) + return str.substring(0, column - lastFold.end.column); + else if (trim == 1) + return str.substring(column - lastFold.end.column); + else + return str; + }; + + this.getFoldLine = function(docRow, startFoldLine) { + var foldData = this.$foldData; + var i = 0; + if (startFoldLine) + i = foldData.indexOf(startFoldLine); + if (i == -1) + i = 0; + for (i; i < foldData.length; i++) { + var foldLine = foldData[i]; + if (foldLine.start.row <= docRow && foldLine.end.row >= docRow) { + return foldLine; + } else if (foldLine.end.row > docRow) { + return null; + } + } + return null; + }; + this.getNextFoldLine = function(docRow, startFoldLine) { + var foldData = this.$foldData; + var i = 0; + if (startFoldLine) + i = foldData.indexOf(startFoldLine); + if (i == -1) + i = 0; + for (i; i < foldData.length; i++) { + var foldLine = foldData[i]; + if (foldLine.end.row >= docRow) { + return foldLine; + } + } + return null; + }; + + this.getFoldedRowCount = function(first, last) { + var foldData = this.$foldData, rowCount = last-first+1; + for (var i = 0; i < foldData.length; i++) { + var foldLine = foldData[i], + end = foldLine.end.row, + start = foldLine.start.row; + if (end >= last) { + if(start < last) { + if(start >= first) + rowCount -= last-start; + else + rowCount = 0;//in one fold + } + break; + } else if(end >= first){ + if (start >= first) //fold inside range + rowCount -= end-start; + else + rowCount -= end-first+1; + } + } + return rowCount; + }; + + this.$addFoldLine = function(foldLine) { + this.$foldData.push(foldLine); + this.$foldData.sort(function(a, b) { + return a.start.row - b.start.row; + }); + return foldLine; + }; + this.addFold = function(placeholder, range) { + var foldData = this.$foldData; + var added = false; + var fold; + + if (placeholder instanceof Fold) + fold = placeholder; + else { + fold = new Fold(range, placeholder); + fold.collapseChildren = range.collapseChildren; + } + this.$clipRangeToDocument(fold.range); + + var startRow = fold.start.row; + var startColumn = fold.start.column; + var endRow = fold.end.row; + var endColumn = fold.end.column; + if (!(startRow < endRow || + startRow == endRow && startColumn <= endColumn - 2)) + throw new Error("The range has to be at least 2 characters width"); + + var startFold = this.getFoldAt(startRow, startColumn, 1); + var endFold = this.getFoldAt(endRow, endColumn, -1); + if (startFold && endFold == startFold) + return startFold.addSubFold(fold); + + if ( + (startFold && !startFold.range.isStart(startRow, startColumn)) + || (endFold && !endFold.range.isEnd(endRow, endColumn)) + ) { + throw new Error("A fold can't intersect already existing fold" + fold.range + startFold.range); + } + var folds = this.getFoldsInRange(fold.range); + if (folds.length > 0) { + this.removeFolds(folds); + folds.forEach(function(subFold) { + fold.addSubFold(subFold); + }); + } + + for (var i = 0; i < foldData.length; i++) { + var foldLine = foldData[i]; + if (endRow == foldLine.start.row) { + foldLine.addFold(fold); + added = true; + break; + } else if (startRow == foldLine.end.row) { + foldLine.addFold(fold); + added = true; + if (!fold.sameRow) { + var foldLineNext = foldData[i + 1]; + if (foldLineNext && foldLineNext.start.row == endRow) { + foldLine.merge(foldLineNext); + break; + } + } + break; + } else if (endRow <= foldLine.start.row) { + break; + } + } + + if (!added) + foldLine = this.$addFoldLine(new FoldLine(this.$foldData, fold)); + + if (this.$useWrapMode) + this.$updateWrapData(foldLine.start.row, foldLine.start.row); + else + this.$updateRowLengthCache(foldLine.start.row, foldLine.start.row); + this.$modified = true; + this._emit("changeFold", { data: fold, action: "add" }); + + return fold; + }; + + this.addFolds = function(folds) { + folds.forEach(function(fold) { + this.addFold(fold); + }, this); + }; + + this.removeFold = function(fold) { + var foldLine = fold.foldLine; + var startRow = foldLine.start.row; + var endRow = foldLine.end.row; + + var foldLines = this.$foldData; + var folds = foldLine.folds; + if (folds.length == 1) { + foldLines.splice(foldLines.indexOf(foldLine), 1); + } else + if (foldLine.range.isEnd(fold.end.row, fold.end.column)) { + folds.pop(); + foldLine.end.row = folds[folds.length - 1].end.row; + foldLine.end.column = folds[folds.length - 1].end.column; + } else + if (foldLine.range.isStart(fold.start.row, fold.start.column)) { + folds.shift(); + foldLine.start.row = folds[0].start.row; + foldLine.start.column = folds[0].start.column; + } else + if (fold.sameRow) { + folds.splice(folds.indexOf(fold), 1); + } else + { + var newFoldLine = foldLine.split(fold.start.row, fold.start.column); + folds = newFoldLine.folds; + folds.shift(); + newFoldLine.start.row = folds[0].start.row; + newFoldLine.start.column = folds[0].start.column; + } + + if (!this.$updating) { + if (this.$useWrapMode) + this.$updateWrapData(startRow, endRow); + else + this.$updateRowLengthCache(startRow, endRow); + } + this.$modified = true; + this._emit("changeFold", { data: fold, action: "remove" }); + }; + + this.removeFolds = function(folds) { + var cloneFolds = []; + for (var i = 0; i < folds.length; i++) { + cloneFolds.push(folds[i]); + } + + cloneFolds.forEach(function(fold) { + this.removeFold(fold); + }, this); + this.$modified = true; + }; + + this.expandFold = function(fold) { + this.removeFold(fold); + fold.subFolds.forEach(function(subFold) { + fold.restoreRange(subFold); + this.addFold(subFold); + }, this); + if (fold.collapseChildren > 0) { + this.foldAll(fold.start.row+1, fold.end.row, fold.collapseChildren-1); + } + fold.subFolds = []; + }; + + this.expandFolds = function(folds) { + folds.forEach(function(fold) { + this.expandFold(fold); + }, this); + }; + + this.unfold = function(location, expandInner) { + var range, folds; + if (location == null) { + range = new Range(0, 0, this.getLength(), 0); + expandInner = true; + } else if (typeof location == "number") + range = new Range(location, 0, location, this.getLine(location).length); + else if ("row" in location) + range = Range.fromPoints(location, location); + else + range = location; + + folds = this.getFoldsInRangeList(range); + if (expandInner) { + this.removeFolds(folds); + } else { + var subFolds = folds; + while (subFolds.length) { + this.expandFolds(subFolds); + subFolds = this.getFoldsInRangeList(range); + } + } + if (folds.length) + return folds; + }; + this.isRowFolded = function(docRow, startFoldRow) { + return !!this.getFoldLine(docRow, startFoldRow); + }; + + this.getRowFoldEnd = function(docRow, startFoldRow) { + var foldLine = this.getFoldLine(docRow, startFoldRow); + return foldLine ? foldLine.end.row : docRow; + }; + + this.getRowFoldStart = function(docRow, startFoldRow) { + var foldLine = this.getFoldLine(docRow, startFoldRow); + return foldLine ? foldLine.start.row : docRow; + }; + + this.getFoldDisplayLine = function(foldLine, endRow, endColumn, startRow, startColumn) { + if (startRow == null) { + startRow = foldLine.start.row; + startColumn = 0; + } + + if (endRow == null) { + endRow = foldLine.end.row; + endColumn = this.getLine(endRow).length; + } + var doc = this.doc; + var textLine = ""; + + foldLine.walk(function(placeholder, row, column, lastColumn) { + if (row < startRow) + return; + if (row == startRow) { + if (column < startColumn) + return; + lastColumn = Math.max(startColumn, lastColumn); + } + + if (placeholder != null) { + textLine += placeholder; + } else { + textLine += doc.getLine(row).substring(lastColumn, column); + } + }, endRow, endColumn); + return textLine; + }; + + this.getDisplayLine = function(row, endColumn, startRow, startColumn) { + var foldLine = this.getFoldLine(row); + + if (!foldLine) { + var line; + line = this.doc.getLine(row); + return line.substring(startColumn || 0, endColumn || line.length); + } else { + return this.getFoldDisplayLine( + foldLine, row, endColumn, startRow, startColumn); + } + }; + + this.$cloneFoldData = function() { + var fd = []; + fd = this.$foldData.map(function(foldLine) { + var folds = foldLine.folds.map(function(fold) { + return fold.clone(); + }); + return new FoldLine(fd, folds); + }); + + return fd; + }; + + this.toggleFold = function(tryToUnfold) { + var selection = this.selection; + var range = selection.getRange(); + var fold; + var bracketPos; + + if (range.isEmpty()) { + var cursor = range.start; + fold = this.getFoldAt(cursor.row, cursor.column); + + if (fold) { + this.expandFold(fold); + return; + } else if (bracketPos = this.findMatchingBracket(cursor)) { + if (range.comparePoint(bracketPos) == 1) { + range.end = bracketPos; + } else { + range.start = bracketPos; + range.start.column++; + range.end.column--; + } + } else if (bracketPos = this.findMatchingBracket({row: cursor.row, column: cursor.column + 1})) { + if (range.comparePoint(bracketPos) == 1) + range.end = bracketPos; + else + range.start = bracketPos; + + range.start.column++; + } else { + range = this.getCommentFoldRange(cursor.row, cursor.column) || range; + } + } else { + var folds = this.getFoldsInRange(range); + if (tryToUnfold && folds.length) { + this.expandFolds(folds); + return; + } else if (folds.length == 1 ) { + fold = folds[0]; + } + } + + if (!fold) + fold = this.getFoldAt(range.start.row, range.start.column); + + if (fold && fold.range.toString() == range.toString()) { + this.expandFold(fold); + return; + } + + var placeholder = "..."; + if (!range.isMultiLine()) { + placeholder = this.getTextRange(range); + if(placeholder.length < 4) + return; + placeholder = placeholder.trim().substring(0, 2) + ".."; + } + + this.addFold(placeholder, range); + }; + + this.getCommentFoldRange = function(row, column, dir) { + var iterator = new TokenIterator(this, row, column); + var token = iterator.getCurrentToken(); + if (token && /^comment|string/.test(token.type)) { + var range = new Range(); + var re = new RegExp(token.type.replace(/\..*/, "\\.")); + if (dir != 1) { + do { + token = iterator.stepBackward(); + } while(token && re.test(token.type)); + iterator.stepForward(); + } + + range.start.row = iterator.getCurrentTokenRow(); + range.start.column = iterator.getCurrentTokenColumn() + 2; + + iterator = new TokenIterator(this, row, column); + + if (dir != -1) { + do { + token = iterator.stepForward(); + } while(token && re.test(token.type)); + token = iterator.stepBackward(); + } else + token = iterator.getCurrentToken(); + + range.end.row = iterator.getCurrentTokenRow(); + range.end.column = iterator.getCurrentTokenColumn() + token.value.length - 2; + return range; + } + }; + + this.foldAll = function(startRow, endRow, depth) { + if (depth == undefined) + depth = 100000; // JSON.stringify doesn't hanle Infinity + var foldWidgets = this.foldWidgets; + if (!foldWidgets) + return; // mode doesn't support folding + endRow = endRow || this.getLength(); + startRow = startRow || 0; + for (var row = startRow; row < endRow; row++) { + if (foldWidgets[row] == null) + foldWidgets[row] = this.getFoldWidget(row); + if (foldWidgets[row] != "start") + continue; + + var range = this.getFoldWidgetRange(row); + if (range && range.isMultiLine() + && range.end.row <= endRow + && range.start.row >= startRow + ) { + row = range.end.row; + try { + var fold = this.addFold("...", range); + if (fold) + fold.collapseChildren = depth; + } catch(e) {} + } + } + }; + this.$foldStyles = { + "manual": 1, + "markbegin": 1, + "markbeginend": 1 + }; + this.$foldStyle = "markbegin"; + this.setFoldStyle = function(style) { + if (!this.$foldStyles[style]) + throw new Error("invalid fold style: " + style + "[" + Object.keys(this.$foldStyles).join(", ") + "]"); + + if (this.$foldStyle == style) + return; + + this.$foldStyle = style; + + if (style == "manual") + this.unfold(); + var mode = this.$foldMode; + this.$setFolding(null); + this.$setFolding(mode); + }; + + this.$setFolding = function(foldMode) { + if (this.$foldMode == foldMode) + return; + + this.$foldMode = foldMode; + + this.removeListener('change', this.$updateFoldWidgets); + this._emit("changeAnnotation"); + + if (!foldMode || this.$foldStyle == "manual") { + this.foldWidgets = null; + return; + } + + this.foldWidgets = []; + this.getFoldWidget = foldMode.getFoldWidget.bind(foldMode, this, this.$foldStyle); + this.getFoldWidgetRange = foldMode.getFoldWidgetRange.bind(foldMode, this, this.$foldStyle); + + this.$updateFoldWidgets = this.updateFoldWidgets.bind(this); + this.on('change', this.$updateFoldWidgets); + + }; + + this.getParentFoldRangeData = function (row, ignoreCurrent) { + var fw = this.foldWidgets; + if (!fw || (ignoreCurrent && fw[row])) + return {}; + + var i = row - 1, firstRange; + while (i >= 0) { + var c = fw[i]; + if (c == null) + c = fw[i] = this.getFoldWidget(i); + + if (c == "start") { + var range = this.getFoldWidgetRange(i); + if (!firstRange) + firstRange = range; + if (range && range.end.row >= row) + break; + } + i--; + } + + return { + range: i !== -1 && range, + firstRange: firstRange + }; + } + + this.onFoldWidgetClick = function(row, e) { + e = e.domEvent; + var options = { + children: e.shiftKey, + all: e.ctrlKey || e.metaKey, + siblings: e.altKey + }; + + var range = this.$toggleFoldWidget(row, options); + if (!range) { + var el = (e.target || e.srcElement) + if (el && /ace_fold-widget/.test(el.className)) + el.className += " ace_invalid"; + } + }; + + this.$toggleFoldWidget = function(row, options) { + if (!this.getFoldWidget) + return; + var type = this.getFoldWidget(row); + var line = this.getLine(row); + + var dir = type === "end" ? -1 : 1; + var fold = this.getFoldAt(row, dir === -1 ? 0 : line.length, dir); + + if (fold) { + if (options.children || options.all) + this.removeFold(fold); + else + this.expandFold(fold); + return; + } + + var range = this.getFoldWidgetRange(row, true); + if (range && !range.isMultiLine()) { + fold = this.getFoldAt(range.start.row, range.start.column, 1); + if (fold && range.isEqual(fold.range)) { + this.removeFold(fold); + return; + } + } + + if (options.siblings) { + var data = this.getParentFoldRangeData(row); + if (data.range) { + var startRow = data.range.start.row + 1; + var endRow = data.range.end.row; + } + this.foldAll(startRow, endRow, options.all ? 10000 : 0); + } else if (options.children) { + endRow = range ? range.end.row : this.getLength(); + this.foldAll(row + 1, range.end.row, options.all ? 10000 : 0); + } else if (range) { + if (options.all) + range.collapseChildren = 10000; + this.addFold("...", range); + } + + return range; + }; + + + + this.toggleFoldWidget = function(toggleParent) { + var row = this.selection.getCursor().row; + row = this.getRowFoldStart(row); + var range = this.$toggleFoldWidget(row, {}); + + if (range) + return; + var data = this.getParentFoldRangeData(row, true); + range = data.range || data.firstRange; + + if (range) { + row = range.start.row; + var fold = this.getFoldAt(row, this.getLine(row).length, 1); + + if (fold) { + this.removeFold(fold); + } else { + this.addFold("...", range); + } + } + }; + + this.updateFoldWidgets = function(e) { + var delta = e.data; + var range = delta.range; + var firstRow = range.start.row; + var len = range.end.row - firstRow; + + if (len === 0) { + this.foldWidgets[firstRow] = null; + } else if (delta.action == "removeText" || delta.action == "removeLines") { + this.foldWidgets.splice(firstRow, len + 1, null); + } else { + var args = Array(len + 1); + args.unshift(firstRow, 1); + this.foldWidgets.splice.apply(this.foldWidgets, args); + } + }; + +} + +exports.Folding = Folding; + +}); + +ace.define('ace/edit_session/fold_line', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) { + + +var Range = require("../range").Range; +function FoldLine(foldData, folds) { + this.foldData = foldData; + if (Array.isArray(folds)) { + this.folds = folds; + } else { + folds = this.folds = [ folds ]; + } + + var last = folds[folds.length - 1] + this.range = new Range(folds[0].start.row, folds[0].start.column, + last.end.row, last.end.column); + this.start = this.range.start; + this.end = this.range.end; + + this.folds.forEach(function(fold) { + fold.setFoldLine(this); + }, this); +} + +(function() { + this.shiftRow = function(shift) { + this.start.row += shift; + this.end.row += shift; + this.folds.forEach(function(fold) { + fold.start.row += shift; + fold.end.row += shift; + }); + } + + this.addFold = function(fold) { + if (fold.sameRow) { + if (fold.start.row < this.startRow || fold.endRow > this.endRow) { + throw new Error("Can't add a fold to this FoldLine as it has no connection"); + } + this.folds.push(fold); + this.folds.sort(function(a, b) { + return -a.range.compareEnd(b.start.row, b.start.column); + }); + if (this.range.compareEnd(fold.start.row, fold.start.column) > 0) { + this.end.row = fold.end.row; + this.end.column = fold.end.column; + } else if (this.range.compareStart(fold.end.row, fold.end.column) < 0) { + this.start.row = fold.start.row; + this.start.column = fold.start.column; + } + } else if (fold.start.row == this.end.row) { + this.folds.push(fold); + this.end.row = fold.end.row; + this.end.column = fold.end.column; + } else if (fold.end.row == this.start.row) { + this.folds.unshift(fold); + this.start.row = fold.start.row; + this.start.column = fold.start.column; + } else { + throw new Error("Trying to add fold to FoldRow that doesn't have a matching row"); + } + fold.foldLine = this; + } + + this.containsRow = function(row) { + return row >= this.start.row && row <= this.end.row; + } + + this.walk = function(callback, endRow, endColumn) { + var lastEnd = 0, + folds = this.folds, + fold, + comp, stop, isNewRow = true; + + if (endRow == null) { + endRow = this.end.row; + endColumn = this.end.column; + } + + for (var i = 0; i < folds.length; i++) { + fold = folds[i]; + + comp = fold.range.compareStart(endRow, endColumn); + if (comp == -1) { + callback(null, endRow, endColumn, lastEnd, isNewRow); + return; + } + + stop = callback(null, fold.start.row, fold.start.column, lastEnd, isNewRow); + stop = !stop && callback(fold.placeholder, fold.start.row, fold.start.column, lastEnd); + if (stop || comp == 0) { + return; + } + isNewRow = !fold.sameRow; + lastEnd = fold.end.column; + } + callback(null, endRow, endColumn, lastEnd, isNewRow); + } + + this.getNextFoldTo = function(row, column) { + var fold, cmp; + for (var i = 0; i < this.folds.length; i++) { + fold = this.folds[i]; + cmp = fold.range.compareEnd(row, column); + if (cmp == -1) { + return { + fold: fold, + kind: "after" + }; + } else if (cmp == 0) { + return { + fold: fold, + kind: "inside" + } + } + } + return null; + } + + this.addRemoveChars = function(row, column, len) { + var ret = this.getNextFoldTo(row, column), + fold, folds; + if (ret) { + fold = ret.fold; + if (ret.kind == "inside" + && fold.start.column != column + && fold.start.row != row) + { + window.console && window.console.log(row, column, fold); + } else if (fold.start.row == row) { + folds = this.folds; + var i = folds.indexOf(fold); + if (i == 0) { + this.start.column += len; + } + for (i; i < folds.length; i++) { + fold = folds[i]; + fold.start.column += len; + if (!fold.sameRow) { + return; + } + fold.end.column += len; + } + this.end.column += len; + } + } + } + + this.split = function(row, column) { + var fold = this.getNextFoldTo(row, column).fold; + var folds = this.folds; + var foldData = this.foldData; + + if (!fold) + return null; + + var i = folds.indexOf(fold); + var foldBefore = folds[i - 1]; + this.end.row = foldBefore.end.row; + this.end.column = foldBefore.end.column; + folds = folds.splice(i, folds.length - i); + + var newFoldLine = new FoldLine(foldData, folds); + foldData.splice(foldData.indexOf(this) + 1, 0, newFoldLine); + return newFoldLine; + } + + this.merge = function(foldLineNext) { + var folds = foldLineNext.folds; + for (var i = 0; i < folds.length; i++) { + this.addFold(folds[i]); + } + var foldData = this.foldData; + foldData.splice(foldData.indexOf(foldLineNext), 1); + } + + this.toString = function() { + var ret = [this.range.toString() + ": [" ]; + + this.folds.forEach(function(fold) { + ret.push(" " + fold.toString()); + }); + ret.push("]") + return ret.join("\n"); + } + + this.idxToPosition = function(idx) { + var lastFoldEndColumn = 0; + var fold; + + for (var i = 0; i < this.folds.length; i++) { + var fold = this.folds[i]; + + idx -= fold.start.column - lastFoldEndColumn; + if (idx < 0) { + return { + row: fold.start.row, + column: fold.start.column + idx + }; + } + + idx -= fold.placeholder.length; + if (idx < 0) { + return fold.start; + } + + lastFoldEndColumn = fold.end.column; + } + + return { + row: this.end.row, + column: this.end.column + idx + }; + } +}).call(FoldLine.prototype); + +exports.FoldLine = FoldLine; +}); + +ace.define('ace/edit_session/fold', ['require', 'exports', 'module' , 'ace/range', 'ace/range_list', 'ace/lib/oop'], function(require, exports, module) { + + +var Range = require("../range").Range; +var RangeList = require("../range_list").RangeList; +var oop = require("../lib/oop") +var Fold = exports.Fold = function(range, placeholder) { + this.foldLine = null; + this.placeholder = placeholder; + this.range = range; + this.start = range.start; + this.end = range.end; + + this.sameRow = range.start.row == range.end.row; + this.subFolds = this.ranges = []; +}; + +oop.inherits(Fold, RangeList); + +(function() { + + this.toString = function() { + return '"' + this.placeholder + '" ' + this.range.toString(); + }; + + this.setFoldLine = function(foldLine) { + this.foldLine = foldLine; + this.subFolds.forEach(function(fold) { + fold.setFoldLine(foldLine); + }); + }; + + this.clone = function() { + var range = this.range.clone(); + var fold = new Fold(range, this.placeholder); + this.subFolds.forEach(function(subFold) { + fold.subFolds.push(subFold.clone()); + }); + fold.collapseChildren = this.collapseChildren; + return fold; + }; + + this.addSubFold = function(fold) { + if (this.range.isEqual(fold)) + return; + + if (!this.range.containsRange(fold)) + throw new Error("A fold can't intersect already existing fold" + fold.range + this.range); + consumeRange(fold, this.start); + + var row = fold.start.row, column = fold.start.column; + for (var i = 0, cmp = -1; i < this.subFolds.length; i++) { + cmp = this.subFolds[i].range.compare(row, column); + if (cmp != 1) + break; + } + var afterStart = this.subFolds[i]; + + if (cmp == 0) + return afterStart.addSubFold(fold); + var row = fold.range.end.row, column = fold.range.end.column; + for (var j = i, cmp = -1; j < this.subFolds.length; j++) { + cmp = this.subFolds[j].range.compare(row, column); + if (cmp != 1) + break; + } + var afterEnd = this.subFolds[j]; + + if (cmp == 0) + throw new Error("A fold can't intersect already existing fold" + fold.range + this.range); + + var consumedFolds = this.subFolds.splice(i, j - i, fold); + fold.setFoldLine(this.foldLine); + + return fold; + }; + + this.restoreRange = function(range) { + return restoreRange(range, this.start); + }; + +}).call(Fold.prototype); + +function consumePoint(point, anchor) { + point.row -= anchor.row; + if (point.row == 0) + point.column -= anchor.column; +} +function consumeRange(range, anchor) { + consumePoint(range.start, anchor); + consumePoint(range.end, anchor); +} +function restorePoint(point, anchor) { + if (point.row == 0) + point.column += anchor.column; + point.row += anchor.row; +} +function restoreRange(range, anchor) { + restorePoint(range.start, anchor); + restorePoint(range.end, anchor); +} + +}); + +ace.define('ace/range_list', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) { + +var Range = require("./range").Range; +var comparePoints = Range.comparePoints; + +var RangeList = function() { + this.ranges = []; +}; + +(function() { + this.comparePoints = comparePoints; + + this.pointIndex = function(pos, excludeEdges, startIndex) { + var list = this.ranges; + + for (var i = startIndex || 0; i < list.length; i++) { + var range = list[i]; + var cmpEnd = comparePoints(pos, range.end); + if (cmpEnd > 0) + continue; + var cmpStart = comparePoints(pos, range.start); + if (cmpEnd === 0) + return excludeEdges && cmpStart !== 0 ? -i-2 : i; + if (cmpStart > 0 || (cmpStart === 0 && !excludeEdges)) + return i; + + return -i-1; + } + return -i - 1; + }; + + this.add = function(range) { + var excludeEdges = !range.isEmpty(); + var startIndex = this.pointIndex(range.start, excludeEdges); + if (startIndex < 0) + startIndex = -startIndex - 1; + + var endIndex = this.pointIndex(range.end, excludeEdges, startIndex); + + if (endIndex < 0) + endIndex = -endIndex - 1; + else + endIndex++; + return this.ranges.splice(startIndex, endIndex - startIndex, range); + }; + + this.addList = function(list) { + var removed = []; + for (var i = list.length; i--; ) { + removed.push.call(removed, this.add(list[i])); + } + return removed; + }; + + this.substractPoint = function(pos) { + var i = this.pointIndex(pos); + + if (i >= 0) + return this.ranges.splice(i, 1); + }; + this.merge = function() { + var removed = []; + var list = this.ranges; + + list = list.sort(function(a, b) { + return comparePoints(a.start, b.start); + }); + + var next = list[0], range; + for (var i = 1; i < list.length; i++) { + range = next; + next = list[i]; + var cmp = comparePoints(range.end, next.start); + if (cmp < 0) + continue; + + if (cmp == 0 && !range.isEmpty() && !next.isEmpty()) + continue; + + if (comparePoints(range.end, next.end) < 0) { + range.end.row = next.end.row; + range.end.column = next.end.column; + } + + list.splice(i, 1); + removed.push(next); + next = range; + i--; + } + + this.ranges = list; + + return removed; + }; + + this.contains = function(row, column) { + return this.pointIndex({row: row, column: column}) >= 0; + }; + + this.containsPoint = function(pos) { + return this.pointIndex(pos) >= 0; + }; + + this.rangeAtPoint = function(pos) { + var i = this.pointIndex(pos); + if (i >= 0) + return this.ranges[i]; + }; + + + this.clipRows = function(startRow, endRow) { + var list = this.ranges; + if (list[0].start.row > endRow || list[list.length - 1].start.row < startRow) + return []; + + var startIndex = this.pointIndex({row: startRow, column: 0}); + if (startIndex < 0) + startIndex = -startIndex - 1; + var endIndex = this.pointIndex({row: endRow, column: 0}, startIndex); + if (endIndex < 0) + endIndex = -endIndex - 1; + + var clipped = []; + for (var i = startIndex; i < endIndex; i++) { + clipped.push(list[i]); + } + return clipped; + }; + + this.removeAll = function() { + return this.ranges.splice(0, this.ranges.length); + }; + + this.attach = function(session) { + if (this.session) + this.detach(); + + this.session = session; + this.onChange = this.$onChange.bind(this); + + this.session.on('change', this.onChange); + }; + + this.detach = function() { + if (!this.session) + return; + this.session.removeListener('change', this.onChange); + this.session = null; + }; + + this.$onChange = function(e) { + var changeRange = e.data.range; + if (e.data.action[0] == "i"){ + var start = changeRange.start; + var end = changeRange.end; + } else { + var end = changeRange.start; + var start = changeRange.end; + } + var startRow = start.row; + var endRow = end.row; + var lineDif = endRow - startRow; + + var colDiff = -start.column + end.column; + var ranges = this.ranges; + + for (var i = 0, n = ranges.length; i < n; i++) { + var r = ranges[i]; + if (r.end.row < startRow) + continue; + if (r.start.row > startRow) + break; + + if (r.start.row == startRow && r.start.column >= start.column ) { + if (r.start.column == start.column && this.$insertRight) { + } else { + r.start.column += colDiff; + r.start.row += lineDif; + } + } + if (r.end.row == startRow && r.end.column >= start.column) { + if (r.end.column == start.column && this.$insertRight) { + continue; + } + if (r.end.column == start.column && colDiff > 0 && i < n - 1) { + if (r.end.column > r.start.column && r.end.column == ranges[i+1].start.column) + r.end.column -= colDiff; + } + r.end.column += colDiff; + r.end.row += lineDif; + } + } + + if (lineDif != 0 && i < n) { + for (; i < n; i++) { + var r = ranges[i]; + r.start.row += lineDif; + r.end.row += lineDif; + } + } + }; + +}).call(RangeList.prototype); + +exports.RangeList = RangeList; +}); + +ace.define('ace/edit_session/bracket_match', ['require', 'exports', 'module' , 'ace/token_iterator', 'ace/range'], function(require, exports, module) { + + +var TokenIterator = require("../token_iterator").TokenIterator; +var Range = require("../range").Range; + + +function BracketMatch() { + + this.findMatchingBracket = function(position, chr) { + if (position.column == 0) return null; + + var charBeforeCursor = chr || this.getLine(position.row).charAt(position.column-1); + if (charBeforeCursor == "") return null; + + var match = charBeforeCursor.match(/([\(\[\{])|([\)\]\}])/); + if (!match) + return null; + + if (match[1]) + return this.$findClosingBracket(match[1], position); + else + return this.$findOpeningBracket(match[2], position); + }; + + this.getBracketRange = function(pos) { + var line = this.getLine(pos.row); + var before = true, range; + + var chr = line.charAt(pos.column-1); + var match = chr && chr.match(/([\(\[\{])|([\)\]\}])/); + if (!match) { + chr = line.charAt(pos.column); + pos = {row: pos.row, column: pos.column + 1}; + match = chr && chr.match(/([\(\[\{])|([\)\]\}])/); + before = false; + } + if (!match) + return null; + + if (match[1]) { + var bracketPos = this.$findClosingBracket(match[1], pos); + if (!bracketPos) + return null; + range = Range.fromPoints(pos, bracketPos); + if (!before) { + range.end.column++; + range.start.column--; + } + range.cursor = range.end; + } else { + var bracketPos = this.$findOpeningBracket(match[2], pos); + if (!bracketPos) + return null; + range = Range.fromPoints(bracketPos, pos); + if (!before) { + range.start.column++; + range.end.column--; + } + range.cursor = range.start; + } + + return range; + }; + + this.$brackets = { + ")": "(", + "(": ")", + "]": "[", + "[": "]", + "{": "}", + "}": "{" + }; + + this.$findOpeningBracket = function(bracket, position, typeRe) { + var openBracket = this.$brackets[bracket]; + var depth = 1; + + var iterator = new TokenIterator(this, position.row, position.column); + var token = iterator.getCurrentToken(); + if (!token) + token = iterator.stepForward(); + if (!token) + return; + + if (!typeRe){ + typeRe = new RegExp( + "(\\.?" + + token.type.replace(".", "\\.").replace("rparen", ".paren") + + ")+" + ); + } + var valueIndex = position.column - iterator.getCurrentTokenColumn() - 2; + var value = token.value; + + while (true) { + + while (valueIndex >= 0) { + var chr = value.charAt(valueIndex); + if (chr == openBracket) { + depth -= 1; + if (depth == 0) { + return {row: iterator.getCurrentTokenRow(), + column: valueIndex + iterator.getCurrentTokenColumn()}; + } + } + else if (chr == bracket) { + depth += 1; + } + valueIndex -= 1; + } + do { + token = iterator.stepBackward(); + } while (token && !typeRe.test(token.type)); + + if (token == null) + break; + + value = token.value; + valueIndex = value.length - 1; + } + + return null; + }; + + this.$findClosingBracket = function(bracket, position, typeRe) { + var closingBracket = this.$brackets[bracket]; + var depth = 1; + + var iterator = new TokenIterator(this, position.row, position.column); + var token = iterator.getCurrentToken(); + if (!token) + token = iterator.stepForward(); + if (!token) + return; + + if (!typeRe){ + typeRe = new RegExp( + "(\\.?" + + token.type.replace(".", "\\.").replace("lparen", ".paren") + + ")+" + ); + } + var valueIndex = position.column - iterator.getCurrentTokenColumn(); + + while (true) { + + var value = token.value; + var valueLength = value.length; + while (valueIndex < valueLength) { + var chr = value.charAt(valueIndex); + if (chr == closingBracket) { + depth -= 1; + if (depth == 0) { + return {row: iterator.getCurrentTokenRow(), + column: valueIndex + iterator.getCurrentTokenColumn()}; + } + } + else if (chr == bracket) { + depth += 1; + } + valueIndex += 1; + } + do { + token = iterator.stepForward(); + } while (token && !typeRe.test(token.type)); + + if (token == null) + break; + + valueIndex = 0; + } + + return null; + }; +} +exports.BracketMatch = BracketMatch; + +}); + +ace.define('ace/search', ['require', 'exports', 'module' , 'ace/lib/lang', 'ace/lib/oop', 'ace/range'], function(require, exports, module) { + + +var lang = require("./lib/lang"); +var oop = require("./lib/oop"); +var Range = require("./range").Range; + +var Search = function() { + this.$options = {}; +}; + +(function() { + this.set = function(options) { + oop.mixin(this.$options, options); + return this; + }; + this.getOptions = function() { + return lang.copyObject(this.$options); + }; + this.setOptions = function(options) { + this.$options = options; + }; + this.find = function(session) { + var iterator = this.$matchIterator(session, this.$options); + + if (!iterator) + return false; + + var firstRange = null; + iterator.forEach(function(range, row, offset) { + if (!range.start) { + var column = range.offset + (offset || 0); + firstRange = new Range(row, column, row, column+range.length); + } else + firstRange = range; + return true; + }); + + return firstRange; + }; + this.findAll = function(session) { + var options = this.$options; + if (!options.needle) + return []; + this.$assembleRegExp(options); + + var range = options.range; + var lines = range + ? session.getLines(range.start.row, range.end.row) + : session.doc.getAllLines(); + + var ranges = []; + var re = options.re; + if (options.$isMultiLine) { + var len = re.length; + var maxRow = lines.length - len; + var prevRange; + outer: for (var row = re.offset || 0; row <= maxRow; row++) { + for (var j = 0; j < len; j++) + if (lines[row + j].search(re[j]) == -1) + continue outer; + + var startLine = lines[row]; + var line = lines[row + len - 1]; + var startIndex = startLine.length - startLine.match(re[0])[0].length; + var endIndex = line.match(re[len - 1])[0].length; + + if (prevRange && prevRange.end.row === row && + prevRange.end.column > startIndex + ) { + continue; + } + ranges.push(prevRange = new Range( + row, startIndex, row + len - 1, endIndex + )); + if (len > 2) + row = row + len - 2; + } + } else { + for (var i = 0; i < lines.length; i++) { + var matches = lang.getMatchOffsets(lines[i], re); + for (var j = 0; j < matches.length; j++) { + var match = matches[j]; + ranges.push(new Range(i, match.offset, i, match.offset + match.length)); + } + } + } + + if (range) { + var startColumn = range.start.column; + var endColumn = range.start.column; + var i = 0, j = ranges.length - 1; + while (i < j && ranges[i].start.column < startColumn && ranges[i].start.row == range.start.row) + i++; + + while (i < j && ranges[j].end.column > endColumn && ranges[j].end.row == range.end.row) + j--; + + ranges = ranges.slice(i, j + 1); + for (i = 0, j = ranges.length; i < j; i++) { + ranges[i].start.row += range.start.row; + ranges[i].end.row += range.start.row; + } + } + + return ranges; + }; + this.replace = function(input, replacement) { + var options = this.$options; + + var re = this.$assembleRegExp(options); + if (options.$isMultiLine) + return replacement; + + if (!re) + return; + + var match = re.exec(input); + if (!match || match[0].length != input.length) + return null; + + replacement = input.replace(re, replacement); + if (options.preserveCase) { + replacement = replacement.split(""); + for (var i = Math.min(input.length, input.length); i--; ) { + var ch = input[i]; + if (ch && ch.toLowerCase() != ch) + replacement[i] = replacement[i].toUpperCase(); + else + replacement[i] = replacement[i].toLowerCase(); + } + replacement = replacement.join(""); + } + + return replacement; + }; + + this.$matchIterator = function(session, options) { + var re = this.$assembleRegExp(options); + if (!re) + return false; + + var self = this, callback, backwards = options.backwards; + + if (options.$isMultiLine) { + var len = re.length; + var matchIterator = function(line, row, offset) { + var startIndex = line.search(re[0]); + if (startIndex == -1) + return; + for (var i = 1; i < len; i++) { + line = session.getLine(row + i); + if (line.search(re[i]) == -1) + return; + } + + var endIndex = line.match(re[len - 1])[0].length; + + var range = new Range(row, startIndex, row + len - 1, endIndex); + if (re.offset == 1) { + range.start.row--; + range.start.column = Number.MAX_VALUE; + } else if (offset) + range.start.column += offset; + + if (callback(range)) + return true; + }; + } else if (backwards) { + var matchIterator = function(line, row, startIndex) { + var matches = lang.getMatchOffsets(line, re); + for (var i = matches.length-1; i >= 0; i--) + if (callback(matches[i], row, startIndex)) + return true; + }; + } else { + var matchIterator = function(line, row, startIndex) { + var matches = lang.getMatchOffsets(line, re); + for (var i = 0; i < matches.length; i++) + if (callback(matches[i], row, startIndex)) + return true; + }; + } + + return { + forEach: function(_callback) { + callback = _callback; + self.$lineIterator(session, options).forEach(matchIterator); + } + }; + }; + + this.$assembleRegExp = function(options, $disableFakeMultiline) { + if (options.needle instanceof RegExp) + return options.re = options.needle; + + var needle = options.needle; + + if (!options.needle) + return options.re = false; + + if (!options.regExp) + needle = lang.escapeRegExp(needle); + + if (options.wholeWord) + needle = "\\b" + needle + "\\b"; + + var modifier = options.caseSensitive ? "g" : "gi"; + + options.$isMultiLine = !$disableFakeMultiline && /[\n\r]/.test(needle); + if (options.$isMultiLine) + return options.re = this.$assembleMultilineRegExp(needle, modifier); + + try { + var re = new RegExp(needle, modifier); + } catch(e) { + re = false; + } + return options.re = re; + }; + + this.$assembleMultilineRegExp = function(needle, modifier) { + var parts = needle.replace(/\r\n|\r|\n/g, "$\n^").split("\n"); + var re = []; + for (var i = 0; i < parts.length; i++) try { + re.push(new RegExp(parts[i], modifier)); + } catch(e) { + return false; + } + if (parts[0] == "") { + re.shift(); + re.offset = 1; + } else { + re.offset = 0; + } + return re; + }; + + this.$lineIterator = function(session, options) { + var backwards = options.backwards == true; + var skipCurrent = options.skipCurrent != false; + + var range = options.range; + var start = options.start; + if (!start) + start = range ? range[backwards ? "end" : "start"] : session.selection.getRange(); + + if (start.start) + start = start[skipCurrent != backwards ? "end" : "start"]; + + var firstRow = range ? range.start.row : 0; + var lastRow = range ? range.end.row : session.getLength() - 1; + + var forEach = backwards ? function(callback) { + var row = start.row; + + var line = session.getLine(row).substring(0, start.column); + if (callback(line, row)) + return; + + for (row--; row >= firstRow; row--) + if (callback(session.getLine(row), row)) + return; + + if (options.wrap == false) + return; + + for (row = lastRow, firstRow = start.row; row >= firstRow; row--) + if (callback(session.getLine(row), row)) + return; + } : function(callback) { + var row = start.row; + + var line = session.getLine(row).substr(start.column); + if (callback(line, row, start.column)) + return; + + for (row = row+1; row <= lastRow; row++) + if (callback(session.getLine(row), row)) + return; + + if (options.wrap == false) + return; + + for (row = firstRow, lastRow = start.row; row <= lastRow; row++) + if (callback(session.getLine(row), row)) + return; + }; + + return {forEach: forEach}; + }; + +}).call(Search.prototype); + +exports.Search = Search; +}); +ace.define('ace/commands/command_manager', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/keyboard/hash_handler', 'ace/lib/event_emitter'], function(require, exports, module) { + + +var oop = require("../lib/oop"); +var HashHandler = require("../keyboard/hash_handler").HashHandler; +var EventEmitter = require("../lib/event_emitter").EventEmitter; + +var CommandManager = function(platform, commands) { + HashHandler.call(this, commands, platform); + this.byName = this.commands; + this.setDefaultHandler("exec", function(e) { + return e.command.exec(e.editor, e.args || {}); + }); +}; + +oop.inherits(CommandManager, HashHandler); + +(function() { + + oop.implement(this, EventEmitter); + + this.exec = function(command, editor, args) { + if (typeof command === 'string') + command = this.commands[command]; + + if (!command) + return false; + + if (editor && editor.$readOnly && !command.readOnly) + return false; + + var e = {editor: editor, command: command, args: args}; + var retvalue = this._emit("exec", e); + this._signal("afterExec", e); + + return retvalue === false ? false : true; + }; + + this.toggleRecording = function(editor) { + if (this.$inReplay) + return; + + editor && editor._emit("changeStatus"); + if (this.recording) { + this.macro.pop(); + this.removeEventListener("exec", this.$addCommandToMacro); + + if (!this.macro.length) + this.macro = this.oldMacro; + + return this.recording = false; + } + if (!this.$addCommandToMacro) { + this.$addCommandToMacro = function(e) { + this.macro.push([e.command, e.args]); + }.bind(this); + } + + this.oldMacro = this.macro; + this.macro = []; + this.on("exec", this.$addCommandToMacro); + return this.recording = true; + }; + + this.replay = function(editor) { + if (this.$inReplay || !this.macro) + return; + + if (this.recording) + return this.toggleRecording(editor); + + try { + this.$inReplay = true; + this.macro.forEach(function(x) { + if (typeof x == "string") + this.exec(x, editor); + else + this.exec(x[0], editor, x[1]); + }, this); + } finally { + this.$inReplay = false; + } + }; + + this.trimMacro = function(m) { + return m.map(function(x){ + if (typeof x[0] != "string") + x[0] = x[0].name; + if (!x[1]) + x = x[0]; + return x; + }); + }; + +}).call(CommandManager.prototype); + +exports.CommandManager = CommandManager; + +}); + +ace.define('ace/keyboard/hash_handler', ['require', 'exports', 'module' , 'ace/lib/keys', 'ace/lib/useragent'], function(require, exports, module) { + + +var keyUtil = require("../lib/keys"); +var useragent = require("../lib/useragent"); + +function HashHandler(config, platform) { + this.platform = platform || (useragent.isMac ? "mac" : "win"); + this.commands = {}; + this.commandKeyBinding = {}; + if (this.__defineGetter__ && this.__defineSetter__ && typeof console != "undefined" && console.error) { + var warned = false; + var warn = function() { + if (!warned) { + warned = true; + console.error("commmandKeyBinding has too many m's. use commandKeyBinding"); + } + }; + this.__defineGetter__("commmandKeyBinding", function() { + warn(); + return this.commandKeyBinding; + }); + this.__defineSetter__("commmandKeyBinding", function(val) { + warn(); + return this.commandKeyBinding = val; + }); + } else { + this.commmandKeyBinding = this.commandKeyBinding; + } + + this.addCommands(config); +}; + +(function() { + + this.addCommand = function(command) { + if (this.commands[command.name]) + this.removeCommand(command); + + this.commands[command.name] = command; + + if (command.bindKey) + this._buildKeyHash(command); + }; + + this.removeCommand = function(command) { + var name = (typeof command === 'string' ? command : command.name); + command = this.commands[name]; + delete this.commands[name]; + var ckb = this.commandKeyBinding; + for (var hashId in ckb) { + for (var key in ckb[hashId]) { + if (ckb[hashId][key] == command) + delete ckb[hashId][key]; + } + } + }; + + this.bindKey = function(key, command) { + if(!key) + return; + if (typeof command == "function") { + this.addCommand({exec: command, bindKey: key, name: command.name || key}); + return; + } + + var ckb = this.commandKeyBinding; + key.split("|").forEach(function(keyPart) { + var binding = this.parseKeys(keyPart, command); + var hashId = binding.hashId; + (ckb[hashId] || (ckb[hashId] = {}))[binding.key] = command; + }, this); + }; + + this.addCommands = function(commands) { + commands && Object.keys(commands).forEach(function(name) { + var command = commands[name]; + if (!command) + return; + + if (typeof command === "string") + return this.bindKey(command, name); + + if (typeof command === "function") + command = { exec: command }; + + if (typeof command !== "object") + return; + + if (!command.name) + command.name = name; + + this.addCommand(command); + }, this); + }; + + this.removeCommands = function(commands) { + Object.keys(commands).forEach(function(name) { + this.removeCommand(commands[name]); + }, this); + }; + + this.bindKeys = function(keyList) { + Object.keys(keyList).forEach(function(key) { + this.bindKey(key, keyList[key]); + }, this); + }; + + this._buildKeyHash = function(command) { + var binding = command.bindKey; + if (!binding) + return; + + var key = typeof binding == "string" ? binding: binding[this.platform]; + this.bindKey(key, command); + }; + this.parseKeys = function(keys) { + if (keys.indexOf(" ") != -1) + keys = keys.split(/\s+/).pop(); + + var parts = keys.toLowerCase().split(/[\-\+]([\-\+])?/).filter(function(x){return x}); + var key = parts.pop(); + + var keyCode = keyUtil[key]; + if (keyUtil.FUNCTION_KEYS[keyCode]) + key = keyUtil.FUNCTION_KEYS[keyCode].toLowerCase(); + else if (!parts.length) + return {key: key, hashId: -1}; + else if (parts.length == 1 && parts[0] == "shift") + return {key: key.toUpperCase(), hashId: -1}; + + var hashId = 0; + for (var i = parts.length; i--;) { + var modifier = keyUtil.KEY_MODS[parts[i]]; + if (modifier == null) { + if (typeof console != "undefined") + console.error("invalid modifier " + parts[i] + " in " + keys); + return false; + } + hashId |= modifier; + } + return {key: key, hashId: hashId}; + }; + + this.findKeyCommand = function findKeyCommand(hashId, keyString) { + var ckbr = this.commandKeyBinding; + return ckbr[hashId] && ckbr[hashId][keyString]; + }; + + this.handleKeyboard = function(data, hashId, keyString, keyCode) { + return { + command: this.findKeyCommand(hashId, keyString) + }; + }; + +}).call(HashHandler.prototype) + +exports.HashHandler = HashHandler; +}); + +ace.define('ace/commands/default_commands', ['require', 'exports', 'module' , 'ace/lib/lang', 'ace/config'], function(require, exports, module) { + + +var lang = require("../lib/lang"); +var config = require("../config"); + +function bindKey(win, mac) { + return {win: win, mac: mac}; +} +exports.commands = [{ + name: "showSettingsMenu", + bindKey: bindKey("Ctrl-,", "Command-,"), + exec: function(editor) { + config.loadModule("ace/ext/settings_menu", function(module) { + module.init(editor); + editor.showSettingsMenu(); + }); + }, + readOnly: true +}, { + name: "goToNextError", + bindKey: bindKey("Alt-E", "Ctrl-E"), + exec: function(editor) { + config.loadModule("ace/ext/error_marker", function(module) { + module.showErrorMarker(editor, 1); + }); + }, + scrollIntoView: "animate", + readOnly: true +}, { + name: "goToPreviousError", + bindKey: bindKey("Alt-Shift-E", "Ctrl-Shift-E"), + exec: function(editor) { + config.loadModule("ace/ext/error_marker", function(module) { + module.showErrorMarker(editor, -1); + }); + }, + scrollIntoView: "animate", + readOnly: true +}, { + name: "selectall", + bindKey: bindKey("Ctrl-A", "Command-A"), + exec: function(editor) { editor.selectAll(); }, + readOnly: true +}, { + name: "centerselection", + bindKey: bindKey(null, "Ctrl-L"), + exec: function(editor) { editor.centerSelection(); }, + readOnly: true +}, { + name: "gotoline", + bindKey: bindKey("Ctrl-L", "Command-L"), + exec: function(editor) { + var line = parseInt(prompt("Enter line number:"), 10); + if (!isNaN(line)) { + editor.gotoLine(line); + } + }, + readOnly: true +}, { + name: "fold", + bindKey: bindKey("Alt-L|Ctrl-F1", "Command-Alt-L|Command-F1"), + exec: function(editor) { editor.session.toggleFold(false); }, + scrollIntoView: "center", + readOnly: true +}, { + name: "unfold", + bindKey: bindKey("Alt-Shift-L|Ctrl-Shift-F1", "Command-Alt-Shift-L|Command-Shift-F1"), + exec: function(editor) { editor.session.toggleFold(true); }, + scrollIntoView: "center", + readOnly: true +}, { + name: "toggleFoldWidget", + bindKey: bindKey("F2", "F2"), + exec: function(editor) { editor.session.toggleFoldWidget(); }, + scrollIntoView: "center", + readOnly: true +}, { + name: "toggleParentFoldWidget", + bindKey: bindKey("Alt-F2", "Alt-F2"), + exec: function(editor) { editor.session.toggleFoldWidget(true); }, + scrollIntoView: "center", + readOnly: true +}, { + name: "foldall", + bindKey: bindKey("Ctrl-Alt-0", "Ctrl-Command-Option-0"), + exec: function(editor) { editor.session.foldAll(); }, + scrollIntoView: "center", + readOnly: true +}, { + name: "foldOther", + bindKey: bindKey("Alt-0", "Command-Option-0"), + exec: function(editor) { + editor.session.foldAll(); + editor.session.unfold(editor.selection.getAllRanges()); + }, + scrollIntoView: "center", + readOnly: true +}, { + name: "unfoldall", + bindKey: bindKey("Alt-Shift-0", "Command-Option-Shift-0"), + exec: function(editor) { editor.session.unfold(); }, + scrollIntoView: "center", + readOnly: true +}, { + name: "findnext", + bindKey: bindKey("Ctrl-K", "Command-G"), + exec: function(editor) { editor.findNext(); }, + readOnly: true +}, { + name: "findprevious", + bindKey: bindKey("Ctrl-Shift-K", "Command-Shift-G"), + exec: function(editor) { editor.findPrevious(); }, + readOnly: true +}, { + name: "selectOrFindNext", + bindKey: bindKey("ALt-K", "Ctrl-G"), + exec: function(editor) { + if (editor.selection.isEmpty()) + editor.selection.selectWord(); + else + editor.findNext(); + }, + readOnly: true +}, { + name: "selectOrFindPrevious", + bindKey: bindKey("Alt-Shift-K", "Ctrl-Shift-G"), + exec: function(editor) { + if (editor.selection.isEmpty()) + editor.selection.selectWord(); + else + editor.findPrevious(); + }, + readOnly: true +}, { + name: "find", + bindKey: bindKey("Ctrl-F", "Command-F"), + exec: function(editor) { + config.loadModule("ace/ext/searchbox", function(e) {e.Search(editor)}); + }, + readOnly: true +}, { + name: "overwrite", + bindKey: "Insert", + exec: function(editor) { editor.toggleOverwrite(); }, + readOnly: true +}, { + name: "selecttostart", + bindKey: bindKey("Ctrl-Shift-Home", "Command-Shift-Up"), + exec: function(editor) { editor.getSelection().selectFileStart(); }, + multiSelectAction: "forEach", + readOnly: true, + scrollIntoView: "animate", + aceCommandGroup: "fileJump" +}, { + name: "gotostart", + bindKey: bindKey("Ctrl-Home", "Command-Home|Command-Up"), + exec: function(editor) { editor.navigateFileStart(); }, + multiSelectAction: "forEach", + readOnly: true, + scrollIntoView: "animate", + aceCommandGroup: "fileJump" +}, { + name: "selectup", + bindKey: bindKey("Shift-Up", "Shift-Up"), + exec: function(editor) { editor.getSelection().selectUp(); }, + multiSelectAction: "forEach", + readOnly: true +}, { + name: "golineup", + bindKey: bindKey("Up", "Up|Ctrl-P"), + exec: function(editor, args) { editor.navigateUp(args.times); }, + multiSelectAction: "forEach", + readOnly: true +}, { + name: "selecttoend", + bindKey: bindKey("Ctrl-Shift-End", "Command-Shift-Down"), + exec: function(editor) { editor.getSelection().selectFileEnd(); }, + multiSelectAction: "forEach", + readOnly: true, + scrollIntoView: "animate", + aceCommandGroup: "fileJump" +}, { + name: "gotoend", + bindKey: bindKey("Ctrl-End", "Command-End|Command-Down"), + exec: function(editor) { editor.navigateFileEnd(); }, + multiSelectAction: "forEach", + readOnly: true, + scrollIntoView: "animate", + aceCommandGroup: "fileJump" +}, { + name: "selectdown", + bindKey: bindKey("Shift-Down", "Shift-Down"), + exec: function(editor) { editor.getSelection().selectDown(); }, + multiSelectAction: "forEach", + scrollIntoView: "cursor", + readOnly: true +}, { + name: "golinedown", + bindKey: bindKey("Down", "Down|Ctrl-N"), + exec: function(editor, args) { editor.navigateDown(args.times); }, + multiSelectAction: "forEach", + scrollIntoView: "cursor", + readOnly: true +}, { + name: "selectwordleft", + bindKey: bindKey("Ctrl-Shift-Left", "Option-Shift-Left"), + exec: function(editor) { editor.getSelection().selectWordLeft(); }, + multiSelectAction: "forEach", + scrollIntoView: "cursor", + readOnly: true +}, { + name: "gotowordleft", + bindKey: bindKey("Ctrl-Left", "Option-Left"), + exec: function(editor) { editor.navigateWordLeft(); }, + multiSelectAction: "forEach", + scrollIntoView: "cursor", + readOnly: true +}, { + name: "selecttolinestart", + bindKey: bindKey("Alt-Shift-Left", "Command-Shift-Left"), + exec: function(editor) { editor.getSelection().selectLineStart(); }, + multiSelectAction: "forEach", + scrollIntoView: "cursor", + readOnly: true +}, { + name: "gotolinestart", + bindKey: bindKey("Alt-Left|Home", "Command-Left|Home|Ctrl-A"), + exec: function(editor) { editor.navigateLineStart(); }, + multiSelectAction: "forEach", + scrollIntoView: "cursor", + readOnly: true +}, { + name: "selectleft", + bindKey: bindKey("Shift-Left", "Shift-Left"), + exec: function(editor) { editor.getSelection().selectLeft(); }, + multiSelectAction: "forEach", + scrollIntoView: "cursor", + readOnly: true +}, { + name: "gotoleft", + bindKey: bindKey("Left", "Left|Ctrl-B"), + exec: function(editor, args) { editor.navigateLeft(args.times); }, + multiSelectAction: "forEach", + scrollIntoView: "cursor", + readOnly: true +}, { + name: "selectwordright", + bindKey: bindKey("Ctrl-Shift-Right", "Option-Shift-Right"), + exec: function(editor) { editor.getSelection().selectWordRight(); }, + multiSelectAction: "forEach", + scrollIntoView: "cursor", + readOnly: true +}, { + name: "gotowordright", + bindKey: bindKey("Ctrl-Right", "Option-Right"), + exec: function(editor) { editor.navigateWordRight(); }, + multiSelectAction: "forEach", + scrollIntoView: "cursor", + readOnly: true +}, { + name: "selecttolineend", + bindKey: bindKey("Alt-Shift-Right", "Command-Shift-Right"), + exec: function(editor) { editor.getSelection().selectLineEnd(); }, + multiSelectAction: "forEach", + scrollIntoView: "cursor", + readOnly: true +}, { + name: "gotolineend", + bindKey: bindKey("Alt-Right|End", "Command-Right|End|Ctrl-E"), + exec: function(editor) { editor.navigateLineEnd(); }, + multiSelectAction: "forEach", + scrollIntoView: "cursor", + readOnly: true +}, { + name: "selectright", + bindKey: bindKey("Shift-Right", "Shift-Right"), + exec: function(editor) { editor.getSelection().selectRight(); }, + multiSelectAction: "forEach", + scrollIntoView: "cursor", + readOnly: true +}, { + name: "gotoright", + bindKey: bindKey("Right", "Right|Ctrl-F"), + exec: function(editor, args) { editor.navigateRight(args.times); }, + multiSelectAction: "forEach", + scrollIntoView: "cursor", + readOnly: true +}, { + name: "selectpagedown", + bindKey: "Shift-PageDown", + exec: function(editor) { editor.selectPageDown(); }, + readOnly: true +}, { + name: "pagedown", + bindKey: bindKey(null, "Option-PageDown"), + exec: function(editor) { editor.scrollPageDown(); }, + readOnly: true +}, { + name: "gotopagedown", + bindKey: bindKey("PageDown", "PageDown|Ctrl-V"), + exec: function(editor) { editor.gotoPageDown(); }, + readOnly: true +}, { + name: "selectpageup", + bindKey: "Shift-PageUp", + exec: function(editor) { editor.selectPageUp(); }, + readOnly: true +}, { + name: "pageup", + bindKey: bindKey(null, "Option-PageUp"), + exec: function(editor) { editor.scrollPageUp(); }, + readOnly: true +}, { + name: "gotopageup", + bindKey: "PageUp", + exec: function(editor) { editor.gotoPageUp(); }, + readOnly: true +}, { + name: "scrollup", + bindKey: bindKey("Ctrl-Up", null), + exec: function(e) { e.renderer.scrollBy(0, -2 * e.renderer.layerConfig.lineHeight); }, + readOnly: true +}, { + name: "scrolldown", + bindKey: bindKey("Ctrl-Down", null), + exec: function(e) { e.renderer.scrollBy(0, 2 * e.renderer.layerConfig.lineHeight); }, + readOnly: true +}, { + name: "selectlinestart", + bindKey: "Shift-Home", + exec: function(editor) { editor.getSelection().selectLineStart(); }, + multiSelectAction: "forEach", + scrollIntoView: "cursor", + readOnly: true +}, { + name: "selectlineend", + bindKey: "Shift-End", + exec: function(editor) { editor.getSelection().selectLineEnd(); }, + multiSelectAction: "forEach", + scrollIntoView: "cursor", + readOnly: true +}, { + name: "togglerecording", + bindKey: bindKey("Ctrl-Alt-E", "Command-Option-E"), + exec: function(editor) { editor.commands.toggleRecording(editor); }, + readOnly: true +}, { + name: "replaymacro", + bindKey: bindKey("Ctrl-Shift-E", "Command-Shift-E"), + exec: function(editor) { editor.commands.replay(editor); }, + readOnly: true +}, { + name: "jumptomatching", + bindKey: bindKey("Ctrl-P", "Ctrl-Shift-P"), + exec: function(editor) { editor.jumpToMatching(); }, + multiSelectAction: "forEach", + readOnly: true +}, { + name: "selecttomatching", + bindKey: bindKey("Ctrl-Shift-P", null), + exec: function(editor) { editor.jumpToMatching(true); }, + multiSelectAction: "forEach", + readOnly: true +}, +{ + name: "cut", + exec: function(editor) { + var range = editor.getSelectionRange(); + editor._emit("cut", range); + + if (!editor.selection.isEmpty()) { + editor.session.remove(range); + editor.clearSelection(); + } + }, + scrollIntoView: "cursor", + multiSelectAction: "forEach" +}, { + name: "removeline", + bindKey: bindKey("Ctrl-D", "Command-D"), + exec: function(editor) { editor.removeLines(); }, + scrollIntoView: "cursor", + multiSelectAction: "forEachLine" +}, { + name: "duplicateSelection", + bindKey: bindKey("Ctrl-Shift-D", "Command-Shift-D"), + exec: function(editor) { editor.duplicateSelection(); }, + scrollIntoView: "cursor", + multiSelectAction: "forEach" +}, { + name: "sortlines", + bindKey: bindKey("Ctrl-Alt-S", "Command-Alt-S"), + exec: function(editor) { editor.sortLines(); }, + scrollIntoView: "selection", + multiSelectAction: "forEachLine" +}, { + name: "togglecomment", + bindKey: bindKey("Ctrl-/", "Command-/"), + exec: function(editor) { editor.toggleCommentLines(); }, + multiSelectAction: "forEachLine", + scrollIntoView: "selectionPart" +}, { + name: "toggleBlockComment", + bindKey: bindKey("Ctrl-Shift-/", "Command-Shift-/"), + exec: function(editor) { editor.toggleBlockComment(); }, + multiSelectAction: "forEach", + scrollIntoView: "selectionPart" +}, { + name: "modifyNumberUp", + bindKey: bindKey("Ctrl-Shift-Up", "Alt-Shift-Up"), + exec: function(editor) { editor.modifyNumber(1); }, + multiSelectAction: "forEach" +}, { + name: "modifyNumberDown", + bindKey: bindKey("Ctrl-Shift-Down", "Alt-Shift-Down"), + exec: function(editor) { editor.modifyNumber(-1); }, + multiSelectAction: "forEach" +}, { + name: "replace", + bindKey: bindKey("Ctrl-H", "Command-Option-F"), + exec: function(editor) { + config.loadModule("ace/ext/searchbox", function(e) {e.Search(editor, true)}); + } +}, { + name: "undo", + bindKey: bindKey("Ctrl-Z", "Command-Z"), + exec: function(editor) { editor.undo(); } +}, { + name: "redo", + bindKey: bindKey("Ctrl-Shift-Z|Ctrl-Y", "Command-Shift-Z|Command-Y"), + exec: function(editor) { editor.redo(); } +}, { + name: "copylinesup", + bindKey: bindKey("Alt-Shift-Up", "Command-Option-Up"), + exec: function(editor) { editor.copyLinesUp(); }, + scrollIntoView: "cursor" +}, { + name: "movelinesup", + bindKey: bindKey("Alt-Up", "Option-Up"), + exec: function(editor) { editor.moveLinesUp(); }, + scrollIntoView: "cursor" +}, { + name: "copylinesdown", + bindKey: bindKey("Alt-Shift-Down", "Command-Option-Down"), + exec: function(editor) { editor.copyLinesDown(); }, + scrollIntoView: "cursor" +}, { + name: "movelinesdown", + bindKey: bindKey("Alt-Down", "Option-Down"), + exec: function(editor) { editor.moveLinesDown(); }, + scrollIntoView: "cursor" +}, { + name: "del", + bindKey: bindKey("Delete", "Delete|Ctrl-D|Shift-Delete"), + exec: function(editor) { editor.remove("right"); }, + multiSelectAction: "forEach", + scrollIntoView: "cursor" +}, { + name: "backspace", + bindKey: bindKey( + "Shift-Backspace|Backspace", + "Ctrl-Backspace|Shift-Backspace|Backspace|Ctrl-H" + ), + exec: function(editor) { editor.remove("left"); }, + multiSelectAction: "forEach", + scrollIntoView: "cursor" +}, { + name: "cut_or_delete", + bindKey: bindKey("Shift-Delete", null), + exec: function(editor) { + if (editor.selection.isEmpty()) { + editor.remove("left"); + } else { + return false; + } + }, + multiSelectAction: "forEach", + scrollIntoView: "cursor" +}, { + name: "removetolinestart", + bindKey: bindKey("Alt-Backspace", "Command-Backspace"), + exec: function(editor) { editor.removeToLineStart(); }, + multiSelectAction: "forEach", + scrollIntoView: "cursor" +}, { + name: "removetolineend", + bindKey: bindKey("Alt-Delete", "Ctrl-K"), + exec: function(editor) { editor.removeToLineEnd(); }, + multiSelectAction: "forEach", + scrollIntoView: "cursor" +}, { + name: "removewordleft", + bindKey: bindKey("Ctrl-Backspace", "Alt-Backspace|Ctrl-Alt-Backspace"), + exec: function(editor) { editor.removeWordLeft(); }, + multiSelectAction: "forEach", + scrollIntoView: "cursor" +}, { + name: "removewordright", + bindKey: bindKey("Ctrl-Delete", "Alt-Delete"), + exec: function(editor) { editor.removeWordRight(); }, + multiSelectAction: "forEach", + scrollIntoView: "cursor" +}, { + name: "outdent", + bindKey: bindKey("Shift-Tab", "Shift-Tab"), + exec: function(editor) { editor.blockOutdent(); }, + multiSelectAction: "forEach", + scrollIntoView: "selectionPart" +}, { + name: "indent", + bindKey: bindKey("Tab", "Tab"), + exec: function(editor) { editor.indent(); }, + multiSelectAction: "forEach", + scrollIntoView: "selectionPart" +}, { + name: "blockoutdent", + bindKey: bindKey("Ctrl-[", "Ctrl-["), + exec: function(editor) { editor.blockOutdent(); }, + multiSelectAction: "forEachLine", + scrollIntoView: "selectionPart" +}, { + name: "blockindent", + bindKey: bindKey("Ctrl-]", "Ctrl-]"), + exec: function(editor) { editor.blockIndent(); }, + multiSelectAction: "forEachLine", + scrollIntoView: "selectionPart" +}, { + name: "insertstring", + exec: function(editor, str) { editor.insert(str); }, + multiSelectAction: "forEach", + scrollIntoView: "cursor" +}, { + name: "inserttext", + exec: function(editor, args) { + editor.insert(lang.stringRepeat(args.text || "", args.times || 1)); + }, + multiSelectAction: "forEach", + scrollIntoView: "cursor" +}, { + name: "splitline", + bindKey: bindKey(null, "Ctrl-O"), + exec: function(editor) { editor.splitLine(); }, + multiSelectAction: "forEach", + scrollIntoView: "cursor" +}, { + name: "transposeletters", + bindKey: bindKey("Ctrl-T", "Ctrl-T"), + exec: function(editor) { editor.transposeLetters(); }, + multiSelectAction: function(editor) {editor.transposeSelections(1); }, + scrollIntoView: "cursor" +}, { + name: "touppercase", + bindKey: bindKey("Ctrl-U", "Ctrl-U"), + exec: function(editor) { editor.toUpperCase(); }, + multiSelectAction: "forEach", + scrollIntoView: "cursor" +}, { + name: "tolowercase", + bindKey: bindKey("Ctrl-Shift-U", "Ctrl-Shift-U"), + exec: function(editor) { editor.toLowerCase(); }, + multiSelectAction: "forEach", + scrollIntoView: "cursor" +}]; + +}); + +ace.define('ace/undomanager', ['require', 'exports', 'module' ], function(require, exports, module) { +var UndoManager = function() { + this.reset(); +}; + +(function() { + this.execute = function(options) { + var deltas = options.args[0]; + this.$doc = options.args[1]; + if (options.merge && this.hasUndo()){ + this.dirtyCounter--; + deltas = this.$undoStack.pop().concat(deltas); + } + this.$undoStack.push(deltas); + this.$redoStack = []; + + if (this.dirtyCounter < 0) { + this.dirtyCounter = NaN; + } + this.dirtyCounter++; + }; + this.undo = function(dontSelect) { + var deltas = this.$undoStack.pop(); + var undoSelectionRange = null; + if (deltas) { + undoSelectionRange = + this.$doc.undoChanges(deltas, dontSelect); + this.$redoStack.push(deltas); + this.dirtyCounter--; + } + + return undoSelectionRange; + }; + this.redo = function(dontSelect) { + var deltas = this.$redoStack.pop(); + var redoSelectionRange = null; + if (deltas) { + redoSelectionRange = + this.$doc.redoChanges(deltas, dontSelect); + this.$undoStack.push(deltas); + this.dirtyCounter++; + } + + return redoSelectionRange; + }; + this.reset = function() { + this.$undoStack = []; + this.$redoStack = []; + this.dirtyCounter = 0; + }; + this.hasUndo = function() { + return this.$undoStack.length > 0; + }; + this.hasRedo = function() { + return this.$redoStack.length > 0; + }; + this.markClean = function() { + this.dirtyCounter = 0; + }; + this.isClean = function() { + return this.dirtyCounter === 0; + }; + +}).call(UndoManager.prototype); + +exports.UndoManager = UndoManager; +}); + +ace.define('ace/virtual_renderer', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/dom', 'ace/config', 'ace/lib/useragent', 'ace/layer/gutter', 'ace/layer/marker', 'ace/layer/text', 'ace/layer/cursor', 'ace/scrollbar', 'ace/renderloop', 'ace/layer/font_metrics', 'ace/lib/event_emitter'], function(require, exports, module) { + + +var oop = require("./lib/oop"); +var dom = require("./lib/dom"); +var config = require("./config"); +var useragent = require("./lib/useragent"); +var GutterLayer = require("./layer/gutter").Gutter; +var MarkerLayer = require("./layer/marker").Marker; +var TextLayer = require("./layer/text").Text; +var CursorLayer = require("./layer/cursor").Cursor; +var HScrollBar = require("./scrollbar").HScrollBar; +var VScrollBar = require("./scrollbar").VScrollBar; +var RenderLoop = require("./renderloop").RenderLoop; +var FontMetrics = require("./layer/font_metrics").FontMetrics; +var EventEmitter = require("./lib/event_emitter").EventEmitter; +var editorCss = ".ace_editor {\ +position: relative;\ +overflow: hidden;\ +font-family: 'Monaco', 'Menlo', 'Ubuntu Mono', 'Consolas', 'source-code-pro', monospace;\ +font-size: 12px;\ +line-height: normal;\ +direction: ltr;\ +}\ +.ace_scroller {\ +position: absolute;\ +overflow: hidden;\ +top: 0;\ +bottom: 0;\ +background-color: inherit;\ +-ms-user-select: none;\ +-moz-user-select: none;\ +-webkit-user-select: none;\ +user-select: none;\ +}\ +.ace_content {\ +position: absolute;\ +-moz-box-sizing: border-box;\ +-webkit-box-sizing: border-box;\ +box-sizing: border-box;\ +cursor: text;\ +min-width: 100%;\ +}\ +.ace_dragging, .ace_dragging * {\ +cursor: move !important;\ +}\ +.ace_dragging .ace_scroller:before{\ +position: absolute;\ +top: 0;\ +left: 0;\ +right: 0;\ +bottom: 0;\ +content: '';\ +background: rgba(250, 250, 250, 0.01);\ +z-index: 1000;\ +}\ +.ace_dragging.ace_dark .ace_scroller:before{\ +background: rgba(0, 0, 0, 0.01);\ +}\ +.ace_selecting, .ace_selecting * {\ +cursor: text !important;\ +}\ +.ace_gutter {\ +position: absolute;\ +overflow : hidden;\ +width: auto;\ +top: 0;\ +bottom: 0;\ +left: 0;\ +cursor: default;\ +z-index: 4;\ +-ms-user-select: none;\ +-moz-user-select: none;\ +-webkit-user-select: none;\ +user-select: none;\ +}\ +.ace_gutter-active-line {\ +position: absolute;\ +left: 0;\ +right: 0;\ +}\ +.ace_scroller.ace_scroll-left {\ +box-shadow: 17px 0 16px -16px rgba(0, 0, 0, 0.4) inset;\ +}\ +.ace_gutter-cell {\ +padding-left: 19px;\ +padding-right: 6px;\ +background-repeat: no-repeat;\ +}\ +.ace_gutter-cell.ace_error {\ +background-image: url(\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAABOFBMVEX/////////QRswFAb/Ui4wFAYwFAYwFAaWGAfDRymzOSH/PxswFAb/SiUwFAYwFAbUPRvjQiDllog5HhHdRybsTi3/Tyv9Tir+Syj/UC3////XurebMBIwFAb/RSHbPx/gUzfdwL3kzMivKBAwFAbbvbnhPx66NhowFAYwFAaZJg8wFAaxKBDZurf/RB6mMxb/SCMwFAYwFAbxQB3+RB4wFAb/Qhy4Oh+4QifbNRcwFAYwFAYwFAb/QRzdNhgwFAYwFAbav7v/Uy7oaE68MBK5LxLewr/r2NXewLswFAaxJw4wFAbkPRy2PyYwFAaxKhLm1tMwFAazPiQwFAaUGAb/QBrfOx3bvrv/VC/maE4wFAbRPBq6MRO8Qynew8Dp2tjfwb0wFAbx6eju5+by6uns4uH9/f36+vr/GkHjAAAAYnRSTlMAGt+64rnWu/bo8eAA4InH3+DwoN7j4eLi4xP99Nfg4+b+/u9B/eDs1MD1mO7+4PHg2MXa347g7vDizMLN4eG+Pv7i5evs/v79yu7S3/DV7/498Yv24eH+4ufQ3Ozu/v7+y13sRqwAAADLSURBVHjaZc/XDsFgGIBhtDrshlitmk2IrbHFqL2pvXf/+78DPokj7+Fz9qpU/9UXJIlhmPaTaQ6QPaz0mm+5gwkgovcV6GZzd5JtCQwgsxoHOvJO15kleRLAnMgHFIESUEPmawB9ngmelTtipwwfASilxOLyiV5UVUyVAfbG0cCPHig+GBkzAENHS0AstVF6bacZIOzgLmxsHbt2OecNgJC83JERmePUYq8ARGkJx6XtFsdddBQgZE2nPR6CICZhawjA4Fb/chv+399kfR+MMMDGOQAAAABJRU5ErkJggg==\");\ +background-repeat: no-repeat;\ +background-position: 2px center;\ +}\ +.ace_gutter-cell.ace_warning {\ +background-image: url(\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAAmVBMVEX///8AAAD///8AAAAAAABPSzb/5sAAAAB/blH/73z/ulkAAAAAAAD85pkAAAAAAAACAgP/vGz/rkDerGbGrV7/pkQICAf////e0IsAAAD/oED/qTvhrnUAAAD/yHD/njcAAADuv2r/nz//oTj/p064oGf/zHAAAAA9Nir/tFIAAAD/tlTiuWf/tkIAAACynXEAAAAAAAAtIRW7zBpBAAAAM3RSTlMAABR1m7RXO8Ln31Z36zT+neXe5OzooRDfn+TZ4p3h2hTf4t3k3ucyrN1K5+Xaks52Sfs9CXgrAAAAjklEQVR42o3PbQ+CIBQFYEwboPhSYgoYunIqqLn6/z8uYdH8Vmdnu9vz4WwXgN/xTPRD2+sgOcZjsge/whXZgUaYYvT8QnuJaUrjrHUQreGczuEafQCO/SJTufTbroWsPgsllVhq3wJEk2jUSzX3CUEDJC84707djRc5MTAQxoLgupWRwW6UB5fS++NV8AbOZgnsC7BpEAAAAABJRU5ErkJggg==\");\ +background-position: 2px center;\ +}\ +.ace_gutter-cell.ace_info {\ +background-image: url(\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAAAAAA6mKC9AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAAJ0Uk5TAAB2k804AAAAPklEQVQY02NgIB68QuO3tiLznjAwpKTgNyDbMegwisCHZUETUZV0ZqOquBpXj2rtnpSJT1AEnnRmL2OgGgAAIKkRQap2htgAAAAASUVORK5CYII=\");\ +background-position: 2px center;\ +}\ +.ace_dark .ace_gutter-cell.ace_info {\ +background-image: url(\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQBAMAAADt3eJSAAAAJFBMVEUAAAChoaGAgIAqKiq+vr6tra1ZWVmUlJSbm5s8PDxubm56enrdgzg3AAAAAXRSTlMAQObYZgAAAClJREFUeNpjYMAPdsMYHegyJZFQBlsUlMFVCWUYKkAZMxZAGdxlDMQBAG+TBP4B6RyJAAAAAElFTkSuQmCC\");\ +}\ +.ace_scrollbar {\ +position: absolute;\ +right: 0;\ +bottom: 0;\ +z-index: 6;\ +}\ +.ace_scrollbar-inner {\ +position: absolute;\ +cursor: text;\ +left: 0;\ +top: 0;\ +}\ +.ace_scrollbar-v{\ +overflow-x: hidden;\ +overflow-y: scroll;\ +top: 0;\ +}\ +.ace_scrollbar-h {\ +overflow-x: scroll;\ +overflow-y: hidden;\ +left: 0;\ +}\ +.ace_print-margin {\ +position: absolute;\ +height: 100%;\ +}\ +.ace_text-input {\ +position: absolute;\ +z-index: 0;\ +width: 0.5em;\ +height: 1em;\ +opacity: 0;\ +background: transparent;\ +-moz-appearance: none;\ +appearance: none;\ +border: none;\ +resize: none;\ +outline: none;\ +overflow: hidden;\ +font: inherit;\ +padding: 0 1px;\ +margin: 0 -1px;\ +text-indent: -1em;\ +-ms-user-select: text;\ +-moz-user-select: text;\ +-webkit-user-select: text;\ +user-select: text;\ +}\ +.ace_text-input.ace_composition {\ +background: #f8f8f8;\ +color: #111;\ +z-index: 1000;\ +opacity: 1;\ +text-indent: 0;\ +}\ +.ace_layer {\ +z-index: 1;\ +position: absolute;\ +overflow: hidden;\ +white-space: pre;\ +height: 100%;\ +width: 100%;\ +-moz-box-sizing: border-box;\ +-webkit-box-sizing: border-box;\ +box-sizing: border-box;\ +/* setting pointer-events: auto; on node under the mouse, which changes\ +during scroll, will break mouse wheel scrolling in Safari */\ +pointer-events: none;\ +}\ +.ace_gutter-layer {\ +position: relative;\ +width: auto;\ +text-align: right;\ +pointer-events: auto;\ +}\ +.ace_text-layer {\ +font: inherit !important;\ +}\ +.ace_cjk {\ +display: inline-block;\ +text-align: center;\ +}\ +.ace_cursor-layer {\ +z-index: 4;\ +}\ +.ace_cursor {\ +z-index: 4;\ +position: absolute;\ +-moz-box-sizing: border-box;\ +-webkit-box-sizing: border-box;\ +box-sizing: border-box;\ +border-left: 2px solid\ +}\ +.ace_slim-cursors .ace_cursor {\ +border-left-width: 1px;\ +}\ +.ace_overwrite-cursors .ace_cursor {\ +border-left-width: 0px;\ +border-bottom: 1px solid;\ +}\ +.ace_hidden-cursors .ace_cursor {\ +opacity: 0.2;\ +}\ +.ace_smooth-blinking .ace_cursor {\ +-moz-transition: opacity 0.18s;\ +-webkit-transition: opacity 0.18s;\ +-o-transition: opacity 0.18s;\ +-ms-transition: opacity 0.18s;\ +transition: opacity 0.18s;\ +}\ +.ace_editor.ace_multiselect .ace_cursor {\ +border-left-width: 1px;\ +}\ +.ace_marker-layer .ace_step, .ace_marker-layer .ace_stack {\ +position: absolute;\ +z-index: 3;\ +}\ +.ace_marker-layer .ace_selection {\ +position: absolute;\ +z-index: 5;\ +}\ +.ace_marker-layer .ace_bracket {\ +position: absolute;\ +z-index: 6;\ +}\ +.ace_marker-layer .ace_active-line {\ +position: absolute;\ +z-index: 2;\ +}\ +.ace_marker-layer .ace_selected-word {\ +position: absolute;\ +z-index: 4;\ +-moz-box-sizing: border-box;\ +-webkit-box-sizing: border-box;\ +box-sizing: border-box;\ +}\ +.ace_line .ace_fold {\ +-moz-box-sizing: border-box;\ +-webkit-box-sizing: border-box;\ +box-sizing: border-box;\ +display: inline-block;\ +height: 11px;\ +margin-top: -2px;\ +vertical-align: middle;\ +background-image:\ +url(\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABEAAAAJCAYAAADU6McMAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAJpJREFUeNpi/P//PwOlgAXGYGRklAVSokD8GmjwY1wasKljQpYACtpCFeADcHVQfQyMQAwzwAZI3wJKvCLkfKBaMSClBlR7BOQikCFGQEErIH0VqkabiGCAqwUadAzZJRxQr/0gwiXIal8zQQPnNVTgJ1TdawL0T5gBIP1MUJNhBv2HKoQHHjqNrA4WO4zY0glyNKLT2KIfIMAAQsdgGiXvgnYAAAAASUVORK5CYII=\"),\ +url(\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAA3CAYAAADNNiA5AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAACJJREFUeNpi+P//fxgTAwPDBxDxD078RSX+YeEyDFMCIMAAI3INmXiwf2YAAAAASUVORK5CYII=\");\ +background-repeat: no-repeat, repeat-x;\ +background-position: center center, top left;\ +color: transparent;\ +border: 1px solid black;\ +-moz-border-radius: 2px;\ +-webkit-border-radius: 2px;\ +border-radius: 2px;\ +cursor: pointer;\ +pointer-events: auto;\ +}\ +.ace_dark .ace_fold {\ +}\ +.ace_fold:hover{\ +background-image:\ +url(\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABEAAAAJCAYAAADU6McMAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAJpJREFUeNpi/P//PwOlgAXGYGRklAVSokD8GmjwY1wasKljQpYACtpCFeADcHVQfQyMQAwzwAZI3wJKvCLkfKBaMSClBlR7BOQikCFGQEErIH0VqkabiGCAqwUadAzZJRxQr/0gwiXIal8zQQPnNVTgJ1TdawL0T5gBIP1MUJNhBv2HKoQHHjqNrA4WO4zY0glyNKLT2KIfIMAAQsdgGiXvgnYAAAAASUVORK5CYII=\"),\ +url(\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAA3CAYAAADNNiA5AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAACBJREFUeNpi+P//fz4TAwPDZxDxD5X4i5fLMEwJgAADAEPVDbjNw87ZAAAAAElFTkSuQmCC\");\ +}\ +.ace_tooltip {\ +background-color: #FFF;\ +background-image: -webkit-linear-gradient(top, transparent, rgba(0, 0, 0, 0.1));\ +background-image: linear-gradient(to bottom, transparent, rgba(0, 0, 0, 0.1));\ +border: 1px solid gray;\ +border-radius: 1px;\ +box-shadow: 0 1px 2px rgba(0, 0, 0, 0.3);\ +color: black;\ +display: block;\ +max-width: 100%;\ +padding: 3px 4px;\ +position: fixed;\ +z-index: 999999;\ +-moz-box-sizing: border-box;\ +-webkit-box-sizing: border-box;\ +box-sizing: border-box;\ +cursor: default;\ +white-space: pre;\ +word-wrap: break-word;\ +line-height: normal;\ +font-style: normal;\ +font-weight: normal;\ +letter-spacing: normal;\ +pointer-events: none;\ +}\ +.ace_folding-enabled > .ace_gutter-cell {\ +padding-right: 13px;\ +}\ +.ace_fold-widget {\ +-moz-box-sizing: border-box;\ +-webkit-box-sizing: border-box;\ +box-sizing: border-box;\ +margin: 0 -12px 0 1px;\ +display: none;\ +width: 11px;\ +vertical-align: top;\ +background-image: url(\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAANElEQVR42mWKsQ0AMAzC8ixLlrzQjzmBiEjp0A6WwBCSPgKAXoLkqSot7nN3yMwR7pZ32NzpKkVoDBUxKAAAAABJRU5ErkJggg==\");\ +background-repeat: no-repeat;\ +background-position: center;\ +border-radius: 3px;\ +border: 1px solid transparent;\ +cursor: pointer;\ +}\ +.ace_folding-enabled .ace_fold-widget {\ +display: inline-block; \ +}\ +.ace_fold-widget.ace_end {\ +background-image: url(\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAANElEQVR42m3HwQkAMAhD0YzsRchFKI7sAikeWkrxwScEB0nh5e7KTPWimZki4tYfVbX+MNl4pyZXejUO1QAAAABJRU5ErkJggg==\");\ +}\ +.ace_fold-widget.ace_closed {\ +background-image: url(\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAAAGCAYAAAAG5SQMAAAAOUlEQVR42jXKwQkAMAgDwKwqKD4EwQ26sSOkVWjgIIHAzPiCgaqiqnJHZnKICBERHN194O5b9vbLuAVRL+l0YWnZAAAAAElFTkSuQmCCXA==\");\ +}\ +.ace_fold-widget:hover {\ +border: 1px solid rgba(0, 0, 0, 0.3);\ +background-color: rgba(255, 255, 255, 0.2);\ +-moz-box-shadow: 0 1px 1px rgba(255, 255, 255, 0.7);\ +-webkit-box-shadow: 0 1px 1px rgba(255, 255, 255, 0.7);\ +box-shadow: 0 1px 1px rgba(255, 255, 255, 0.7);\ +}\ +.ace_fold-widget:active {\ +border: 1px solid rgba(0, 0, 0, 0.4);\ +background-color: rgba(0, 0, 0, 0.05);\ +-moz-box-shadow: 0 1px 1px rgba(255, 255, 255, 0.8);\ +-webkit-box-shadow: 0 1px 1px rgba(255, 255, 255, 0.8);\ +box-shadow: 0 1px 1px rgba(255, 255, 255, 0.8);\ +}\ +/**\ +* Dark version for fold widgets\ +*/\ +.ace_dark .ace_fold-widget {\ +background-image: url(\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHklEQVQIW2P4//8/AzoGEQ7oGCaLLAhWiSwB146BAQCSTPYocqT0AAAAAElFTkSuQmCC\");\ +}\ +.ace_dark .ace_fold-widget.ace_end {\ +background-image: url(\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAH0lEQVQIW2P4//8/AxQ7wNjIAjDMgC4AxjCVKBirIAAF0kz2rlhxpAAAAABJRU5ErkJggg==\");\ +}\ +.ace_dark .ace_fold-widget.ace_closed {\ +background-image: url(\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAAAFCAYAAACAcVaiAAAAHElEQVQIW2P4//+/AxAzgDADlOOAznHAKgPWAwARji8UIDTfQQAAAABJRU5ErkJggg==\");\ +}\ +.ace_dark .ace_fold-widget:hover {\ +box-shadow: 0 1px 1px rgba(255, 255, 255, 0.2);\ +background-color: rgba(255, 255, 255, 0.1);\ +}\ +.ace_dark .ace_fold-widget:active {\ +-moz-box-shadow: 0 1px 1px rgba(255, 255, 255, 0.2);\ +-webkit-box-shadow: 0 1px 1px rgba(255, 255, 255, 0.2);\ +box-shadow: 0 1px 1px rgba(255, 255, 255, 0.2);\ +}\ +.ace_fold-widget.ace_invalid {\ +background-color: #FFB4B4;\ +border-color: #DE5555;\ +}\ +.ace_fade-fold-widgets .ace_fold-widget {\ +-moz-transition: opacity 0.4s ease 0.05s;\ +-webkit-transition: opacity 0.4s ease 0.05s;\ +-o-transition: opacity 0.4s ease 0.05s;\ +-ms-transition: opacity 0.4s ease 0.05s;\ +transition: opacity 0.4s ease 0.05s;\ +opacity: 0;\ +}\ +.ace_fade-fold-widgets:hover .ace_fold-widget {\ +-moz-transition: opacity 0.05s ease 0.05s;\ +-webkit-transition: opacity 0.05s ease 0.05s;\ +-o-transition: opacity 0.05s ease 0.05s;\ +-ms-transition: opacity 0.05s ease 0.05s;\ +transition: opacity 0.05s ease 0.05s;\ +opacity:1;\ +}\ +.ace_underline {\ +text-decoration: underline;\ +}\ +.ace_bold {\ +font-weight: bold;\ +}\ +.ace_nobold .ace_bold {\ +font-weight: normal;\ +}\ +.ace_italic {\ +font-style: italic;\ +}\ +.ace_error-marker {\ +background-color: rgba(255, 0, 0,0.2);\ +position: absolute;\ +z-index: 9;\ +}\ +.ace_highlight-marker {\ +background-color: rgba(255, 255, 0,0.2);\ +position: absolute;\ +z-index: 8;\ +}\ +"; + +dom.importCssString(editorCss, "ace_editor"); + +var VirtualRenderer = function(container, theme) { + var _self = this; + + this.container = container || dom.createElement("div"); + this.$keepTextAreaAtCursor = !useragent.isOldIE; + + dom.addCssClass(this.container, "ace_editor"); + + this.setTheme(theme); + + this.$gutter = dom.createElement("div"); + this.$gutter.className = "ace_gutter"; + this.container.appendChild(this.$gutter); + + this.scroller = dom.createElement("div"); + this.scroller.className = "ace_scroller"; + this.container.appendChild(this.scroller); + + this.content = dom.createElement("div"); + this.content.className = "ace_content"; + this.scroller.appendChild(this.content); + + this.$gutterLayer = new GutterLayer(this.$gutter); + this.$gutterLayer.on("changeGutterWidth", this.onGutterResize.bind(this)); + + this.$markerBack = new MarkerLayer(this.content); + + var textLayer = this.$textLayer = new TextLayer(this.content); + this.canvas = textLayer.element; + + this.$markerFront = new MarkerLayer(this.content); + + this.$cursorLayer = new CursorLayer(this.content); + this.$horizScroll = false; + this.$vScroll = false; + + this.scrollBar = + this.scrollBarV = new VScrollBar(this.container, this); + this.scrollBarH = new HScrollBar(this.container, this); + this.scrollBarV.addEventListener("scroll", function(e) { + if (!_self.$scrollAnimation) + _self.session.setScrollTop(e.data - _self.scrollMargin.top); + }); + this.scrollBarH.addEventListener("scroll", function(e) { + if (!_self.$scrollAnimation) + _self.session.setScrollLeft(e.data - _self.scrollMargin.left); + }); + + this.scrollTop = 0; + this.scrollLeft = 0; + + this.cursorPos = { + row : 0, + column : 0 + }; + + this.$fontMetrics = new FontMetrics(this.container, 500); + this.$textLayer.$setFontMetrics(this.$fontMetrics); + this.$textLayer.addEventListener("changeCharacterSize", function(e) { + _self.updateCharacterSize(); + _self.onResize(true, _self.gutterWidth, _self.$size.width, _self.$size.height); + _self._signal("changeCharacterSize", e); + }); + + this.$size = { + width: 0, + height: 0, + scrollerHeight: 0, + scrollerWidth: 0, + $dirty: true + }; + + this.layerConfig = { + width : 1, + padding : 0, + firstRow : 0, + firstRowScreen: 0, + lastRow : 0, + lineHeight : 0, + characterWidth : 0, + minHeight : 1, + maxHeight : 1, + offset : 0, + height : 1, + gutterOffset: 1 + }; + + this.scrollMargin = { + left: 0, + right: 0, + top: 0, + bottom: 0, + v: 0, + h: 0 + }; + + this.$loop = new RenderLoop( + this.$renderChanges.bind(this), + this.container.ownerDocument.defaultView + ); + this.$loop.schedule(this.CHANGE_FULL); + + this.updateCharacterSize(); + this.setPadding(4); + config.resetOptions(this); + config._emit("renderer", this); +}; + +(function() { + + this.CHANGE_CURSOR = 1; + this.CHANGE_MARKER = 2; + this.CHANGE_GUTTER = 4; + this.CHANGE_SCROLL = 8; + this.CHANGE_LINES = 16; + this.CHANGE_TEXT = 32; + this.CHANGE_SIZE = 64; + this.CHANGE_MARKER_BACK = 128; + this.CHANGE_MARKER_FRONT = 256; + this.CHANGE_FULL = 512; + this.CHANGE_H_SCROLL = 1024; + + oop.implement(this, EventEmitter); + + this.updateCharacterSize = function() { + if (this.$textLayer.allowBoldFonts != this.$allowBoldFonts) { + this.$allowBoldFonts = this.$textLayer.allowBoldFonts; + this.setStyle("ace_nobold", !this.$allowBoldFonts); + } + + this.layerConfig.characterWidth = + this.characterWidth = this.$textLayer.getCharacterWidth(); + this.layerConfig.lineHeight = + this.lineHeight = this.$textLayer.getLineHeight(); + this.$updatePrintMargin(); + }; + this.setSession = function(session) { + if (this.session) + this.session.doc.off("changeNewLineMode", this.onChangeNewLineMode); + + this.session = session; + if (!session) + return; + + if (this.scrollMargin.top && session.getScrollTop() <= 0) + session.setScrollTop(-this.scrollMargin.top); + + this.$cursorLayer.setSession(session); + this.$markerBack.setSession(session); + this.$markerFront.setSession(session); + this.$gutterLayer.setSession(session); + this.$textLayer.setSession(session); + this.$loop.schedule(this.CHANGE_FULL); + this.session.$setFontMetrics(this.$fontMetrics); + + this.onChangeNewLineMode = this.onChangeNewLineMode.bind(this); + this.onChangeNewLineMode() + this.session.doc.on("changeNewLineMode", this.onChangeNewLineMode); + }; + this.updateLines = function(firstRow, lastRow) { + if (lastRow === undefined) + lastRow = Infinity; + + if (!this.$changedLines) { + this.$changedLines = { + firstRow: firstRow, + lastRow: lastRow + }; + } + else { + if (this.$changedLines.firstRow > firstRow) + this.$changedLines.firstRow = firstRow; + + if (this.$changedLines.lastRow < lastRow) + this.$changedLines.lastRow = lastRow; + } + + if (this.$changedLines.firstRow > this.layerConfig.lastRow || + this.$changedLines.lastRow < this.layerConfig.firstRow) + return; + this.$loop.schedule(this.CHANGE_LINES); + }; + + this.onChangeNewLineMode = function() { + this.$loop.schedule(this.CHANGE_TEXT); + this.$textLayer.$updateEolChar(); + }; + + this.onChangeTabSize = function() { + this.$loop.schedule(this.CHANGE_TEXT | this.CHANGE_MARKER); + this.$textLayer.onChangeTabSize(); + }; + this.updateText = function() { + this.$loop.schedule(this.CHANGE_TEXT); + }; + this.updateFull = function(force) { + if (force) + this.$renderChanges(this.CHANGE_FULL, true); + else + this.$loop.schedule(this.CHANGE_FULL); + }; + this.updateFontSize = function() { + this.$textLayer.checkForSizeChanges(); + }; + + this.$changes = 0; + this.$updateSizeAsync = function() { + if (this.$loop.pending) + this.$size.$dirty = true; + else + this.onResize(); + }; + this.onResize = function(force, gutterWidth, width, height) { + if (this.resizing > 2) + return; + else if (this.resizing > 0) + this.resizing++; + else + this.resizing = force ? 1 : 0; + var el = this.container; + if (!height) + height = el.clientHeight || el.scrollHeight; + if (!width) + width = el.clientWidth || el.scrollWidth; + var changes = this.$updateCachedSize(force, gutterWidth, width, height); + + if (!this.$size.scrollerHeight || (!width && !height)) + return this.resizing = 0; + + if (force) + this.$gutterLayer.$padding = null; + + if (force) + this.$renderChanges(changes | this.$changes, true); + else + this.$loop.schedule(changes | this.$changes); + + if (this.resizing) + this.resizing = 0; + }; + + this.$updateCachedSize = function(force, gutterWidth, width, height) { + height -= (this.$extraHeight || 0); + var changes = 0; + var size = this.$size; + var oldSize = { + width: size.width, + height: size.height, + scrollerHeight: size.scrollerHeight, + scrollerWidth: size.scrollerWidth + }; + if (height && (force || size.height != height)) { + size.height = height; + changes |= this.CHANGE_SIZE; + + size.scrollerHeight = size.height; + if (this.$horizScroll) + size.scrollerHeight -= this.scrollBarH.getHeight(); + this.scrollBarV.element.style.bottom = this.scrollBarH.getHeight() + "px"; + + changes = changes | this.CHANGE_SCROLL; + } + + if (width && (force || size.width != width)) { + changes |= this.CHANGE_SIZE; + size.width = width; + + if (gutterWidth == null) + gutterWidth = this.$showGutter ? this.$gutter.offsetWidth : 0; + + this.gutterWidth = gutterWidth; + + this.scrollBarH.element.style.left = + this.scroller.style.left = gutterWidth + "px"; + size.scrollerWidth = Math.max(0, width - gutterWidth - this.scrollBarV.getWidth()); + + this.scrollBarH.element.style.right = + this.scroller.style.right = this.scrollBarV.getWidth() + "px"; + this.scroller.style.bottom = this.scrollBarH.getHeight() + "px"; + + if (this.session && this.session.getUseWrapMode() && this.adjustWrapLimit() || force) + changes |= this.CHANGE_FULL; + } + + size.$dirty = !width || !height; + + if (changes) + this._signal("resize", oldSize); + + return changes; + }; + + this.onGutterResize = function() { + var gutterWidth = this.$showGutter ? this.$gutter.offsetWidth : 0; + if (gutterWidth != this.gutterWidth) + this.$changes |= this.$updateCachedSize(true, gutterWidth, this.$size.width, this.$size.height); + + if (this.session.getUseWrapMode() && this.adjustWrapLimit()) { + this.$loop.schedule(this.CHANGE_FULL); + } else if (this.$size.$dirty) { + this.$loop.schedule(this.CHANGE_FULL); + } else { + this.$computeLayerConfig(); + this.$loop.schedule(this.CHANGE_MARKER); + } + }; + this.adjustWrapLimit = function() { + var availableWidth = this.$size.scrollerWidth - this.$padding * 2; + var limit = Math.floor(availableWidth / this.characterWidth); + return this.session.adjustWrapLimit(limit, this.$showPrintMargin && this.$printMarginColumn); + }; + this.setAnimatedScroll = function(shouldAnimate){ + this.setOption("animatedScroll", shouldAnimate); + }; + this.getAnimatedScroll = function() { + return this.$animatedScroll; + }; + this.setShowInvisibles = function(showInvisibles) { + this.setOption("showInvisibles", showInvisibles); + }; + this.getShowInvisibles = function() { + return this.getOption("showInvisibles"); + }; + this.getDisplayIndentGuides = function() { + return this.getOption("displayIndentGuides"); + }; + + this.setDisplayIndentGuides = function(display) { + this.setOption("displayIndentGuides", display); + }; + this.setShowPrintMargin = function(showPrintMargin) { + this.setOption("showPrintMargin", showPrintMargin); + }; + this.getShowPrintMargin = function() { + return this.getOption("showPrintMargin"); + }; + this.setPrintMarginColumn = function(showPrintMargin) { + this.setOption("printMarginColumn", showPrintMargin); + }; + this.getPrintMarginColumn = function() { + return this.getOption("printMarginColumn"); + }; + this.getShowGutter = function(){ + return this.getOption("showGutter"); + }; + this.setShowGutter = function(show){ + return this.setOption("showGutter", show); + }; + + this.getFadeFoldWidgets = function(){ + return this.getOption("fadeFoldWidgets") + }; + + this.setFadeFoldWidgets = function(show) { + this.setOption("fadeFoldWidgets", show); + }; + + this.setHighlightGutterLine = function(shouldHighlight) { + this.setOption("highlightGutterLine", shouldHighlight); + }; + + this.getHighlightGutterLine = function() { + return this.getOption("highlightGutterLine"); + }; + + this.$updateGutterLineHighlight = function() { + var pos = this.$cursorLayer.$pixelPos; + var height = this.layerConfig.lineHeight; + if (this.session.getUseWrapMode()) { + var cursor = this.session.selection.getCursor(); + cursor.column = 0; + pos = this.$cursorLayer.getPixelPosition(cursor, true); + height *= this.session.getRowLength(cursor.row); + } + this.$gutterLineHighlight.style.top = pos.top - this.layerConfig.offset + "px"; + this.$gutterLineHighlight.style.height = height + "px"; + }; + + this.$updatePrintMargin = function() { + if (!this.$showPrintMargin && !this.$printMarginEl) + return; + + if (!this.$printMarginEl) { + var containerEl = dom.createElement("div"); + containerEl.className = "ace_layer ace_print-margin-layer"; + this.$printMarginEl = dom.createElement("div"); + this.$printMarginEl.className = "ace_print-margin"; + containerEl.appendChild(this.$printMarginEl); + this.content.insertBefore(containerEl, this.content.firstChild); + } + + var style = this.$printMarginEl.style; + style.left = ((this.characterWidth * this.$printMarginColumn) + this.$padding) + "px"; + style.visibility = this.$showPrintMargin ? "visible" : "hidden"; + + if (this.session && this.session.$wrap == -1) + this.adjustWrapLimit(); + }; + this.getContainerElement = function() { + return this.container; + }; + this.getMouseEventTarget = function() { + return this.content; + }; + this.getTextAreaContainer = function() { + return this.container; + }; + this.$moveTextAreaToCursor = function() { + if (!this.$keepTextAreaAtCursor) + return; + var config = this.layerConfig; + var posTop = this.$cursorLayer.$pixelPos.top; + var posLeft = this.$cursorLayer.$pixelPos.left; + posTop -= config.offset; + + var h = this.lineHeight; + if (posTop < 0 || posTop > config.height - h) + return; + + var w = this.characterWidth; + if (this.$composition) { + var val = this.textarea.value.replace(/^\x01+/, ""); + w *= (this.session.$getStringScreenWidth(val)[0]+2); + h += 2; + posTop -= 1; + } + posLeft -= this.scrollLeft; + if (posLeft > this.$size.scrollerWidth - w) + posLeft = this.$size.scrollerWidth - w; + + posLeft -= this.scrollBar.width; + + this.textarea.style.height = h + "px"; + this.textarea.style.width = w + "px"; + this.textarea.style.right = Math.max(0, this.$size.scrollerWidth - posLeft - w) + "px"; + this.textarea.style.bottom = Math.max(0, this.$size.height - posTop - h) + "px"; + }; + this.getFirstVisibleRow = function() { + return this.layerConfig.firstRow; + }; + this.getFirstFullyVisibleRow = function() { + return this.layerConfig.firstRow + (this.layerConfig.offset === 0 ? 0 : 1); + }; + this.getLastFullyVisibleRow = function() { + var flint = Math.floor((this.layerConfig.height + this.layerConfig.offset) / this.layerConfig.lineHeight); + return this.layerConfig.firstRow - 1 + flint; + }; + this.getLastVisibleRow = function() { + return this.layerConfig.lastRow; + }; + + this.$padding = null; + this.setPadding = function(padding) { + this.$padding = padding; + this.$textLayer.setPadding(padding); + this.$cursorLayer.setPadding(padding); + this.$markerFront.setPadding(padding); + this.$markerBack.setPadding(padding); + this.$loop.schedule(this.CHANGE_FULL); + this.$updatePrintMargin(); + }; + + this.setScrollMargin = function(top, bottom, left, right) { + var sm = this.scrollMargin; + sm.top = top|0; + sm.bottom = bottom|0; + sm.right = right|0; + sm.left = left|0; + sm.v = sm.top + sm.bottom; + sm.h = sm.left + sm.right; + if (sm.top && this.scrollTop <= 0 && this.session) + this.session.setScrollTop(-sm.top); + this.updateFull(); + }; + this.getHScrollBarAlwaysVisible = function() { + return this.$hScrollBarAlwaysVisible; + }; + this.setHScrollBarAlwaysVisible = function(alwaysVisible) { + this.setOption("hScrollBarAlwaysVisible", alwaysVisible); + }; + this.getVScrollBarAlwaysVisible = function() { + return this.$hScrollBarAlwaysVisible; + }; + this.setVScrollBarAlwaysVisible = function(alwaysVisible) { + this.setOption("vScrollBarAlwaysVisible", alwaysVisible); + }; + + this.$updateScrollBarV = function() { + this.scrollBarV.setScrollHeight(this.layerConfig.maxHeight + this.scrollMargin.v); + this.scrollBarV.setScrollTop(this.scrollTop + this.scrollMargin.top); + }; + this.$updateScrollBarH = function() { + this.scrollBarH.setScrollWidth(this.layerConfig.width + 2 * this.$padding + this.scrollMargin.h); + this.scrollBarH.setScrollLeft(this.scrollLeft + this.scrollMargin.left); + }; + + this.$frozen = false; + this.freeze = function() { + this.$frozen = true; + }; + + this.unfreeze = function() { + this.$frozen = false; + }; + + this.$renderChanges = function(changes, force) { + if (this.$changes) { + changes |= this.$changes; + this.$changes = 0; + } + if ((!this.session || !this.container.offsetWidth || this.$frozen) || (!changes && !force)) { + this.$changes |= changes; + return; + } + if (this.$size.$dirty) { + this.$changes |= changes; + return this.onResize(true); + } + if (!this.lineHeight) { + this.$textLayer.checkForSizeChanges(); + } + + this._signal("beforeRender"); + var config = this.layerConfig; + if (changes & this.CHANGE_FULL || + changes & this.CHANGE_SIZE || + changes & this.CHANGE_TEXT || + changes & this.CHANGE_LINES || + changes & this.CHANGE_SCROLL || + changes & this.CHANGE_H_SCROLL + ) { + changes |= this.$computeLayerConfig(); + config = this.layerConfig; + this.$updateScrollBarV(); + if (changes & this.CHANGE_H_SCROLL) + this.$updateScrollBarH(); + this.$gutterLayer.element.style.marginTop = (-config.offset) + "px"; + this.content.style.marginTop = (-config.offset) + "px"; + this.content.style.width = config.width + 2 * this.$padding + "px"; + this.content.style.height = config.minHeight + "px"; + } + if (changes & this.CHANGE_H_SCROLL) { + this.content.style.marginLeft = -this.scrollLeft + "px"; + this.scroller.className = this.scrollLeft <= 0 ? "ace_scroller" : "ace_scroller ace_scroll-left"; + } + if (changes & this.CHANGE_FULL) { + this.$textLayer.update(config); + if (this.$showGutter) + this.$gutterLayer.update(config); + this.$markerBack.update(config); + this.$markerFront.update(config); + this.$cursorLayer.update(config); + this.$moveTextAreaToCursor(); + this.$highlightGutterLine && this.$updateGutterLineHighlight(); + this._signal("afterRender"); + return; + } + if (changes & this.CHANGE_SCROLL) { + if (changes & this.CHANGE_TEXT || changes & this.CHANGE_LINES) + this.$textLayer.update(config); + else + this.$textLayer.scrollLines(config); + + if (this.$showGutter) + this.$gutterLayer.update(config); + this.$markerBack.update(config); + this.$markerFront.update(config); + this.$cursorLayer.update(config); + this.$highlightGutterLine && this.$updateGutterLineHighlight(); + this.$moveTextAreaToCursor(); + this._signal("afterRender"); + return; + } + + if (changes & this.CHANGE_TEXT) { + this.$textLayer.update(config); + if (this.$showGutter) + this.$gutterLayer.update(config); + } + else if (changes & this.CHANGE_LINES) { + if (this.$updateLines() || (changes & this.CHANGE_GUTTER) && this.$showGutter) + this.$gutterLayer.update(config); + } + else if (changes & this.CHANGE_TEXT || changes & this.CHANGE_GUTTER) { + if (this.$showGutter) + this.$gutterLayer.update(config); + } + + if (changes & this.CHANGE_CURSOR) { + this.$cursorLayer.update(config); + this.$moveTextAreaToCursor(); + this.$highlightGutterLine && this.$updateGutterLineHighlight(); + } + + if (changes & (this.CHANGE_MARKER | this.CHANGE_MARKER_FRONT)) { + this.$markerFront.update(config); + } + + if (changes & (this.CHANGE_MARKER | this.CHANGE_MARKER_BACK)) { + this.$markerBack.update(config); + } + + this._signal("afterRender"); + }; + + + this.$autosize = function() { + var height = this.session.getScreenLength() * this.lineHeight; + var maxHeight = this.$maxLines * this.lineHeight; + var desiredHeight = Math.max( + (this.$minLines||1) * this.lineHeight, + Math.min(maxHeight, height) + ) + this.scrollMargin.v + (this.$extraHeight || 0); + var vScroll = height > maxHeight; + + if (desiredHeight != this.desiredHeight || + this.$size.height != this.desiredHeight || vScroll != this.$vScroll) { + if (vScroll != this.$vScroll) { + this.$vScroll = vScroll; + this.scrollBarV.setVisible(vScroll); + } + + var w = this.container.clientWidth; + this.container.style.height = desiredHeight + "px"; + this.$updateCachedSize(true, this.$gutterWidth, w, desiredHeight); + this.desiredHeight = desiredHeight; + } + }; + + this.$computeLayerConfig = function() { + if (this.$maxLines && this.lineHeight > 1) + this.$autosize(); + + var session = this.session; + var size = this.$size; + + var hideScrollbars = size.height <= 2 * this.lineHeight; + var screenLines = this.session.getScreenLength(); + var maxHeight = screenLines * this.lineHeight; + + var offset = this.scrollTop % this.lineHeight; + var minHeight = size.scrollerHeight + this.lineHeight; + + var longestLine = this.$getLongestLine(); + + var horizScroll = !hideScrollbars && (this.$hScrollBarAlwaysVisible || + size.scrollerWidth - longestLine - 2 * this.$padding < 0); + + var hScrollChanged = this.$horizScroll !== horizScroll; + if (hScrollChanged) { + this.$horizScroll = horizScroll; + this.scrollBarH.setVisible(horizScroll); + } + + if (!this.$maxLines && this.$scrollPastEnd) { + if (this.scrollTop > maxHeight - size.scrollerHeight) + maxHeight += Math.min( + (size.scrollerHeight - this.lineHeight) * this.$scrollPastEnd, + this.scrollTop - maxHeight + size.scrollerHeight + ); + } + + var vScroll = !hideScrollbars && (this.$vScrollBarAlwaysVisible || + size.scrollerHeight - maxHeight < 0); + var vScrollChanged = this.$vScroll !== vScroll; + if (vScrollChanged) { + this.$vScroll = vScroll; + this.scrollBarV.setVisible(vScroll); + } + + this.session.setScrollTop(Math.max(-this.scrollMargin.top, + Math.min(this.scrollTop, maxHeight - size.scrollerHeight + this.scrollMargin.bottom))); + + this.session.setScrollLeft(Math.max(-this.scrollMargin.left, Math.min(this.scrollLeft, + longestLine + 2 * this.$padding - size.scrollerWidth + this.scrollMargin.right))); + + var lineCount = Math.ceil(minHeight / this.lineHeight) - 1; + var firstRow = Math.max(0, Math.round((this.scrollTop - offset) / this.lineHeight)); + var lastRow = firstRow + lineCount; + var firstRowScreen, firstRowHeight; + var lineHeight = this.lineHeight; + firstRow = session.screenToDocumentRow(firstRow, 0); + var foldLine = session.getFoldLine(firstRow); + if (foldLine) { + firstRow = foldLine.start.row; + } + + firstRowScreen = session.documentToScreenRow(firstRow, 0); + firstRowHeight = session.getRowLength(firstRow) * lineHeight; + + lastRow = Math.min(session.screenToDocumentRow(lastRow, 0), session.getLength() - 1); + minHeight = size.scrollerHeight + session.getRowLength(lastRow) * lineHeight + + firstRowHeight; + + offset = this.scrollTop - firstRowScreen * lineHeight; + + var changes = 0; + if (this.layerConfig.width != longestLine) + changes = this.CHANGE_H_SCROLL; + if (hScrollChanged || vScrollChanged) { + changes = this.$updateCachedSize(true, this.gutterWidth, size.width, size.height); + this._signal("scrollbarVisibilityChanged"); + if (vScrollChanged) + longestLine = this.$getLongestLine(); + } + + this.layerConfig = { + width : longestLine, + padding : this.$padding, + firstRow : firstRow, + firstRowScreen: firstRowScreen, + lastRow : lastRow, + lineHeight : lineHeight, + characterWidth : this.characterWidth, + minHeight : minHeight, + maxHeight : maxHeight, + offset : offset, + gutterOffset : Math.max(0, Math.ceil((offset + size.height - size.scrollerHeight) / lineHeight)), + height : this.$size.scrollerHeight + }; + + return changes; + }; + + this.$updateLines = function() { + var firstRow = this.$changedLines.firstRow; + var lastRow = this.$changedLines.lastRow; + this.$changedLines = null; + + var layerConfig = this.layerConfig; + + if (firstRow > layerConfig.lastRow + 1) { return; } + if (lastRow < layerConfig.firstRow) { return; } + if (lastRow === Infinity) { + if (this.$showGutter) + this.$gutterLayer.update(layerConfig); + this.$textLayer.update(layerConfig); + return; + } + this.$textLayer.updateLines(layerConfig, firstRow, lastRow); + return true; + }; + + this.$getLongestLine = function() { + var charCount = this.session.getScreenWidth(); + if (this.showInvisibles && !this.session.$useWrapMode) + charCount += 1; + + return Math.max(this.$size.scrollerWidth - 2 * this.$padding, Math.round(charCount * this.characterWidth)); + }; + this.updateFrontMarkers = function() { + this.$markerFront.setMarkers(this.session.getMarkers(true)); + this.$loop.schedule(this.CHANGE_MARKER_FRONT); + }; + this.updateBackMarkers = function() { + this.$markerBack.setMarkers(this.session.getMarkers()); + this.$loop.schedule(this.CHANGE_MARKER_BACK); + }; + this.addGutterDecoration = function(row, className){ + this.$gutterLayer.addGutterDecoration(row, className); + }; + this.removeGutterDecoration = function(row, className){ + this.$gutterLayer.removeGutterDecoration(row, className); + }; + this.updateBreakpoints = function(rows) { + this.$loop.schedule(this.CHANGE_GUTTER); + }; + this.setAnnotations = function(annotations) { + this.$gutterLayer.setAnnotations(annotations); + this.$loop.schedule(this.CHANGE_GUTTER); + }; + this.updateCursor = function() { + this.$loop.schedule(this.CHANGE_CURSOR); + }; + this.hideCursor = function() { + this.$cursorLayer.hideCursor(); + }; + this.showCursor = function() { + this.$cursorLayer.showCursor(); + }; + + this.scrollSelectionIntoView = function(anchor, lead, offset) { + this.scrollCursorIntoView(anchor, offset); + this.scrollCursorIntoView(lead, offset); + }; + this.scrollCursorIntoView = function(cursor, offset, $viewMargin) { + if (this.$size.scrollerHeight === 0) + return; + + var pos = this.$cursorLayer.getPixelPosition(cursor); + + var left = pos.left; + var top = pos.top; + + var topMargin = $viewMargin && $viewMargin.top || 0; + var bottomMargin = $viewMargin && $viewMargin.bottom || 0; + + var scrollTop = this.$scrollAnimation ? this.session.getScrollTop() : this.scrollTop; + + if (scrollTop + topMargin > top) { + if (offset) + top -= offset * this.$size.scrollerHeight; + if (top === 0) + top = -this.scrollMargin.top; + this.session.setScrollTop(top); + } else if (scrollTop + this.$size.scrollerHeight - bottomMargin < top + this.lineHeight) { + if (offset) + top += offset * this.$size.scrollerHeight; + this.session.setScrollTop(top + this.lineHeight - this.$size.scrollerHeight); + } + + var scrollLeft = this.scrollLeft; + + if (scrollLeft > left) { + if (left < this.$padding + 2 * this.layerConfig.characterWidth) + left = -this.scrollMargin.left; + this.session.setScrollLeft(left); + } else if (scrollLeft + this.$size.scrollerWidth < left + this.characterWidth) { + this.session.setScrollLeft(Math.round(left + this.characterWidth - this.$size.scrollerWidth)); + } else if (scrollLeft <= this.$padding && left - scrollLeft < this.characterWidth) { + this.session.setScrollLeft(0); + } + }; + this.getScrollTop = function() { + return this.session.getScrollTop(); + }; + this.getScrollLeft = function() { + return this.session.getScrollLeft(); + }; + this.getScrollTopRow = function() { + return this.scrollTop / this.lineHeight; + }; + this.getScrollBottomRow = function() { + return Math.max(0, Math.floor((this.scrollTop + this.$size.scrollerHeight) / this.lineHeight) - 1); + }; + this.scrollToRow = function(row) { + this.session.setScrollTop(row * this.lineHeight); + }; + + this.alignCursor = function(cursor, alignment) { + if (typeof cursor == "number") + cursor = {row: cursor, column: 0}; + + var pos = this.$cursorLayer.getPixelPosition(cursor); + var h = this.$size.scrollerHeight - this.lineHeight; + var offset = pos.top - h * (alignment || 0); + + this.session.setScrollTop(offset); + return offset; + }; + + this.STEPS = 8; + this.$calcSteps = function(fromValue, toValue){ + var i = 0; + var l = this.STEPS; + var steps = []; + + var func = function(t, x_min, dx) { + return dx * (Math.pow(t - 1, 3) + 1) + x_min; + }; + + for (i = 0; i < l; ++i) + steps.push(func(i / this.STEPS, fromValue, toValue - fromValue)); + + return steps; + }; + this.scrollToLine = function(line, center, animate, callback) { + var pos = this.$cursorLayer.getPixelPosition({row: line, column: 0}); + var offset = pos.top; + if (center) + offset -= this.$size.scrollerHeight / 2; + + var initialScroll = this.scrollTop; + this.session.setScrollTop(offset); + if (animate !== false) + this.animateScrolling(initialScroll, callback); + }; + + this.animateScrolling = function(fromValue, callback) { + var toValue = this.scrollTop; + if (!this.$animatedScroll) + return; + var _self = this; + + if (fromValue == toValue) + return; + + if (this.$scrollAnimation) { + var oldSteps = this.$scrollAnimation.steps; + if (oldSteps.length) { + fromValue = oldSteps[0]; + if (fromValue == toValue) + return; + } + } + + var steps = _self.$calcSteps(fromValue, toValue); + this.$scrollAnimation = {from: fromValue, to: toValue, steps: steps}; + + clearInterval(this.$timer); + + _self.session.setScrollTop(steps.shift()); + _self.session.$scrollTop = toValue; + this.$timer = setInterval(function() { + if (steps.length) { + _self.session.setScrollTop(steps.shift()); + _self.session.$scrollTop = toValue; + } else if (toValue != null) { + _self.session.$scrollTop = -1; + _self.session.setScrollTop(toValue); + toValue = null; + } else { + _self.$timer = clearInterval(_self.$timer); + _self.$scrollAnimation = null; + callback && callback(); + } + }, 10); + }; + this.scrollToY = function(scrollTop) { + if (this.scrollTop !== scrollTop) { + this.$loop.schedule(this.CHANGE_SCROLL); + this.scrollTop = scrollTop; + } + }; + this.scrollToX = function(scrollLeft) { + if (this.scrollLeft !== scrollLeft) + this.scrollLeft = scrollLeft; + this.$loop.schedule(this.CHANGE_H_SCROLL); + }; + this.scrollTo = function(x, y) { + this.session.setScrollTop(y); + this.session.setScrollLeft(y); + }; + this.scrollBy = function(deltaX, deltaY) { + deltaY && this.session.setScrollTop(this.session.getScrollTop() + deltaY); + deltaX && this.session.setScrollLeft(this.session.getScrollLeft() + deltaX); + }; + this.isScrollableBy = function(deltaX, deltaY) { + if (deltaY < 0 && this.session.getScrollTop() >= 1 - this.scrollMargin.top) + return true; + if (deltaY > 0 && this.session.getScrollTop() + this.$size.scrollerHeight + - this.layerConfig.maxHeight - (this.$size.scrollerHeight - this.lineHeight) * this.$scrollPastEnd + < -1 + this.scrollMargin.bottom) + return true; + if (deltaX < 0 && this.session.getScrollLeft() >= 1 - this.scrollMargin.left) + return true; + if (deltaX > 0 && this.session.getScrollLeft() + this.$size.scrollerWidth + - this.layerConfig.width < -1 + this.scrollMargin.right) + return true; + }; + + this.pixelToScreenCoordinates = function(x, y) { + var canvasPos = this.scroller.getBoundingClientRect(); + + var offset = (x + this.scrollLeft - canvasPos.left - this.$padding) / this.characterWidth; + var row = Math.floor((y + this.scrollTop - canvasPos.top) / this.lineHeight); + var col = Math.round(offset); + + return {row: row, column: col, side: offset - col > 0 ? 1 : -1}; + }; + + this.screenToTextCoordinates = function(x, y) { + var canvasPos = this.scroller.getBoundingClientRect(); + + var col = Math.round( + (x + this.scrollLeft - canvasPos.left - this.$padding) / this.characterWidth + ); + + var row = (y + this.scrollTop - canvasPos.top) / this.lineHeight; + + return this.session.screenToDocumentPosition(row, Math.max(col, 0)); + }; + this.textToScreenCoordinates = function(row, column) { + var canvasPos = this.scroller.getBoundingClientRect(); + var pos = this.session.documentToScreenPosition(row, column); + + var x = this.$padding + Math.round(pos.column * this.characterWidth); + var y = pos.row * this.lineHeight; + + return { + pageX: canvasPos.left + x - this.scrollLeft, + pageY: canvasPos.top + y - this.scrollTop + }; + }; + this.visualizeFocus = function() { + dom.addCssClass(this.container, "ace_focus"); + }; + this.visualizeBlur = function() { + dom.removeCssClass(this.container, "ace_focus"); + }; + this.showComposition = function(position) { + if (!this.$composition) + this.$composition = { + keepTextAreaAtCursor: this.$keepTextAreaAtCursor, + cssText: this.textarea.style.cssText + }; + + this.$keepTextAreaAtCursor = true; + dom.addCssClass(this.textarea, "ace_composition"); + this.textarea.style.cssText = ""; + this.$moveTextAreaToCursor(); + }; + this.setCompositionText = function(text) { + this.$moveTextAreaToCursor(); + }; + this.hideComposition = function() { + if (!this.$composition) + return; + + dom.removeCssClass(this.textarea, "ace_composition"); + this.$keepTextAreaAtCursor = this.$composition.keepTextAreaAtCursor; + this.textarea.style.cssText = this.$composition.cssText; + this.$composition = null; + }; + this.setTheme = function(theme, cb) { + var _self = this; + this.$themeId = theme; + _self._dispatchEvent('themeChange',{theme:theme}); + + if (!theme || typeof theme == "string") { + var moduleName = theme || this.$options.theme.initialValue; + config.loadModule(["theme", moduleName], afterLoad); + } else { + afterLoad(theme); + } + + function afterLoad(module) { + if (_self.$themeId != theme) + return cb && cb(); + if (!module.cssClass) + return; + dom.importCssString( + module.cssText, + module.cssClass, + _self.container.ownerDocument + ); + + if (_self.theme) + dom.removeCssClass(_self.container, _self.theme.cssClass); + + var padding = "padding" in module ? module.padding + : "padding" in (_self.theme || {}) ? 4 : _self.$padding; + if (_self.$padding && padding != _self.$padding) + _self.setPadding(padding); + _self.$theme = module.cssClass; + + _self.theme = module; + dom.addCssClass(_self.container, module.cssClass); + dom.setCssClass(_self.container, "ace_dark", module.isDark); + if (_self.$size) { + _self.$size.width = 0; + _self.$updateSizeAsync(); + } + + _self._dispatchEvent('themeLoaded', {theme:module}); + cb && cb(); + } + }; + this.getTheme = function() { + return this.$themeId; + }; + this.setStyle = function(style, include) { + dom.setCssClass(this.container, style, include !== false); + }; + this.unsetStyle = function(style) { + dom.removeCssClass(this.container, style); + }; + + this.setCursorStyle = function(style) { + if (this.content.style.cursor != style) + this.content.style.cursor = style; + }; + this.setMouseCursor = function(cursorStyle) { + this.content.style.cursor = cursorStyle; + }; + this.destroy = function() { + this.$textLayer.destroy(); + this.$cursorLayer.destroy(); + }; + +}).call(VirtualRenderer.prototype); + + +config.defineOptions(VirtualRenderer.prototype, "renderer", { + animatedScroll: {initialValue: false}, + showInvisibles: { + set: function(value) { + if (this.$textLayer.setShowInvisibles(value)) + this.$loop.schedule(this.CHANGE_TEXT); + }, + initialValue: false + }, + showPrintMargin: { + set: function() { this.$updatePrintMargin(); }, + initialValue: true + }, + printMarginColumn: { + set: function() { this.$updatePrintMargin(); }, + initialValue: 80 + }, + printMargin: { + set: function(val) { + if (typeof val == "number") + this.$printMarginColumn = val; + this.$showPrintMargin = !!val; + this.$updatePrintMargin(); + }, + get: function() { + return this.$showPrintMargin && this.$printMarginColumn; + } + }, + showGutter: { + set: function(show){ + this.$gutter.style.display = show ? "block" : "none"; + this.$loop.schedule(this.CHANGE_FULL); + this.onGutterResize(); + }, + initialValue: true + }, + fadeFoldWidgets: { + set: function(show) { + dom.setCssClass(this.$gutter, "ace_fade-fold-widgets", show); + }, + initialValue: false + }, + showFoldWidgets: { + set: function(show) {this.$gutterLayer.setShowFoldWidgets(show)}, + initialValue: true + }, + showLineNumbers: { + set: function(show) { + this.$gutterLayer.setShowLineNumbers(show); + this.$loop.schedule(this.CHANGE_GUTTER); + }, + initialValue: true + }, + displayIndentGuides: { + set: function(show) { + if (this.$textLayer.setDisplayIndentGuides(show)) + this.$loop.schedule(this.CHANGE_TEXT); + }, + initialValue: true + }, + highlightGutterLine: { + set: function(shouldHighlight) { + if (!this.$gutterLineHighlight) { + this.$gutterLineHighlight = dom.createElement("div"); + this.$gutterLineHighlight.className = "ace_gutter-active-line"; + this.$gutter.appendChild(this.$gutterLineHighlight); + return; + } + + this.$gutterLineHighlight.style.display = shouldHighlight ? "" : "none"; + if (this.$cursorLayer.$pixelPos) + this.$updateGutterLineHighlight(); + }, + initialValue: false, + value: true + }, + hScrollBarAlwaysVisible: { + set: function(val) { + if (!this.$hScrollBarAlwaysVisible || !this.$horizScroll) + this.$loop.schedule(this.CHANGE_SCROLL); + }, + initialValue: false + }, + vScrollBarAlwaysVisible: { + set: function(val) { + if (!this.$vScrollBarAlwaysVisible || !this.$vScroll) + this.$loop.schedule(this.CHANGE_SCROLL); + }, + initialValue: false + }, + fontSize: { + set: function(size) { + if (typeof size == "number") + size = size + "px"; + this.container.style.fontSize = size; + this.updateFontSize(); + }, + initialValue: 12 + }, + fontFamily: { + set: function(name) { + this.container.style.fontFamily = name; + this.updateFontSize(); + } + }, + maxLines: { + set: function(val) { + this.updateFull(); + } + }, + minLines: { + set: function(val) { + this.updateFull(); + } + }, + scrollPastEnd: { + set: function(val) { + val = +val || 0; + if (this.$scrollPastEnd == val) + return; + this.$scrollPastEnd = val; + this.$loop.schedule(this.CHANGE_SCROLL); + }, + initialValue: 0, + handlesSet: true + }, + fixedWidthGutter: { + set: function(val) { + this.$gutterLayer.$fixedWidth = !!val; + this.$loop.schedule(this.CHANGE_GUTTER); + } + }, + theme: { + set: function(val) { this.setTheme(val) }, + get: function() { return this.$themeId || this.theme; }, + initialValue: "./theme/textmate", + handlesSet: true + } +}); + +exports.VirtualRenderer = VirtualRenderer; +}); + +ace.define('ace/layer/gutter', ['require', 'exports', 'module' , 'ace/lib/dom', 'ace/lib/oop', 'ace/lib/lang', 'ace/lib/event_emitter'], function(require, exports, module) { + + +var dom = require("../lib/dom"); +var oop = require("../lib/oop"); +var lang = require("../lib/lang"); +var EventEmitter = require("../lib/event_emitter").EventEmitter; + +var Gutter = function(parentEl) { + this.element = dom.createElement("div"); + this.element.className = "ace_layer ace_gutter-layer"; + parentEl.appendChild(this.element); + this.setShowFoldWidgets(this.$showFoldWidgets); + + this.gutterWidth = 0; + + this.$annotations = []; + this.$updateAnnotations = this.$updateAnnotations.bind(this); + + this.$cells = []; +}; + +(function() { + + oop.implement(this, EventEmitter); + + this.setSession = function(session) { + if (this.session) + this.session.removeEventListener("change", this.$updateAnnotations); + this.session = session; + session.on("change", this.$updateAnnotations); + }; + + this.addGutterDecoration = function(row, className){ + if (window.console) + console.warn && console.warn("deprecated use session.addGutterDecoration"); + this.session.addGutterDecoration(row, className); + }; + + this.removeGutterDecoration = function(row, className){ + if (window.console) + console.warn && console.warn("deprecated use session.removeGutterDecoration"); + this.session.removeGutterDecoration(row, className); + }; + + this.setAnnotations = function(annotations) { + this.$annotations = []; + for (var i = 0; i < annotations.length; i++) { + var annotation = annotations[i]; + var row = annotation.row; + var rowInfo = this.$annotations[row]; + if (!rowInfo) + rowInfo = this.$annotations[row] = {text: []}; + + var annoText = annotation.text; + annoText = annoText ? lang.escapeHTML(annoText) : annotation.html || ""; + + if (rowInfo.text.indexOf(annoText) === -1) + rowInfo.text.push(annoText); + + var type = annotation.type; + if (type == "error") + rowInfo.className = " ace_error"; + else if (type == "warning" && rowInfo.className != " ace_error") + rowInfo.className = " ace_warning"; + else if (type == "info" && (!rowInfo.className)) + rowInfo.className = " ace_info"; + } + }; + + this.$updateAnnotations = function (e) { + if (!this.$annotations.length) + return; + var delta = e.data; + var range = delta.range; + var firstRow = range.start.row; + var len = range.end.row - firstRow; + if (len === 0) { + } else if (delta.action == "removeText" || delta.action == "removeLines") { + this.$annotations.splice(firstRow, len + 1, null); + } else { + var args = new Array(len + 1); + args.unshift(firstRow, 1); + this.$annotations.splice.apply(this.$annotations, args); + } + }; + + this.update = function(config) { + var session = this.session; + var firstRow = config.firstRow; + var lastRow = Math.min(config.lastRow + config.gutterOffset, // needed to compensate for hor scollbar + session.getLength() - 1); + var fold = session.getNextFoldLine(firstRow); + var foldStart = fold ? fold.start.row : Infinity; + var foldWidgets = this.$showFoldWidgets && session.foldWidgets; + var breakpoints = session.$breakpoints; + var decorations = session.$decorations; + var firstLineNumber = session.$firstLineNumber; + var lastLineNumber = 0; + + var gutterRenderer = session.gutterRenderer || this.$renderer; + + var cell = null; + var index = -1; + var row = firstRow; + while (true) { + if (row > foldStart) { + row = fold.end.row + 1; + fold = session.getNextFoldLine(row, fold); + foldStart = fold ? fold.start.row : Infinity; + } + if (row > lastRow) { + while (this.$cells.length > index + 1) { + cell = this.$cells.pop(); + this.element.removeChild(cell.element); + } + break; + } + + cell = this.$cells[++index]; + if (!cell) { + cell = {element: null, textNode: null, foldWidget: null}; + cell.element = dom.createElement("div"); + cell.textNode = document.createTextNode(''); + cell.element.appendChild(cell.textNode); + this.element.appendChild(cell.element); + this.$cells[index] = cell; + } + + var className = "ace_gutter-cell "; + if (breakpoints[row]) + className += breakpoints[row]; + if (decorations[row]) + className += decorations[row]; + if (this.$annotations[row]) + className += this.$annotations[row].className; + if (cell.element.className != className) + cell.element.className = className; + + var height = session.getRowLength(row) * config.lineHeight + "px"; + if (height != cell.element.style.height) + cell.element.style.height = height; + + if (foldWidgets) { + var c = foldWidgets[row]; + if (c == null) + c = foldWidgets[row] = session.getFoldWidget(row); + } + + if (c) { + if (!cell.foldWidget) { + cell.foldWidget = dom.createElement("span"); + cell.element.appendChild(cell.foldWidget); + } + var className = "ace_fold-widget ace_" + c; + if (c == "start" && row == foldStart && row < fold.end.row) + className += " ace_closed"; + else + className += " ace_open"; + if (cell.foldWidget.className != className) + cell.foldWidget.className = className; + + var height = config.lineHeight + "px"; + if (cell.foldWidget.style.height != height) + cell.foldWidget.style.height = height; + } else { + if (cell.foldWidget) { + cell.element.removeChild(cell.foldWidget); + cell.foldWidget = null; + } + } + + var text = lastLineNumber = gutterRenderer + ? gutterRenderer.getText(session, row) + : row + firstLineNumber; + if (text != cell.textNode.data) + cell.textNode.data = text; + + row++; + } + + this.element.style.height = config.minHeight + "px"; + + if (this.$fixedWidth || session.$useWrapMode) + lastLineNumber = session.getLength() + firstLineNumber; + + var gutterWidth = gutterRenderer + ? gutterRenderer.getWidth(session, lastLineNumber, config) + : lastLineNumber.toString().length * config.characterWidth; + + var padding = this.$padding || this.$computePadding(); + gutterWidth += padding.left + padding.right; + if (gutterWidth !== this.gutterWidth && !isNaN(gutterWidth)) { + this.gutterWidth = gutterWidth; + this.element.style.width = Math.ceil(this.gutterWidth) + "px"; + this._emit("changeGutterWidth", gutterWidth); + } + }; + + this.$fixedWidth = false; + + this.$showLineNumbers = true; + this.$renderer = ""; + this.setShowLineNumbers = function(show) { + this.$renderer = !show && { + getWidth: function() {return ""}, + getText: function() {return ""} + }; + }; + + this.getShowLineNumbers = function() { + return this.$showLineNumbers; + }; + + this.$showFoldWidgets = true; + this.setShowFoldWidgets = function(show) { + if (show) + dom.addCssClass(this.element, "ace_folding-enabled"); + else + dom.removeCssClass(this.element, "ace_folding-enabled"); + + this.$showFoldWidgets = show; + this.$padding = null; + }; + + this.getShowFoldWidgets = function() { + return this.$showFoldWidgets; + }; + + this.$computePadding = function() { + if (!this.element.firstChild) + return {left: 0, right: 0}; + var style = dom.computedStyle(this.element.firstChild); + this.$padding = {}; + this.$padding.left = parseInt(style.paddingLeft) + 1 || 0; + this.$padding.right = parseInt(style.paddingRight) || 0; + return this.$padding; + }; + + this.getRegion = function(point) { + var padding = this.$padding || this.$computePadding(); + var rect = this.element.getBoundingClientRect(); + if (point.x < padding.left + rect.left) + return "markers"; + if (this.$showFoldWidgets && point.x > rect.right - padding.right) + return "foldWidgets"; + }; + +}).call(Gutter.prototype); + +exports.Gutter = Gutter; + +}); + +ace.define('ace/layer/marker', ['require', 'exports', 'module' , 'ace/range', 'ace/lib/dom'], function(require, exports, module) { + + +var Range = require("../range").Range; +var dom = require("../lib/dom"); + +var Marker = function(parentEl) { + this.element = dom.createElement("div"); + this.element.className = "ace_layer ace_marker-layer"; + parentEl.appendChild(this.element); +}; + +(function() { + + this.$padding = 0; + + this.setPadding = function(padding) { + this.$padding = padding; + }; + this.setSession = function(session) { + this.session = session; + }; + + this.setMarkers = function(markers) { + this.markers = markers; + }; + + this.update = function(config) { + var config = config || this.config; + if (!config) + return; + + this.config = config; + + + var html = []; + for (var key in this.markers) { + var marker = this.markers[key]; + + if (!marker.range) { + marker.update(html, this, this.session, config); + continue; + } + + var range = marker.range.clipRows(config.firstRow, config.lastRow); + if (range.isEmpty()) continue; + + range = range.toScreenRange(this.session); + if (marker.renderer) { + var top = this.$getTop(range.start.row, config); + var left = this.$padding + range.start.column * config.characterWidth; + marker.renderer(html, range, left, top, config); + } else if (marker.type == "fullLine") { + this.drawFullLineMarker(html, range, marker.clazz, config); + } else if (marker.type == "screenLine") { + this.drawScreenLineMarker(html, range, marker.clazz, config); + } else if (range.isMultiLine()) { + if (marker.type == "text") + this.drawTextMarker(html, range, marker.clazz, config); + else + this.drawMultiLineMarker(html, range, marker.clazz, config); + } else { + this.drawSingleLineMarker(html, range, marker.clazz + " ace_start", config); + } + } + this.element = dom.setInnerHtml(this.element, html.join("")); + }; + + this.$getTop = function(row, layerConfig) { + return (row - layerConfig.firstRowScreen) * layerConfig.lineHeight; + }; + this.drawTextMarker = function(stringBuilder, range, clazz, layerConfig, extraStyle) { + var row = range.start.row; + + var lineRange = new Range( + row, range.start.column, + row, this.session.getScreenLastRowColumn(row) + ); + this.drawSingleLineMarker(stringBuilder, lineRange, clazz + " ace_start", layerConfig, 1, extraStyle); + row = range.end.row; + lineRange = new Range(row, 0, row, range.end.column); + this.drawSingleLineMarker(stringBuilder, lineRange, clazz, layerConfig, 0, extraStyle); + + for (row = range.start.row + 1; row < range.end.row; row++) { + lineRange.start.row = row; + lineRange.end.row = row; + lineRange.end.column = this.session.getScreenLastRowColumn(row); + this.drawSingleLineMarker(stringBuilder, lineRange, clazz, layerConfig, 1, extraStyle); + } + }; + this.drawMultiLineMarker = function(stringBuilder, range, clazz, config, extraStyle) { + var padding = this.$padding; + var height = config.lineHeight; + var top = this.$getTop(range.start.row, config); + var left = padding + range.start.column * config.characterWidth; + extraStyle = extraStyle || ""; + + stringBuilder.push( + "
    " + ); + top = this.$getTop(range.end.row, config); + var width = range.end.column * config.characterWidth; + + stringBuilder.push( + "
    " + ); + height = (range.end.row - range.start.row - 1) * config.lineHeight; + if (height < 0) + return; + top = this.$getTop(range.start.row + 1, config); + + stringBuilder.push( + "
    " + ); + }; + this.drawSingleLineMarker = function(stringBuilder, range, clazz, config, extraLength, extraStyle) { + var height = config.lineHeight; + var width = (range.end.column + (extraLength || 0) - range.start.column) * config.characterWidth; + + var top = this.$getTop(range.start.row, config); + var left = this.$padding + range.start.column * config.characterWidth; + + stringBuilder.push( + "
    " + ); + }; + + this.drawFullLineMarker = function(stringBuilder, range, clazz, config, extraStyle) { + var top = this.$getTop(range.start.row, config); + var height = config.lineHeight; + if (range.start.row != range.end.row) + height += this.$getTop(range.end.row, config) - top; + + stringBuilder.push( + "
    " + ); + }; + + this.drawScreenLineMarker = function(stringBuilder, range, clazz, config, extraStyle) { + var top = this.$getTop(range.start.row, config); + var height = config.lineHeight; + + stringBuilder.push( + "
    " + ); + }; + +}).call(Marker.prototype); + +exports.Marker = Marker; + +}); + +ace.define('ace/layer/text', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/dom', 'ace/lib/lang', 'ace/lib/useragent', 'ace/lib/event_emitter'], function(require, exports, module) { + + +var oop = require("../lib/oop"); +var dom = require("../lib/dom"); +var lang = require("../lib/lang"); +var useragent = require("../lib/useragent"); +var EventEmitter = require("../lib/event_emitter").EventEmitter; + +var Text = function(parentEl) { + this.element = dom.createElement("div"); + this.element.className = "ace_layer ace_text-layer"; + parentEl.appendChild(this.element); + this.$updateEolChar = this.$updateEolChar.bind(this); +}; + +(function() { + + oop.implement(this, EventEmitter); + + this.EOF_CHAR = "\xB6"; + this.EOL_CHAR_LF = "\xAC"; + this.EOL_CHAR_CRLF = "\xa4"; + this.EOL_CHAR = this.EOL_CHAR_LF; + this.TAB_CHAR = "\u2192"; //"\u21E5"; + this.SPACE_CHAR = "\xB7"; + this.$padding = 0; + + this.$updateEolChar = function() { + var EOL_CHAR = this.session.doc.getNewLineCharacter() == "\n" + ? this.EOL_CHAR_LF + : this.EOL_CHAR_CRLF; + if (this.EOL_CHAR != EOL_CHAR) { + this.EOL_CHAR = EOL_CHAR; + return true; + } + } + + this.setPadding = function(padding) { + this.$padding = padding; + this.element.style.padding = "0 " + padding + "px"; + }; + + this.getLineHeight = function() { + return this.$fontMetrics.$characterSize.height || 0; + }; + + this.getCharacterWidth = function() { + return this.$fontMetrics.$characterSize.width || 0; + }; + + this.$setFontMetrics = function(measure) { + this.$fontMetrics = measure; + this.$fontMetrics.on("changeCharacterSize", function(e) { + this._signal("changeCharacterSize", e); + }.bind(this)); + this.$pollSizeChanges(); + } + + this.checkForSizeChanges = function() { + this.$fontMetrics.checkForSizeChanges(); + }; + this.$pollSizeChanges = function() { + return this.$pollSizeChangesTimer = this.$fontMetrics.$pollSizeChanges(); + }; + this.setSession = function(session) { + this.session = session; + this.$computeTabString(); + }; + + this.showInvisibles = false; + this.setShowInvisibles = function(showInvisibles) { + if (this.showInvisibles == showInvisibles) + return false; + + this.showInvisibles = showInvisibles; + this.$computeTabString(); + return true; + }; + + this.displayIndentGuides = true; + this.setDisplayIndentGuides = function(display) { + if (this.displayIndentGuides == display) + return false; + + this.displayIndentGuides = display; + this.$computeTabString(); + return true; + }; + + this.$tabStrings = []; + this.onChangeTabSize = + this.$computeTabString = function() { + var tabSize = this.session.getTabSize(); + this.tabSize = tabSize; + var tabStr = this.$tabStrings = [0]; + for (var i = 1; i < tabSize + 1; i++) { + if (this.showInvisibles) { + tabStr.push("" + + this.TAB_CHAR + + lang.stringRepeat("\xa0", i - 1) + + ""); + } else { + tabStr.push(lang.stringRepeat("\xa0", i)); + } + } + if (this.displayIndentGuides) { + this.$indentGuideRe = /\s\S| \t|\t |\s$/; + var className = "ace_indent-guide"; + var spaceClass = ""; + var tabClass = ""; + if (this.showInvisibles) { + className += " ace_invisible"; + spaceClass = " ace_invisible_space"; + tabClass = " ace_invisible_tab"; + var spaceContent = lang.stringRepeat(this.SPACE_CHAR, this.tabSize); + var tabContent = this.TAB_CHAR + lang.stringRepeat("\xa0", this.tabSize - 1); + } else{ + var spaceContent = lang.stringRepeat("\xa0", this.tabSize); + var tabContent = spaceContent; + } + + this.$tabStrings[" "] = "" + spaceContent + ""; + this.$tabStrings["\t"] = "" + tabContent + ""; + } + }; + + this.updateLines = function(config, firstRow, lastRow) { + if (this.config.lastRow != config.lastRow || + this.config.firstRow != config.firstRow) { + this.scrollLines(config); + } + this.config = config; + + var first = Math.max(firstRow, config.firstRow); + var last = Math.min(lastRow, config.lastRow); + + var lineElements = this.element.childNodes; + var lineElementsIdx = 0; + + for (var row = config.firstRow; row < first; row++) { + var foldLine = this.session.getFoldLine(row); + if (foldLine) { + if (foldLine.containsRow(first)) { + first = foldLine.start.row; + break; + } else { + row = foldLine.end.row; + } + } + lineElementsIdx ++; + } + + var row = first; + var foldLine = this.session.getNextFoldLine(row); + var foldStart = foldLine ? foldLine.start.row : Infinity; + + while (true) { + if (row > foldStart) { + row = foldLine.end.row+1; + foldLine = this.session.getNextFoldLine(row, foldLine); + foldStart = foldLine ? foldLine.start.row :Infinity; + } + if (row > last) + break; + + var lineElement = lineElements[lineElementsIdx++]; + if (lineElement) { + var html = []; + this.$renderLine( + html, row, !this.$useLineGroups(), row == foldStart ? foldLine : false + ); + lineElement.style.height = config.lineHeight * this.session.getRowLength(row) + "px"; + dom.setInnerHtml(lineElement, html.join("")); + } + row++; + } + }; + + this.scrollLines = function(config) { + var oldConfig = this.config; + this.config = config; + + if (!oldConfig || oldConfig.lastRow < config.firstRow) + return this.update(config); + + if (config.lastRow < oldConfig.firstRow) + return this.update(config); + + var el = this.element; + if (oldConfig.firstRow < config.firstRow) + for (var row=this.session.getFoldedRowCount(oldConfig.firstRow, config.firstRow - 1); row>0; row--) + el.removeChild(el.firstChild); + + if (oldConfig.lastRow > config.lastRow) + for (var row=this.session.getFoldedRowCount(config.lastRow + 1, oldConfig.lastRow); row>0; row--) + el.removeChild(el.lastChild); + + if (config.firstRow < oldConfig.firstRow) { + var fragment = this.$renderLinesFragment(config, config.firstRow, oldConfig.firstRow - 1); + if (el.firstChild) + el.insertBefore(fragment, el.firstChild); + else + el.appendChild(fragment); + } + + if (config.lastRow > oldConfig.lastRow) { + var fragment = this.$renderLinesFragment(config, oldConfig.lastRow + 1, config.lastRow); + el.appendChild(fragment); + } + }; + + this.$renderLinesFragment = function(config, firstRow, lastRow) { + var fragment = this.element.ownerDocument.createDocumentFragment(); + var row = firstRow; + var foldLine = this.session.getNextFoldLine(row); + var foldStart = foldLine ? foldLine.start.row : Infinity; + + while (true) { + if (row > foldStart) { + row = foldLine.end.row+1; + foldLine = this.session.getNextFoldLine(row, foldLine); + foldStart = foldLine ? foldLine.start.row : Infinity; + } + if (row > lastRow) + break; + + var container = dom.createElement("div"); + + var html = []; + this.$renderLine(html, row, false, row == foldStart ? foldLine : false); + container.innerHTML = html.join(""); + if (this.$useLineGroups()) { + container.className = 'ace_line_group'; + fragment.appendChild(container); + container.style.height = config.lineHeight * this.session.getRowLength(row) + "px"; + + } else { + while(container.firstChild) + fragment.appendChild(container.firstChild); + } + + row++; + } + return fragment; + }; + + this.update = function(config) { + this.config = config; + + var html = []; + var firstRow = config.firstRow, lastRow = config.lastRow; + + var row = firstRow; + var foldLine = this.session.getNextFoldLine(row); + var foldStart = foldLine ? foldLine.start.row : Infinity; + + while (true) { + if (row > foldStart) { + row = foldLine.end.row+1; + foldLine = this.session.getNextFoldLine(row, foldLine); + foldStart = foldLine ? foldLine.start.row :Infinity; + } + if (row > lastRow) + break; + + if (this.$useLineGroups()) + html.push("
    ") + + this.$renderLine(html, row, false, row == foldStart ? foldLine : false); + + if (this.$useLineGroups()) + html.push("
    "); // end the line group + + row++; + } + this.element = dom.setInnerHtml(this.element, html.join("")); + }; + + this.$textToken = { + "text": true, + "rparen": true, + "lparen": true + }; + + this.$renderToken = function(stringBuilder, screenColumn, token, value) { + var self = this; + var replaceReg = /\t|&|<|( +)|([\x00-\x1f\x80-\xa0\u1680\u180E\u2000-\u200f\u2028\u2029\u202F\u205F\u3000\uFEFF])|[\u1100-\u115F\u11A3-\u11A7\u11FA-\u11FF\u2329-\u232A\u2E80-\u2E99\u2E9B-\u2EF3\u2F00-\u2FD5\u2FF0-\u2FFB\u3000-\u303E\u3041-\u3096\u3099-\u30FF\u3105-\u312D\u3131-\u318E\u3190-\u31BA\u31C0-\u31E3\u31F0-\u321E\u3220-\u3247\u3250-\u32FE\u3300-\u4DBF\u4E00-\uA48C\uA490-\uA4C6\uA960-\uA97C\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFAFF\uFE10-\uFE19\uFE30-\uFE52\uFE54-\uFE66\uFE68-\uFE6B\uFF01-\uFF60\uFFE0-\uFFE6]/g; + var replaceFunc = function(c, a, b, tabIdx, idx4) { + if (a) { + return self.showInvisibles ? + "" + lang.stringRepeat(self.SPACE_CHAR, c.length) + "" : + lang.stringRepeat("\xa0", c.length); + } else if (c == "&") { + return "&"; + } else if (c == "<") { + return "<"; + } else if (c == "\t") { + var tabSize = self.session.getScreenTabSize(screenColumn + tabIdx); + screenColumn += tabSize - 1; + return self.$tabStrings[tabSize]; + } else if (c == "\u3000") { + var classToUse = self.showInvisibles ? "ace_cjk ace_invisible ace_invisible_space" : "ace_cjk"; + var space = self.showInvisibles ? self.SPACE_CHAR : ""; + screenColumn += 1; + return "" + space + ""; + } else if (b) { + return "" + self.SPACE_CHAR + ""; + } else { + screenColumn += 1; + return "" + c + ""; + } + }; + + var output = value.replace(replaceReg, replaceFunc); + + if (!this.$textToken[token.type]) { + var classes = "ace_" + token.type.replace(/\./g, " ace_"); + var style = ""; + if (token.type == "fold") + style = " style='width:" + (token.value.length * this.config.characterWidth) + "px;' "; + stringBuilder.push("", output, ""); + } + else { + stringBuilder.push(output); + } + return screenColumn + value.length; + }; + + this.renderIndentGuide = function(stringBuilder, value, max) { + var cols = value.search(this.$indentGuideRe); + if (cols <= 0 || cols >= max) + return value; + if (value[0] == " ") { + cols -= cols % this.tabSize; + stringBuilder.push(lang.stringRepeat(this.$tabStrings[" "], cols/this.tabSize)); + return value.substr(cols); + } else if (value[0] == "\t") { + stringBuilder.push(lang.stringRepeat(this.$tabStrings["\t"], cols)); + return value.substr(cols); + } + return value; + }; + + this.$renderWrappedLine = function(stringBuilder, tokens, splits, onlyContents) { + var chars = 0; + var split = 0; + var splitChars = splits[0]; + var screenColumn = 0; + + for (var i = 0; i < tokens.length; i++) { + var token = tokens[i]; + var value = token.value; + if (i == 0 && this.displayIndentGuides) { + chars = value.length; + value = this.renderIndentGuide(stringBuilder, value, splitChars); + if (!value) + continue; + chars -= value.length; + } + + if (chars + value.length < splitChars) { + screenColumn = this.$renderToken(stringBuilder, screenColumn, token, value); + chars += value.length; + } else { + while (chars + value.length >= splitChars) { + screenColumn = this.$renderToken( + stringBuilder, screenColumn, + token, value.substring(0, splitChars - chars) + ); + value = value.substring(splitChars - chars); + chars = splitChars; + + if (!onlyContents) { + stringBuilder.push("
    ", + "
    " + ); + } + + split ++; + screenColumn = 0; + splitChars = splits[split] || Number.MAX_VALUE; + } + if (value.length != 0) { + chars += value.length; + screenColumn = this.$renderToken( + stringBuilder, screenColumn, token, value + ); + } + } + } + }; + + this.$renderSimpleLine = function(stringBuilder, tokens) { + var screenColumn = 0; + var token = tokens[0]; + var value = token.value; + if (this.displayIndentGuides) + value = this.renderIndentGuide(stringBuilder, value); + if (value) + screenColumn = this.$renderToken(stringBuilder, screenColumn, token, value); + for (var i = 1; i < tokens.length; i++) { + token = tokens[i]; + value = token.value; + screenColumn = this.$renderToken(stringBuilder, screenColumn, token, value); + } + }; + this.$renderLine = function(stringBuilder, row, onlyContents, foldLine) { + if (!foldLine && foldLine != false) + foldLine = this.session.getFoldLine(row); + + if (foldLine) + var tokens = this.$getFoldLineTokens(row, foldLine); + else + var tokens = this.session.getTokens(row); + + + if (!onlyContents) { + stringBuilder.push( + "
    " + ); + } + + if (tokens.length) { + var splits = this.session.getRowSplitData(row); + if (splits && splits.length) + this.$renderWrappedLine(stringBuilder, tokens, splits, onlyContents); + else + this.$renderSimpleLine(stringBuilder, tokens); + } + + if (this.showInvisibles) { + if (foldLine) + row = foldLine.end.row + + stringBuilder.push( + "", + row == this.session.getLength() - 1 ? this.EOF_CHAR : this.EOL_CHAR, + "" + ); + } + if (!onlyContents) + stringBuilder.push("
    "); + }; + + this.$getFoldLineTokens = function(row, foldLine) { + var session = this.session; + var renderTokens = []; + + function addTokens(tokens, from, to) { + var idx = 0, col = 0; + while ((col + tokens[idx].value.length) < from) { + col += tokens[idx].value.length; + idx++; + + if (idx == tokens.length) + return; + } + if (col != from) { + var value = tokens[idx].value.substring(from - col); + if (value.length > (to - from)) + value = value.substring(0, to - from); + + renderTokens.push({ + type: tokens[idx].type, + value: value + }); + + col = from + value.length; + idx += 1; + } + + while (col < to && idx < tokens.length) { + var value = tokens[idx].value; + if (value.length + col > to) { + renderTokens.push({ + type: tokens[idx].type, + value: value.substring(0, to - col) + }); + } else + renderTokens.push(tokens[idx]); + col += value.length; + idx += 1; + } + } + + var tokens = session.getTokens(row); + foldLine.walk(function(placeholder, row, column, lastColumn, isNewRow) { + if (placeholder != null) { + renderTokens.push({ + type: "fold", + value: placeholder + }); + } else { + if (isNewRow) + tokens = session.getTokens(row); + + if (tokens.length) + addTokens(tokens, lastColumn, column); + } + }, foldLine.end.row, this.session.getLine(foldLine.end.row).length); + + return renderTokens; + }; + + this.$useLineGroups = function() { + return this.session.getUseWrapMode(); + }; + + this.destroy = function() { + clearInterval(this.$pollSizeChangesTimer); + if (this.$measureNode) + this.$measureNode.parentNode.removeChild(this.$measureNode); + delete this.$measureNode; + }; + +}).call(Text.prototype); + +exports.Text = Text; + +}); + +ace.define('ace/layer/cursor', ['require', 'exports', 'module' , 'ace/lib/dom'], function(require, exports, module) { + + +var dom = require("../lib/dom"); +var IE8; + +var Cursor = function(parentEl) { + this.element = dom.createElement("div"); + this.element.className = "ace_layer ace_cursor-layer"; + parentEl.appendChild(this.element); + + if (IE8 === undefined) + IE8 = "opacity" in this.element; + + this.isVisible = false; + this.isBlinking = true; + this.blinkInterval = 1000; + this.smoothBlinking = false; + + this.cursors = []; + this.cursor = this.addCursor(); + dom.addCssClass(this.element, "ace_hidden-cursors"); + this.$updateCursors = this.$updateVisibility.bind(this); +}; + +(function() { + + this.$updateVisibility = function(val) { + var cursors = this.cursors; + for (var i = cursors.length; i--; ) + cursors[i].style.visibility = val ? "" : "hidden"; + }; + this.$updateOpacity = function(val) { + var cursors = this.cursors; + for (var i = cursors.length; i--; ) + cursors[i].style.opacity = val ? "" : "0"; + }; + + + this.$padding = 0; + this.setPadding = function(padding) { + this.$padding = padding; + }; + + this.setSession = function(session) { + this.session = session; + }; + + this.setBlinking = function(blinking) { + if (blinking != this.isBlinking){ + this.isBlinking = blinking; + this.restartTimer(); + } + }; + + this.setBlinkInterval = function(blinkInterval) { + if (blinkInterval != this.blinkInterval){ + this.blinkInterval = blinkInterval; + this.restartTimer(); + } + }; + + this.setSmoothBlinking = function(smoothBlinking) { + if (smoothBlinking != this.smoothBlinking && !IE8) { + this.smoothBlinking = smoothBlinking; + dom.setCssClass(this.element, "ace_smooth-blinking", smoothBlinking); + this.$updateCursors(true); + this.$updateCursors = (smoothBlinking + ? this.$updateOpacity + : this.$updateVisibility).bind(this); + this.restartTimer(); + } + }; + + this.addCursor = function() { + var el = dom.createElement("div"); + el.className = "ace_cursor"; + this.element.appendChild(el); + this.cursors.push(el); + return el; + }; + + this.removeCursor = function() { + if (this.cursors.length > 1) { + var el = this.cursors.pop(); + el.parentNode.removeChild(el); + return el; + } + }; + + this.hideCursor = function() { + this.isVisible = false; + dom.addCssClass(this.element, "ace_hidden-cursors"); + this.restartTimer(); + }; + + this.showCursor = function() { + this.isVisible = true; + dom.removeCssClass(this.element, "ace_hidden-cursors"); + this.restartTimer(); + }; + + this.restartTimer = function() { + var update = this.$updateCursors; + clearInterval(this.intervalId); + clearTimeout(this.timeoutId); + if (this.smoothBlinking) { + dom.removeCssClass(this.element, "ace_smooth-blinking"); + } + + update(true); + + if (!this.isBlinking || !this.blinkInterval || !this.isVisible) + return; + + if (this.smoothBlinking) { + setTimeout(function(){ + dom.addCssClass(this.element, "ace_smooth-blinking"); + }.bind(this)); + } + + var blink = function(){ + this.timeoutId = setTimeout(function() { + update(false); + }, 0.6 * this.blinkInterval); + }.bind(this); + + this.intervalId = setInterval(function() { + update(true); + blink(); + }, this.blinkInterval); + + blink(); + }; + + this.getPixelPosition = function(position, onScreen) { + if (!this.config || !this.session) + return {left : 0, top : 0}; + + if (!position) + position = this.session.selection.getCursor(); + var pos = this.session.documentToScreenPosition(position); + var cursorLeft = this.$padding + pos.column * this.config.characterWidth; + var cursorTop = (pos.row - (onScreen ? this.config.firstRowScreen : 0)) * + this.config.lineHeight; + + return {left : cursorLeft, top : cursorTop}; + }; + + this.update = function(config) { + this.config = config; + + var selections = this.session.$selectionMarkers; + var i = 0, cursorIndex = 0; + + if (selections === undefined || selections.length === 0){ + selections = [{cursor: null}]; + } + + for (var i = 0, n = selections.length; i < n; i++) { + var pixelPos = this.getPixelPosition(selections[i].cursor, true); + if ((pixelPos.top > config.height + config.offset || + pixelPos.top < 0) && i > 1) { + continue; + } + + var style = (this.cursors[cursorIndex++] || this.addCursor()).style; + + style.left = pixelPos.left + "px"; + style.top = pixelPos.top + "px"; + style.width = config.characterWidth + "px"; + style.height = config.lineHeight + "px"; + } + while (this.cursors.length > cursorIndex) + this.removeCursor(); + + var overwrite = this.session.getOverwrite(); + this.$setOverwrite(overwrite); + this.$pixelPos = pixelPos; + this.restartTimer(); + }; + + this.$setOverwrite = function(overwrite) { + if (overwrite != this.overwrite) { + this.overwrite = overwrite; + if (overwrite) + dom.addCssClass(this.element, "ace_overwrite-cursors"); + else + dom.removeCssClass(this.element, "ace_overwrite-cursors"); + } + }; + + this.destroy = function() { + clearInterval(this.intervalId); + clearTimeout(this.timeoutId); + }; + +}).call(Cursor.prototype); + +exports.Cursor = Cursor; + +}); + +ace.define('ace/scrollbar', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/dom', 'ace/lib/event', 'ace/lib/event_emitter'], function(require, exports, module) { + + +var oop = require("./lib/oop"); +var dom = require("./lib/dom"); +var event = require("./lib/event"); +var EventEmitter = require("./lib/event_emitter").EventEmitter; +var ScrollBar = function(parent) { + this.element = dom.createElement("div"); + this.element.className = "ace_scrollbar ace_scrollbar" + this.classSuffix; + + this.inner = dom.createElement("div"); + this.inner.className = "ace_scrollbar-inner"; + this.element.appendChild(this.inner); + + parent.appendChild(this.element); + + this.setVisible(false); + this.skipEvent = false; + + event.addListener(this.element, "scroll", this.onScroll.bind(this)); + event.addListener(this.element, "mousedown", event.preventDefault); +}; + +(function() { + oop.implement(this, EventEmitter); + + this.setVisible = function(isVisible) { + this.element.style.display = isVisible ? "" : "none"; + this.isVisible = isVisible; + }; +}).call(ScrollBar.prototype); +var VScrollBar = function(parent, renderer) { + ScrollBar.call(this, parent); + this.scrollTop = 0; + renderer.$scrollbarWidth = + this.width = dom.scrollbarWidth(parent.ownerDocument); + this.inner.style.width = + this.element.style.width = (this.width || 15) + 5 + "px"; +}; + +oop.inherits(VScrollBar, ScrollBar); + +(function() { + + this.classSuffix = '-v'; + this.onScroll = function() { + if (!this.skipEvent) { + this.scrollTop = this.element.scrollTop; + this._emit("scroll", {data: this.scrollTop}); + } + this.skipEvent = false; + }; + this.getWidth = function() { + return this.isVisible ? this.width : 0; + }; + this.setHeight = function(height) { + this.element.style.height = height + "px"; + }; + this.setInnerHeight = function(height) { + this.inner.style.height = height + "px"; + }; + this.setScrollHeight = function(height) { + this.inner.style.height = height + "px"; + }; + this.setScrollTop = function(scrollTop) { + if (this.scrollTop != scrollTop) { + this.skipEvent = true; + this.scrollTop = this.element.scrollTop = scrollTop; + } + }; + +}).call(VScrollBar.prototype); +var HScrollBar = function(parent, renderer) { + ScrollBar.call(this, parent); + this.scrollLeft = 0; + this.height = renderer.$scrollbarWidth; + this.inner.style.height = + this.element.style.height = (this.height || 15) + 5 + "px"; +}; + +oop.inherits(HScrollBar, ScrollBar); + +(function() { + + this.classSuffix = '-h'; + this.onScroll = function() { + if (!this.skipEvent) { + this.scrollLeft = this.element.scrollLeft; + this._emit("scroll", {data: this.scrollLeft}); + } + this.skipEvent = false; + }; + this.getHeight = function() { + return this.isVisible ? this.height : 0; + }; + this.setWidth = function(width) { + this.element.style.width = width + "px"; + }; + this.setInnerWidth = function(width) { + this.inner.style.width = width + "px"; + }; + this.setScrollWidth = function(width) { + this.inner.style.width = width + "px"; + }; + this.setScrollLeft = function(scrollLeft) { + if (this.scrollLeft != scrollLeft) { + this.skipEvent = true; + this.scrollLeft = this.element.scrollLeft = scrollLeft; + } + }; + +}).call(HScrollBar.prototype); + + +exports.ScrollBar = VScrollBar; // backward compatibility +exports.ScrollBarV = VScrollBar; // backward compatibility +exports.ScrollBarH = HScrollBar; // backward compatibility + +exports.VScrollBar = VScrollBar; +exports.HScrollBar = HScrollBar; +}); + +ace.define('ace/renderloop', ['require', 'exports', 'module' , 'ace/lib/event'], function(require, exports, module) { + + +var event = require("./lib/event"); + + +var RenderLoop = function(onRender, win) { + this.onRender = onRender; + this.pending = false; + this.changes = 0; + this.window = win || window; +}; + +(function() { + + + this.schedule = function(change) { + this.changes = this.changes | change; + if (!this.pending && this.changes) { + this.pending = true; + var _self = this; + event.nextFrame(function() { + _self.pending = false; + var changes; + while (changes = _self.changes) { + _self.changes = 0; + _self.onRender(changes); + } + }, this.window); + } + }; + +}).call(RenderLoop.prototype); + +exports.RenderLoop = RenderLoop; +}); + +ace.define('ace/layer/font_metrics', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/dom', 'ace/lib/lang', 'ace/lib/event_emitter'], function(require, exports, module) { + +var oop = require("../lib/oop"); +var dom = require("../lib/dom"); +var lang = require("../lib/lang"); +var EventEmitter = require("../lib/event_emitter").EventEmitter; + +var CHAR_COUNT = 0; + +var FontMetrics = exports.FontMetrics = function(parentEl, interval) { + this.el = dom.createElement("div"); + this.$setMeasureNodeStyles(this.el.style, true); + + this.$main = dom.createElement("div"); + this.$setMeasureNodeStyles(this.$main.style); + + this.$measureNode = dom.createElement("div"); + this.$setMeasureNodeStyles(this.$measureNode.style); + + + this.el.appendChild(this.$main); + this.el.appendChild(this.$measureNode); + parentEl.appendChild(this.el); + + if (!CHAR_COUNT) + this.$testFractionalRect(); + this.$measureNode.innerHTML = lang.stringRepeat("X", CHAR_COUNT); + + this.$characterSize = {width: 0, height: 0}; + this.checkForSizeChanges(); +}; + +(function() { + + oop.implement(this, EventEmitter); + + this.$characterSize = {width: 0, height: 0}; + + this.$testFractionalRect = function() { + var el = dom.createElement("div"); + this.$setMeasureNodeStyles(el.style); + el.style.width = "0.2px"; + document.documentElement.appendChild(el); + var w = el.getBoundingClientRect().width; + if (w > 0 && w < 1) + CHAR_COUNT = 1; + else + CHAR_COUNT = 100; + el.parentNode.removeChild(el); + }; + + this.$setMeasureNodeStyles = function(style, isRoot) { + style.width = style.height = "auto"; + style.left = style.top = "-100px"; + style.visibility = "hidden"; + style.position = "fixed"; + style.whiteSpace = "pre"; + style.font = "inherit"; + style.overflow = isRoot ? "hidden" : "visible"; + }; + + this.checkForSizeChanges = function() { + var size = this.$measureSizes(); + if (size && (this.$characterSize.width !== size.width || this.$characterSize.height !== size.height)) { + this.$measureNode.style.fontWeight = "bold"; + var boldSize = this.$measureSizes(); + this.$measureNode.style.fontWeight = ""; + this.$characterSize = size; + this.charSizes = Object.create(null); + this.allowBoldFonts = boldSize && boldSize.width === size.width && boldSize.height === size.height; + this._emit("changeCharacterSize", {data: size}); + } + }; + + this.$pollSizeChanges = function() { + if (this.$pollSizeChangesTimer) + return this.$pollSizeChangesTimer; + var self = this; + return this.$pollSizeChangesTimer = setInterval(function() { + self.checkForSizeChanges(); + }, 500); + }; + + this.setPolling = function(val) { + if (val) { + this.$pollSizeChanges(); + } else { + if (this.$pollSizeChangesTimer) + this.$pollSizeChangesTimer; + } + }; + + this.$measureSizes = function() { + if (CHAR_COUNT === 1) { + var rect = this.$measureNode.getBoundingClientRect(); + var size = { + height: rect.height, + width: rect.width + }; + } else { + var size = { + height: this.$measureNode.clientHeight, + width: this.$measureNode.clientWidth / CHAR_COUNT + }; + } + if (size.width === 0 || size.height === 0) + return null; + return size; + }; + + this.$measureCharWidth = function(ch) { + this.$main.innerHTML = lang.stringRepeat(ch, CHAR_COUNT); + var rect = this.$main.getBoundingClientRect(); + return rect.width / CHAR_COUNT; + }; + + this.getCharacterWidth = function(ch) { + var w = this.charSizes[ch]; + if (w === undefined) { + this.charSizes[ch] = this.$measureCharWidth(ch) / this.$characterSize.width; + } + return w; + }; + + this.destroy = function() { + clearInterval(this.$pollSizeChangesTimer); + if (this.el && this.el.parentNode) + this.el.parentNode.removeChild(this.el); + }; + +}).call(FontMetrics.prototype); + +}); + +ace.define('ace/multi_select', ['require', 'exports', 'module' , 'ace/range_list', 'ace/range', 'ace/selection', 'ace/mouse/multi_select_handler', 'ace/lib/event', 'ace/lib/lang', 'ace/commands/multi_select_commands', 'ace/search', 'ace/edit_session', 'ace/editor', 'ace/config'], function(require, exports, module) { + +var RangeList = require("./range_list").RangeList; +var Range = require("./range").Range; +var Selection = require("./selection").Selection; +var onMouseDown = require("./mouse/multi_select_handler").onMouseDown; +var event = require("./lib/event"); +var lang = require("./lib/lang"); +var commands = require("./commands/multi_select_commands"); +exports.commands = commands.defaultCommands.concat(commands.multiSelectCommands); +var Search = require("./search").Search; +var search = new Search(); + +function find(session, needle, dir) { + search.$options.wrap = true; + search.$options.needle = needle; + search.$options.backwards = dir == -1; + return search.find(session); +} +var EditSession = require("./edit_session").EditSession; +(function() { + this.getSelectionMarkers = function() { + return this.$selectionMarkers; + }; +}).call(EditSession.prototype); +(function() { + this.ranges = null; + this.rangeList = null; + this.addRange = function(range, $blockChangeEvents) { + if (!range) + return; + + if (!this.inMultiSelectMode && this.rangeCount == 0) { + var oldRange = this.toOrientedRange(); + this.rangeList.add(oldRange); + this.rangeList.add(range); + if (this.rangeList.ranges.length != 2) { + this.rangeList.removeAll(); + return $blockChangeEvents || this.fromOrientedRange(range); + } + this.rangeList.removeAll(); + this.rangeList.add(oldRange); + this.$onAddRange(oldRange); + } + + if (!range.cursor) + range.cursor = range.end; + + var removed = this.rangeList.add(range); + + this.$onAddRange(range); + + if (removed.length) + this.$onRemoveRange(removed); + + if (this.rangeCount > 1 && !this.inMultiSelectMode) { + this._signal("multiSelect"); + this.inMultiSelectMode = true; + this.session.$undoSelect = false; + this.rangeList.attach(this.session); + } + + return $blockChangeEvents || this.fromOrientedRange(range); + }; + + this.toSingleRange = function(range) { + range = range || this.ranges[0]; + var removed = this.rangeList.removeAll(); + if (removed.length) + this.$onRemoveRange(removed); + + range && this.fromOrientedRange(range); + }; + this.substractPoint = function(pos) { + var removed = this.rangeList.substractPoint(pos); + if (removed) { + this.$onRemoveRange(removed); + return removed[0]; + } + }; + this.mergeOverlappingRanges = function() { + var removed = this.rangeList.merge(); + if (removed.length) + this.$onRemoveRange(removed); + else if(this.ranges[0]) + this.fromOrientedRange(this.ranges[0]); + }; + + this.$onAddRange = function(range) { + this.rangeCount = this.rangeList.ranges.length; + this.ranges.unshift(range); + this._signal("addRange", {range: range}); + }; + + this.$onRemoveRange = function(removed) { + this.rangeCount = this.rangeList.ranges.length; + if (this.rangeCount == 1 && this.inMultiSelectMode) { + var lastRange = this.rangeList.ranges.pop(); + removed.push(lastRange); + this.rangeCount = 0; + } + + for (var i = removed.length; i--; ) { + var index = this.ranges.indexOf(removed[i]); + this.ranges.splice(index, 1); + } + + this._signal("removeRange", {ranges: removed}); + + if (this.rangeCount == 0 && this.inMultiSelectMode) { + this.inMultiSelectMode = false; + this._signal("singleSelect"); + this.session.$undoSelect = true; + this.rangeList.detach(this.session); + } + + lastRange = lastRange || this.ranges[0]; + if (lastRange && !lastRange.isEqual(this.getRange())) + this.fromOrientedRange(lastRange); + }; + this.$initRangeList = function() { + if (this.rangeList) + return; + + this.rangeList = new RangeList(); + this.ranges = []; + this.rangeCount = 0; + }; + this.getAllRanges = function() { + return this.rangeCount ? this.rangeList.ranges.concat() : [this.getRange()]; + }; + + this.splitIntoLines = function () { + if (this.rangeCount > 1) { + var ranges = this.rangeList.ranges; + var lastRange = ranges[ranges.length - 1]; + var range = Range.fromPoints(ranges[0].start, lastRange.end); + + this.toSingleRange(); + this.setSelectionRange(range, lastRange.cursor == lastRange.start); + } else { + var range = this.getRange(); + var isBackwards = this.isBackwards(); + var startRow = range.start.row; + var endRow = range.end.row; + if (startRow == endRow) { + if (isBackwards) + var start = range.end, end = range.start; + else + var start = range.start, end = range.end; + + this.addRange(Range.fromPoints(end, end)); + this.addRange(Range.fromPoints(start, start)); + return; + } + + var rectSel = []; + var r = this.getLineRange(startRow, true); + r.start.column = range.start.column; + rectSel.push(r); + + for (var i = startRow + 1; i < endRow; i++) + rectSel.push(this.getLineRange(i, true)); + + r = this.getLineRange(endRow, true); + r.end.column = range.end.column; + rectSel.push(r); + + rectSel.forEach(this.addRange, this); + } + }; + this.toggleBlockSelection = function () { + if (this.rangeCount > 1) { + var ranges = this.rangeList.ranges; + var lastRange = ranges[ranges.length - 1]; + var range = Range.fromPoints(ranges[0].start, lastRange.end); + + this.toSingleRange(); + this.setSelectionRange(range, lastRange.cursor == lastRange.start); + } else { + var cursor = this.session.documentToScreenPosition(this.selectionLead); + var anchor = this.session.documentToScreenPosition(this.selectionAnchor); + + var rectSel = this.rectangularRangeBlock(cursor, anchor); + rectSel.forEach(this.addRange, this); + } + }; + this.rectangularRangeBlock = function(screenCursor, screenAnchor, includeEmptyLines) { + var rectSel = []; + + var xBackwards = screenCursor.column < screenAnchor.column; + if (xBackwards) { + var startColumn = screenCursor.column; + var endColumn = screenAnchor.column; + } else { + var startColumn = screenAnchor.column; + var endColumn = screenCursor.column; + } + + var yBackwards = screenCursor.row < screenAnchor.row; + if (yBackwards) { + var startRow = screenCursor.row; + var endRow = screenAnchor.row; + } else { + var startRow = screenAnchor.row; + var endRow = screenCursor.row; + } + + if (startColumn < 0) + startColumn = 0; + if (startRow < 0) + startRow = 0; + + if (startRow == endRow) + includeEmptyLines = true; + + for (var row = startRow; row <= endRow; row++) { + var range = Range.fromPoints( + this.session.screenToDocumentPosition(row, startColumn), + this.session.screenToDocumentPosition(row, endColumn) + ); + if (range.isEmpty()) { + if (docEnd && isSamePoint(range.end, docEnd)) + break; + var docEnd = range.end; + } + range.cursor = xBackwards ? range.start : range.end; + rectSel.push(range); + } + + if (yBackwards) + rectSel.reverse(); + + if (!includeEmptyLines) { + var end = rectSel.length - 1; + while (rectSel[end].isEmpty() && end > 0) + end--; + if (end > 0) { + var start = 0; + while (rectSel[start].isEmpty()) + start++; + } + for (var i = end; i >= start; i--) { + if (rectSel[i].isEmpty()) + rectSel.splice(i, 1); + } + } + + return rectSel; + }; +}).call(Selection.prototype); +var Editor = require("./editor").Editor; +(function() { + this.updateSelectionMarkers = function() { + this.renderer.updateCursor(); + this.renderer.updateBackMarkers(); + }; + this.addSelectionMarker = function(orientedRange) { + if (!orientedRange.cursor) + orientedRange.cursor = orientedRange.end; + + var style = this.getSelectionStyle(); + orientedRange.marker = this.session.addMarker(orientedRange, "ace_selection", style); + + this.session.$selectionMarkers.push(orientedRange); + this.session.selectionMarkerCount = this.session.$selectionMarkers.length; + return orientedRange; + }; + this.removeSelectionMarker = function(range) { + if (!range.marker) + return; + this.session.removeMarker(range.marker); + var index = this.session.$selectionMarkers.indexOf(range); + if (index != -1) + this.session.$selectionMarkers.splice(index, 1); + this.session.selectionMarkerCount = this.session.$selectionMarkers.length; + }; + + this.removeSelectionMarkers = function(ranges) { + var markerList = this.session.$selectionMarkers; + for (var i = ranges.length; i--; ) { + var range = ranges[i]; + if (!range.marker) + continue; + this.session.removeMarker(range.marker); + var index = markerList.indexOf(range); + if (index != -1) + markerList.splice(index, 1); + } + this.session.selectionMarkerCount = markerList.length; + }; + + this.$onAddRange = function(e) { + this.addSelectionMarker(e.range); + this.renderer.updateCursor(); + this.renderer.updateBackMarkers(); + }; + + this.$onRemoveRange = function(e) { + this.removeSelectionMarkers(e.ranges); + this.renderer.updateCursor(); + this.renderer.updateBackMarkers(); + }; + + this.$onMultiSelect = function(e) { + if (this.inMultiSelectMode) + return; + this.inMultiSelectMode = true; + + this.setStyle("ace_multiselect"); + this.keyBinding.addKeyboardHandler(commands.keyboardHandler); + this.commands.setDefaultHandler("exec", this.$onMultiSelectExec); + + this.renderer.updateCursor(); + this.renderer.updateBackMarkers(); + }; + + this.$onSingleSelect = function(e) { + if (this.session.multiSelect.inVirtualMode) + return; + this.inMultiSelectMode = false; + + this.unsetStyle("ace_multiselect"); + this.keyBinding.removeKeyboardHandler(commands.keyboardHandler); + + this.commands.removeDefaultHandler("exec", this.$onMultiSelectExec); + this.renderer.updateCursor(); + this.renderer.updateBackMarkers(); + this._emit("changeSelection"); + }; + + this.$onMultiSelectExec = function(e) { + var command = e.command; + var editor = e.editor; + if (!editor.multiSelect) + return; + if (!command.multiSelectAction) { + var result = command.exec(editor, e.args || {}); + editor.multiSelect.addRange(editor.multiSelect.toOrientedRange()); + editor.multiSelect.mergeOverlappingRanges(); + } else if (command.multiSelectAction == "forEach") { + result = editor.forEachSelection(command, e.args); + } else if (command.multiSelectAction == "forEachLine") { + result = editor.forEachSelection(command, e.args, true); + } else if (command.multiSelectAction == "single") { + editor.exitMultiSelectMode(); + result = command.exec(editor, e.args || {}); + } else { + result = command.multiSelectAction(editor, e.args || {}); + } + return result; + }; + this.forEachSelection = function(cmd, args, $byLines) { + if (this.inVirtualSelectionMode) + return; + + var session = this.session; + var selection = this.selection; + var rangeList = selection.rangeList; + var result; + + var reg = selection._eventRegistry; + selection._eventRegistry = {}; + + var tmpSel = new Selection(session); + this.inVirtualSelectionMode = true; + for (var i = rangeList.ranges.length; i--;) { + if ($byLines) { + while (i > 0 && rangeList.ranges[i].start.row == rangeList.ranges[i - 1].end.row) + i--; + } + tmpSel.fromOrientedRange(rangeList.ranges[i]); + tmpSel.id = rangeList.ranges[i].marker; + this.selection = session.selection = tmpSel; + var cmdResult = cmd.exec(this, args || {}); + if (result !== undefined) + result = cmdResult; + tmpSel.toOrientedRange(rangeList.ranges[i]); + } + tmpSel.detach(); + + this.selection = session.selection = selection; + this.inVirtualSelectionMode = false; + selection._eventRegistry = reg; + selection.mergeOverlappingRanges(); + + var anim = this.renderer.$scrollAnimation; + this.onCursorChange(); + this.onSelectionChange(); + if (anim && anim.from == anim.to) + this.renderer.animateScrolling(anim.from); + + return result; + }; + this.exitMultiSelectMode = function() { + if (!this.inMultiSelectMode || this.inVirtualSelectionMode) + return; + this.multiSelect.toSingleRange(); + }; + + this.getSelectedText = function() { + var text = ""; + if (this.inMultiSelectMode && !this.inVirtualSelectionMode) { + var ranges = this.multiSelect.rangeList.ranges; + var buf = []; + for (var i = 0; i < ranges.length; i++) { + buf.push(this.session.getTextRange(ranges[i])); + } + var nl = this.session.getDocument().getNewLineCharacter(); + text = buf.join(nl); + if (text.length == (buf.length - 1) * nl.length) + text = ""; + } else if (!this.selection.isEmpty()) { + text = this.session.getTextRange(this.getSelectionRange()); + } + return text; + }; + this.onPaste = function(text) { + if (this.$readOnly) + return; + + + var e = {text: text}; + this._signal("paste", e); + text = e.text; + if (!this.inMultiSelectMode || this.inVirtualSelectionMode) + return this.insert(text); + + var lines = text.split(/\r\n|\r|\n/); + var ranges = this.selection.rangeList.ranges; + + if (lines.length > ranges.length || lines.length < 2 || !lines[1]) + return this.commands.exec("insertstring", this, text); + + for (var i = ranges.length; i--;) { + var range = ranges[i]; + if (!range.isEmpty()) + this.session.remove(range); + + this.session.insert(range.start, lines[i]); + } + }; + this.findAll = function(needle, options, additive) { + options = options || {}; + options.needle = needle || options.needle; + this.$search.set(options); + + var ranges = this.$search.findAll(this.session); + if (!ranges.length) + return 0; + + this.$blockScrolling += 1; + var selection = this.multiSelect; + + if (!additive) + selection.toSingleRange(ranges[0]); + + for (var i = ranges.length; i--; ) + selection.addRange(ranges[i], true); + + this.$blockScrolling -= 1; + + return ranges.length; + }; + this.selectMoreLines = function(dir, skip) { + var range = this.selection.toOrientedRange(); + var isBackwards = range.cursor == range.end; + + var screenLead = this.session.documentToScreenPosition(range.cursor); + if (this.selection.$desiredColumn) + screenLead.column = this.selection.$desiredColumn; + + var lead = this.session.screenToDocumentPosition(screenLead.row + dir, screenLead.column); + + if (!range.isEmpty()) { + var screenAnchor = this.session.documentToScreenPosition(isBackwards ? range.end : range.start); + var anchor = this.session.screenToDocumentPosition(screenAnchor.row + dir, screenAnchor.column); + } else { + var anchor = lead; + } + + if (isBackwards) { + var newRange = Range.fromPoints(lead, anchor); + newRange.cursor = newRange.start; + } else { + var newRange = Range.fromPoints(anchor, lead); + newRange.cursor = newRange.end; + } + + newRange.desiredColumn = screenLead.column; + if (!this.selection.inMultiSelectMode) { + this.selection.addRange(range); + } else { + if (skip) + var toRemove = range.cursor; + } + + this.selection.addRange(newRange); + if (toRemove) + this.selection.substractPoint(toRemove); + }; + this.transposeSelections = function(dir) { + var session = this.session; + var sel = session.multiSelect; + var all = sel.ranges; + + for (var i = all.length; i--; ) { + var range = all[i]; + if (range.isEmpty()) { + var tmp = session.getWordRange(range.start.row, range.start.column); + range.start.row = tmp.start.row; + range.start.column = tmp.start.column; + range.end.row = tmp.end.row; + range.end.column = tmp.end.column; + } + } + sel.mergeOverlappingRanges(); + + var words = []; + for (var i = all.length; i--; ) { + var range = all[i]; + words.unshift(session.getTextRange(range)); + } + + if (dir < 0) + words.unshift(words.pop()); + else + words.push(words.shift()); + + for (var i = all.length; i--; ) { + var range = all[i]; + var tmp = range.clone(); + session.replace(range, words[i]); + range.start.row = tmp.start.row; + range.start.column = tmp.start.column; + } + }; + this.selectMore = function(dir, skip) { + var session = this.session; + var sel = session.multiSelect; + + var range = sel.toOrientedRange(); + if (range.isEmpty()) { + range = session.getWordRange(range.start.row, range.start.column); + range.cursor = dir == -1 ? range.start : range.end; + this.multiSelect.addRange(range); + } + var needle = session.getTextRange(range); + + var newRange = find(session, needle, dir); + if (newRange) { + newRange.cursor = dir == -1 ? newRange.start : newRange.end; + this.$blockScrolling += 1; + this.session.unfold(newRange); + this.multiSelect.addRange(newRange); + this.$blockScrolling -= 1; + this.renderer.scrollCursorIntoView(null, 0.5); + } + if (skip) + this.multiSelect.substractPoint(range.cursor); + }; + this.alignCursors = function() { + var session = this.session; + var sel = session.multiSelect; + var ranges = sel.ranges; + + if (!ranges.length) { + var range = this.selection.getRange(); + var fr = range.start.row, lr = range.end.row; + var guessRange = fr == lr; + if (guessRange) { + var max = this.session.getLength(); + var line; + do { + line = this.session.getLine(lr); + } while (/[=:]/.test(line) && ++lr < max); + do { + line = this.session.getLine(fr); + } while (/[=:]/.test(line) && --fr > 0); + + if (fr < 0) fr = 0; + if (lr >= max) lr = max - 1; + } + var lines = this.session.doc.removeLines(fr, lr); + lines = this.$reAlignText(lines, guessRange); + this.session.doc.insert({row: fr, column: 0}, lines.join("\n") + "\n"); + if (!guessRange) { + range.start.column = 0; + range.end.column = lines[lines.length - 1].length; + } + this.selection.setRange(range); + } else { + var row = -1; + var sameRowRanges = ranges.filter(function(r) { + if (r.cursor.row == row) + return true; + row = r.cursor.row; + }); + sel.$onRemoveRange(sameRowRanges); + + var maxCol = 0; + var minSpace = Infinity; + var spaceOffsets = ranges.map(function(r) { + var p = r.cursor; + var line = session.getLine(p.row); + var spaceOffset = line.substr(p.column).search(/\S/g); + if (spaceOffset == -1) + spaceOffset = 0; + + if (p.column > maxCol) + maxCol = p.column; + if (spaceOffset < minSpace) + minSpace = spaceOffset; + return spaceOffset; + }); + ranges.forEach(function(r, i) { + var p = r.cursor; + var l = maxCol - p.column; + var d = spaceOffsets[i] - minSpace; + if (l > d) + session.insert(p, lang.stringRepeat(" ", l - d)); + else + session.remove(new Range(p.row, p.column, p.row, p.column - l + d)); + + r.start.column = r.end.column = maxCol; + r.start.row = r.end.row = p.row; + r.cursor = r.end; + }); + sel.fromOrientedRange(ranges[0]); + this.renderer.updateCursor(); + this.renderer.updateBackMarkers(); + } + }; + + this.$reAlignText = function(lines, forceLeft) { + var isLeftAligned = true, isRightAligned = true; + var startW, textW, endW; + + return lines.map(function(line) { + var m = line.match(/(\s*)(.*?)(\s*)([=:].*)/); + if (!m) + return [line]; + + if (startW == null) { + startW = m[1].length; + textW = m[2].length; + endW = m[3].length; + return m; + } + + if (startW + textW + endW != m[1].length + m[2].length + m[3].length) + isRightAligned = false; + if (startW != m[1].length) + isLeftAligned = false; + + if (startW > m[1].length) + startW = m[1].length; + if (textW < m[2].length) + textW = m[2].length; + if (endW > m[3].length) + endW = m[3].length; + + return m; + }).map(forceLeft ? alignLeft : + isLeftAligned ? isRightAligned ? alignRight : alignLeft : unAlign); + + function spaces(n) { + return lang.stringRepeat(" ", n); + } + + function alignLeft(m) { + return !m[2] ? m[0] : spaces(startW) + m[2] + + spaces(textW - m[2].length + endW) + + m[4].replace(/^([=:])\s+/, "$1 ") + } + function alignRight(m) { + return !m[2] ? m[0] : spaces(startW + textW - m[2].length) + m[2] + + spaces(endW, " ") + + m[4].replace(/^([=:])\s+/, "$1 ") + } + function unAlign(m) { + return !m[2] ? m[0] : spaces(startW) + m[2] + + spaces(endW) + + m[4].replace(/^([=:])\s+/, "$1 ") + } + } +}).call(Editor.prototype); + + +function isSamePoint(p1, p2) { + return p1.row == p2.row && p1.column == p2.column; +} +exports.onSessionChange = function(e) { + var session = e.session; + if (!session.multiSelect) { + session.$selectionMarkers = []; + session.selection.$initRangeList(); + session.multiSelect = session.selection; + } + this.multiSelect = session.multiSelect; + + var oldSession = e.oldSession; + if (oldSession) { + oldSession.multiSelect.removeEventListener("addRange", this.$onAddRange); + oldSession.multiSelect.removeEventListener("removeRange", this.$onRemoveRange); + oldSession.multiSelect.removeEventListener("multiSelect", this.$onMultiSelect); + oldSession.multiSelect.removeEventListener("singleSelect", this.$onSingleSelect); + } + + session.multiSelect.on("addRange", this.$onAddRange); + session.multiSelect.on("removeRange", this.$onRemoveRange); + session.multiSelect.on("multiSelect", this.$onMultiSelect); + session.multiSelect.on("singleSelect", this.$onSingleSelect); + + if (this.inMultiSelectMode != session.selection.inMultiSelectMode) { + if (session.selection.inMultiSelectMode) + this.$onMultiSelect(); + else + this.$onSingleSelect(); + } +}; +function MultiSelect(editor) { + if (editor.$multiselectOnSessionChange) + return; + editor.$onAddRange = editor.$onAddRange.bind(editor); + editor.$onRemoveRange = editor.$onRemoveRange.bind(editor); + editor.$onMultiSelect = editor.$onMultiSelect.bind(editor); + editor.$onSingleSelect = editor.$onSingleSelect.bind(editor); + editor.$multiselectOnSessionChange = exports.onSessionChange.bind(editor); + + editor.$multiselectOnSessionChange(editor); + editor.on("changeSession", editor.$multiselectOnSessionChange); + + editor.on("mousedown", onMouseDown); + editor.commands.addCommands(commands.defaultCommands); + + addAltCursorListeners(editor); +} + +function addAltCursorListeners(editor){ + var el = editor.textInput.getElement(); + var altCursor = false; + event.addListener(el, "keydown", function(e) { + if (e.keyCode == 18 && !(e.ctrlKey || e.shiftKey || e.metaKey)) { + if (!altCursor) { + editor.renderer.setMouseCursor("crosshair"); + altCursor = true; + } + } else if (altCursor) { + reset(); + } + }); + + event.addListener(el, "keyup", reset); + event.addListener(el, "blur", reset); + function reset(e) { + if (altCursor) { + editor.renderer.setMouseCursor(""); + altCursor = false; + } + } +} + +exports.MultiSelect = MultiSelect; + + +require("./config").defineOptions(Editor.prototype, "editor", { + enableMultiselect: { + set: function(val) { + MultiSelect(this); + if (val) { + this.on("changeSession", this.$multiselectOnSessionChange); + this.on("mousedown", onMouseDown); + } else { + this.off("changeSession", this.$multiselectOnSessionChange); + this.off("mousedown", onMouseDown); + } + }, + value: true + } +}) + + + +}); + +ace.define('ace/mouse/multi_select_handler', ['require', 'exports', 'module' , 'ace/lib/event'], function(require, exports, module) { + +var event = require("../lib/event"); +function isSamePoint(p1, p2) { + return p1.row == p2.row && p1.column == p2.column; +} + +function onMouseDown(e) { + var ev = e.domEvent; + var alt = ev.altKey; + var shift = ev.shiftKey; + var ctrl = e.getAccelKey(); + var button = e.getButton(); + + if (e.editor.inMultiSelectMode && button == 2) { + e.editor.textInput.onContextMenu(e.domEvent); + return; + } + + if (!ctrl && !alt) { + if (button === 0 && e.editor.inMultiSelectMode) + e.editor.exitMultiSelectMode(); + return; + } + + var editor = e.editor; + var selection = editor.selection; + var isMultiSelect = editor.inMultiSelectMode; + var pos = e.getDocumentPosition(); + var cursor = selection.getCursor(); + var inSelection = e.inSelection() || (selection.isEmpty() && isSamePoint(pos, cursor)); + + + var mouseX = e.x, mouseY = e.y; + var onMouseSelection = function(e) { + mouseX = e.clientX; + mouseY = e.clientY; + }; + + var blockSelect = function() { + var newCursor = editor.renderer.pixelToScreenCoordinates(mouseX, mouseY); + var cursor = session.screenToDocumentPosition(newCursor.row, newCursor.column); + + if (isSamePoint(screenCursor, newCursor) + && isSamePoint(cursor, selection.selectionLead)) + return; + screenCursor = newCursor; + + editor.selection.moveToPosition(cursor); + editor.renderer.scrollCursorIntoView(); + + editor.removeSelectionMarkers(rectSel); + rectSel = selection.rectangularRangeBlock(screenCursor, screenAnchor); + rectSel.forEach(editor.addSelectionMarker, editor); + editor.updateSelectionMarkers(); + }; + + var session = editor.session; + var screenAnchor = editor.renderer.pixelToScreenCoordinates(mouseX, mouseY); + var screenCursor = screenAnchor; + + + + if (ctrl && !alt && !shift && button === 0) { + if (!isMultiSelect && inSelection) + return; // dragging + + if (!isMultiSelect) { + var range = selection.toOrientedRange(); + editor.addSelectionMarker(range); + } + + var oldRange = selection.rangeList.rangeAtPoint(pos); + + editor.$blockScrolling++; + editor.once("mouseup", function() { + var tmpSel = selection.toOrientedRange(); + + if (oldRange && tmpSel.isEmpty() && isSamePoint(oldRange.cursor, tmpSel.cursor)) + selection.substractPoint(tmpSel.cursor); + else { + if (range) { + editor.removeSelectionMarker(range); + selection.addRange(range); + } + selection.addRange(tmpSel); + } + editor.$blockScrolling--; + }); + + } else if (alt && button === 0) { + e.stop(); + + if (isMultiSelect && !ctrl) + selection.toSingleRange(); + else if (!isMultiSelect && ctrl) + selection.addRange(); + + var rectSel = []; + if (shift) { + screenAnchor = session.documentToScreenPosition(selection.lead); + blockSelect(); + } else { + selection.moveToPosition(pos); + } + + + var onMouseSelectionEnd = function(e) { + clearInterval(timerId); + editor.removeSelectionMarkers(rectSel); + for (var i = 0; i < rectSel.length; i++) + selection.addRange(rectSel[i]); + }; + + var onSelectionInterval = blockSelect; + + event.capture(editor.container, onMouseSelection, onMouseSelectionEnd); + var timerId = setInterval(function() {onSelectionInterval();}, 20); + + return e.preventDefault(); + } +} + + +exports.onMouseDown = onMouseDown; + +}); + +ace.define('ace/commands/multi_select_commands', ['require', 'exports', 'module' , 'ace/keyboard/hash_handler'], function(require, exports, module) { +exports.defaultCommands = [{ + name: "addCursorAbove", + exec: function(editor) { editor.selectMoreLines(-1); }, + bindKey: {win: "Ctrl-Alt-Up", mac: "Ctrl-Alt-Up"}, + readonly: true +}, { + name: "addCursorBelow", + exec: function(editor) { editor.selectMoreLines(1); }, + bindKey: {win: "Ctrl-Alt-Down", mac: "Ctrl-Alt-Down"}, + readonly: true +}, { + name: "addCursorAboveSkipCurrent", + exec: function(editor) { editor.selectMoreLines(-1, true); }, + bindKey: {win: "Ctrl-Alt-Shift-Up", mac: "Ctrl-Alt-Shift-Up"}, + readonly: true +}, { + name: "addCursorBelowSkipCurrent", + exec: function(editor) { editor.selectMoreLines(1, true); }, + bindKey: {win: "Ctrl-Alt-Shift-Down", mac: "Ctrl-Alt-Shift-Down"}, + readonly: true +}, { + name: "selectMoreBefore", + exec: function(editor) { editor.selectMore(-1); }, + bindKey: {win: "Ctrl-Alt-Left", mac: "Ctrl-Alt-Left"}, + readonly: true +}, { + name: "selectMoreAfter", + exec: function(editor) { editor.selectMore(1); }, + bindKey: {win: "Ctrl-Alt-Right", mac: "Ctrl-Alt-Right"}, + readonly: true +}, { + name: "selectNextBefore", + exec: function(editor) { editor.selectMore(-1, true); }, + bindKey: {win: "Ctrl-Alt-Shift-Left", mac: "Ctrl-Alt-Shift-Left"}, + readonly: true +}, { + name: "selectNextAfter", + exec: function(editor) { editor.selectMore(1, true); }, + bindKey: {win: "Ctrl-Alt-Shift-Right", mac: "Ctrl-Alt-Shift-Right"}, + readonly: true +}, { + name: "splitIntoLines", + exec: function(editor) { editor.multiSelect.splitIntoLines(); }, + bindKey: {win: "Ctrl-Alt-L", mac: "Ctrl-Alt-L"}, + readonly: true +}, { + name: "alignCursors", + exec: function(editor) { editor.alignCursors(); }, + bindKey: {win: "Ctrl-Alt-A", mac: "Ctrl-Alt-A"} +}]; +exports.multiSelectCommands = [{ + name: "singleSelection", + bindKey: "esc", + exec: function(editor) { editor.exitMultiSelectMode(); }, + readonly: true, + isAvailable: function(editor) {return editor && editor.inMultiSelectMode} +}]; + +var HashHandler = require("../keyboard/hash_handler").HashHandler; +exports.keyboardHandler = new HashHandler(exports.multiSelectCommands); + +}); + +ace.define('ace/worker/worker_client', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/net', 'ace/lib/event_emitter', 'ace/config'], function(require, exports, module) { + + +var oop = require("../lib/oop"); +var net = require("../lib/net"); +var EventEmitter = require("../lib/event_emitter").EventEmitter; +var config = require("../config"); + +var WorkerClient = function(topLevelNamespaces, mod, classname, workerUrl) { + this.$sendDeltaQueue = this.$sendDeltaQueue.bind(this); + this.changeListener = this.changeListener.bind(this); + this.onMessage = this.onMessage.bind(this); + if (require.nameToUrl && !require.toUrl) + require.toUrl = require.nameToUrl; + + if (config.get("packaged") || !require.toUrl) { + workerUrl = workerUrl || config.moduleUrl(mod, "worker"); + } else { + var normalizePath = this.$normalizePath; + workerUrl = workerUrl || normalizePath(require.toUrl("ace/worker/worker.js", null, "_")); + + var tlns = {}; + topLevelNamespaces.forEach(function(ns) { + tlns[ns] = normalizePath(require.toUrl(ns, null, "_").replace(/(\.js)?(\?.*)?$/, "")); + }); + } + + try { + this.$worker = new Worker(workerUrl); + } catch(e) { + if (e instanceof window.DOMException) { + var blob = this.$workerBlob(workerUrl); + var URL = window.URL || window.webkitURL; + var blobURL = URL.createObjectURL(blob); + + this.$worker = new Worker(blobURL); + URL.revokeObjectURL(blobURL); + } else { + throw e; + } + } + this.$worker.postMessage({ + init : true, + tlns : tlns, + module : mod, + classname : classname + }); + + this.callbackId = 1; + this.callbacks = {}; + + this.$worker.onmessage = this.onMessage; +}; + +(function(){ + + oop.implement(this, EventEmitter); + + this.onMessage = function(e) { + var msg = e.data; + switch(msg.type) { + case "log": + window.console && console.log && console.log.apply(console, msg.data); + break; + + case "event": + this._signal(msg.name, {data: msg.data}); + break; + + case "call": + var callback = this.callbacks[msg.id]; + if (callback) { + callback(msg.data); + delete this.callbacks[msg.id]; + } + break; + } + }; + + this.$normalizePath = function(path) { + if (!location.host) // needed for file:// protocol + return path; + path = path.replace(/^[a-z]+:\/\/[^\/]+/, ""); // Remove domain name and rebuild it + path = location.protocol + "//" + location.host + + (path.charAt(0) == "/" ? "" : location.pathname.replace(/\/[^\/]*$/, "")) + + "/" + path.replace(/^[\/]+/, ""); + return path; + }; + + this.terminate = function() { + this._signal("terminate", {}); + this.deltaQueue = null; + this.$worker.terminate(); + this.$worker = null; + this.$doc.removeEventListener("change", this.changeListener); + this.$doc = null; + }; + + this.send = function(cmd, args) { + this.$worker.postMessage({command: cmd, args: args}); + }; + + this.call = function(cmd, args, callback) { + if (callback) { + var id = this.callbackId++; + this.callbacks[id] = callback; + args.push(id); + } + this.send(cmd, args); + }; + + this.emit = function(event, data) { + try { + this.$worker.postMessage({event: event, data: {data: data.data}}); + } + catch(ex) {} + }; + + this.attachToDocument = function(doc) { + if(this.$doc) + this.terminate(); + + this.$doc = doc; + this.call("setValue", [doc.getValue()]); + doc.on("change", this.changeListener); + }; + + this.changeListener = function(e) { + if (!this.deltaQueue) { + this.deltaQueue = [e.data]; + setTimeout(this.$sendDeltaQueue, 0); + } else + this.deltaQueue.push(e.data); + }; + + this.$sendDeltaQueue = function() { + var q = this.deltaQueue; + if (!q) return; + this.deltaQueue = null; + if (q.length > 20 && q.length > this.$doc.getLength() >> 1) { + this.call("setValue", [this.$doc.getValue()]); + } else + this.emit("change", {data: q}); + }; + + this.$workerBlob = function(workerUrl) { + var script = "importScripts('" + net.qualifyURL( workerUrl ) + "');"; + try { + return new Blob([script], {"type": "application/javascript"}); + } catch (e) { // Backwards-compatibility + var BlobBuilder = window.BlobBuilder || window.WebKitBlobBuilder || window.MozBlobBuilder; + var blobBuilder = new BlobBuilder(); + blobBuilder.append(script); + return blobBuilder.getBlob("application/javascript"); + } + }; + +}).call(WorkerClient.prototype); + + +var UIWorkerClient = function(topLevelNamespaces, mod, classname) { + this.$sendDeltaQueue = this.$sendDeltaQueue.bind(this); + this.changeListener = this.changeListener.bind(this); + this.callbackId = 1; + this.callbacks = {}; + this.messageBuffer = []; + + var main = null; + var emitSync = false; + var sender = Object.create(EventEmitter); + var _self = this; + + this.$worker = {}; + this.$worker.terminate = function() {}; + this.$worker.postMessage = function(e) { + _self.messageBuffer.push(e); + if (main) { + if (emitSync) + setTimeout(processNext); + else + processNext(); + } + }; + this.setEmitSync = function(val) { emitSync = val }; + + var processNext = function() { + var msg = _self.messageBuffer.shift(); + if (msg.command) + main[msg.command].apply(main, msg.args); + else if (msg.event) + sender._signal(msg.event, msg.data); + }; + + sender.postMessage = function(msg) { + _self.onMessage({data: msg}); + }; + sender.callback = function(data, callbackId) { + this.postMessage({type: "call", id: callbackId, data: data}); + }; + sender.emit = function(name, data) { + this.postMessage({type: "event", name: name, data: data}); + }; + + config.loadModule(["worker", mod], function(Main) { + main = new Main[classname](sender); + while (_self.messageBuffer.length) + processNext(); + }); +}; + +UIWorkerClient.prototype = WorkerClient.prototype; + +exports.UIWorkerClient = UIWorkerClient; +exports.WorkerClient = WorkerClient; + +}); +ace.define('ace/placeholder', ['require', 'exports', 'module' , 'ace/range', 'ace/lib/event_emitter', 'ace/lib/oop'], function(require, exports, module) { + + +var Range = require("./range").Range; +var EventEmitter = require("./lib/event_emitter").EventEmitter; +var oop = require("./lib/oop"); + +var PlaceHolder = function(session, length, pos, others, mainClass, othersClass) { + var _self = this; + this.length = length; + this.session = session; + this.doc = session.getDocument(); + this.mainClass = mainClass; + this.othersClass = othersClass; + this.$onUpdate = this.onUpdate.bind(this); + this.doc.on("change", this.$onUpdate); + this.$others = others; + + this.$onCursorChange = function() { + setTimeout(function() { + _self.onCursorChange(); + }); + }; + + this.$pos = pos; + var undoStack = session.getUndoManager().$undoStack || session.getUndoManager().$undostack || {length: -1}; + this.$undoStackDepth = undoStack.length; + this.setup(); + + session.selection.on("changeCursor", this.$onCursorChange); +}; + +(function() { + + oop.implement(this, EventEmitter); + this.setup = function() { + var _self = this; + var doc = this.doc; + var session = this.session; + var pos = this.$pos; + + this.pos = doc.createAnchor(pos.row, pos.column); + this.markerId = session.addMarker(new Range(pos.row, pos.column, pos.row, pos.column + this.length), this.mainClass, null, false); + this.pos.on("change", function(event) { + session.removeMarker(_self.markerId); + _self.markerId = session.addMarker(new Range(event.value.row, event.value.column, event.value.row, event.value.column+_self.length), _self.mainClass, null, false); + }); + this.others = []; + this.$others.forEach(function(other) { + var anchor = doc.createAnchor(other.row, other.column); + _self.others.push(anchor); + }); + session.setUndoSelect(false); + }; + this.showOtherMarkers = function() { + if(this.othersActive) return; + var session = this.session; + var _self = this; + this.othersActive = true; + this.others.forEach(function(anchor) { + anchor.markerId = session.addMarker(new Range(anchor.row, anchor.column, anchor.row, anchor.column+_self.length), _self.othersClass, null, false); + anchor.on("change", function(event) { + session.removeMarker(anchor.markerId); + anchor.markerId = session.addMarker(new Range(event.value.row, event.value.column, event.value.row, event.value.column+_self.length), _self.othersClass, null, false); + }); + }); + }; + this.hideOtherMarkers = function() { + if(!this.othersActive) return; + this.othersActive = false; + for (var i = 0; i < this.others.length; i++) { + this.session.removeMarker(this.others[i].markerId); + } + }; + this.onUpdate = function(event) { + var delta = event.data; + var range = delta.range; + if(range.start.row !== range.end.row) return; + if(range.start.row !== this.pos.row) return; + if (this.$updating) return; + this.$updating = true; + var lengthDiff = delta.action === "insertText" ? range.end.column - range.start.column : range.start.column - range.end.column; + + if(range.start.column >= this.pos.column && range.start.column <= this.pos.column + this.length + 1) { + var distanceFromStart = range.start.column - this.pos.column; + this.length += lengthDiff; + if(!this.session.$fromUndo) { + if(delta.action === "insertText") { + for (var i = this.others.length - 1; i >= 0; i--) { + var otherPos = this.others[i]; + var newPos = {row: otherPos.row, column: otherPos.column + distanceFromStart}; + if(otherPos.row === range.start.row && range.start.column < otherPos.column) + newPos.column += lengthDiff; + this.doc.insert(newPos, delta.text); + } + } else if(delta.action === "removeText") { + for (var i = this.others.length - 1; i >= 0; i--) { + var otherPos = this.others[i]; + var newPos = {row: otherPos.row, column: otherPos.column + distanceFromStart}; + if(otherPos.row === range.start.row && range.start.column < otherPos.column) + newPos.column += lengthDiff; + this.doc.remove(new Range(newPos.row, newPos.column, newPos.row, newPos.column - lengthDiff)); + } + } + if(range.start.column === this.pos.column && delta.action === "insertText") { + setTimeout(function() { + this.pos.setPosition(this.pos.row, this.pos.column - lengthDiff); + for (var i = 0; i < this.others.length; i++) { + var other = this.others[i]; + var newPos = {row: other.row, column: other.column - lengthDiff}; + if(other.row === range.start.row && range.start.column < other.column) + newPos.column += lengthDiff; + other.setPosition(newPos.row, newPos.column); + } + }.bind(this), 0); + } + else if(range.start.column === this.pos.column && delta.action === "removeText") { + setTimeout(function() { + for (var i = 0; i < this.others.length; i++) { + var other = this.others[i]; + if(other.row === range.start.row && range.start.column < other.column) { + other.setPosition(other.row, other.column - lengthDiff); + } + } + }.bind(this), 0); + } + } + this.pos._emit("change", {value: this.pos}); + for (var i = 0; i < this.others.length; i++) { + this.others[i]._emit("change", {value: this.others[i]}); + } + } + this.$updating = false; + }; + + this.onCursorChange = function(event) { + if (this.$updating) return; + var pos = this.session.selection.getCursor(); + if(pos.row === this.pos.row && pos.column >= this.pos.column && pos.column <= this.pos.column + this.length) { + this.showOtherMarkers(); + this._emit("cursorEnter", event); + } else { + this.hideOtherMarkers(); + this._emit("cursorLeave", event); + } + }; + this.detach = function() { + this.session.removeMarker(this.markerId); + this.hideOtherMarkers(); + this.doc.removeEventListener("change", this.$onUpdate); + this.session.selection.removeEventListener("changeCursor", this.$onCursorChange); + this.pos.detach(); + for (var i = 0; i < this.others.length; i++) { + this.others[i].detach(); + } + this.session.setUndoSelect(true); + }; + this.cancel = function() { + if(this.$undoStackDepth === -1) + throw Error("Canceling placeholders only supported with undo manager attached to session."); + var undoManager = this.session.getUndoManager(); + var undosRequired = (undoManager.$undoStack || undoManager.$undostack).length - this.$undoStackDepth; + for (var i = 0; i < undosRequired; i++) { + undoManager.undo(true); + } + }; +}).call(PlaceHolder.prototype); + + +exports.PlaceHolder = PlaceHolder; +}); + +ace.define('ace/mode/folding/fold_mode', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) { + + +var Range = require("../../range").Range; + +var FoldMode = exports.FoldMode = function() {}; + +(function() { + + this.foldingStartMarker = null; + this.foldingStopMarker = null; + this.getFoldWidget = function(session, foldStyle, row) { + var line = session.getLine(row); + if (this.foldingStartMarker.test(line)) + return "start"; + if (foldStyle == "markbeginend" + && this.foldingStopMarker + && this.foldingStopMarker.test(line)) + return "end"; + return ""; + }; + + this.getFoldWidgetRange = function(session, foldStyle, row) { + return null; + }; + + this.indentationBlock = function(session, row, column) { + var re = /\S/; + var line = session.getLine(row); + var startLevel = line.search(re); + if (startLevel == -1) + return; + + var startColumn = column || line.length; + var maxRow = session.getLength(); + var startRow = row; + var endRow = row; + + while (++row < maxRow) { + var level = session.getLine(row).search(re); + + if (level == -1) + continue; + + if (level <= startLevel) + break; + + endRow = row; + } + + if (endRow > startRow) { + var endColumn = session.getLine(endRow).length; + return new Range(startRow, startColumn, endRow, endColumn); + } + }; + + this.openingBracketBlock = function(session, bracket, row, column, typeRe) { + var start = {row: row, column: column + 1}; + var end = session.$findClosingBracket(bracket, start, typeRe); + if (!end) + return; + + var fw = session.foldWidgets[end.row]; + if (fw == null) + fw = session.getFoldWidget(end.row); + + if (fw == "start" && end.row > start.row) { + end.row --; + end.column = session.getLine(end.row).length; + } + return Range.fromPoints(start, end); + }; + + this.closingBracketBlock = function(session, bracket, row, column, typeRe) { + var end = {row: row, column: column}; + var start = session.$findOpeningBracket(bracket, end); + + if (!start) + return; + + start.column++; + end.column--; + + return Range.fromPoints(start, end); + }; +}).call(FoldMode.prototype); + +}); + +ace.define('ace/theme/textmate', ['require', 'exports', 'module' , 'ace/lib/dom'], function(require, exports, module) { + + +exports.isDark = false; +exports.cssClass = "ace-tm"; +exports.cssText = ".ace-tm .ace_gutter {\ +background: #f0f0f0;\ +color: #333;\ +}\ +.ace-tm .ace_print-margin {\ +width: 1px;\ +background: #e8e8e8;\ +}\ +.ace-tm .ace_fold {\ +background-color: #6B72E6;\ +}\ +.ace-tm {\ +background-color: #FFFFFF;\ +color: black;\ +}\ +.ace-tm .ace_cursor {\ +color: black;\ +}\ +.ace-tm .ace_invisible {\ +color: rgb(191, 191, 191);\ +}\ +.ace-tm .ace_storage,\ +.ace-tm .ace_keyword {\ +color: blue;\ +}\ +.ace-tm .ace_constant {\ +color: rgb(197, 6, 11);\ +}\ +.ace-tm .ace_constant.ace_buildin {\ +color: rgb(88, 72, 246);\ +}\ +.ace-tm .ace_constant.ace_language {\ +color: rgb(88, 92, 246);\ +}\ +.ace-tm .ace_constant.ace_library {\ +color: rgb(6, 150, 14);\ +}\ +.ace-tm .ace_invalid {\ +background-color: rgba(255, 0, 0, 0.1);\ +color: red;\ +}\ +.ace-tm .ace_support.ace_function {\ +color: rgb(60, 76, 114);\ +}\ +.ace-tm .ace_support.ace_constant {\ +color: rgb(6, 150, 14);\ +}\ +.ace-tm .ace_support.ace_type,\ +.ace-tm .ace_support.ace_class {\ +color: rgb(109, 121, 222);\ +}\ +.ace-tm .ace_keyword.ace_operator {\ +color: rgb(104, 118, 135);\ +}\ +.ace-tm .ace_string {\ +color: rgb(3, 106, 7);\ +}\ +.ace-tm .ace_comment {\ +color: rgb(76, 136, 107);\ +}\ +.ace-tm .ace_comment.ace_doc {\ +color: rgb(0, 102, 255);\ +}\ +.ace-tm .ace_comment.ace_doc.ace_tag {\ +color: rgb(128, 159, 191);\ +}\ +.ace-tm .ace_constant.ace_numeric {\ +color: rgb(0, 0, 205);\ +}\ +.ace-tm .ace_variable {\ +color: rgb(49, 132, 149);\ +}\ +.ace-tm .ace_xml-pe {\ +color: rgb(104, 104, 91);\ +}\ +.ace-tm .ace_entity.ace_name.ace_function {\ +color: #0000A2;\ +}\ +.ace-tm .ace_heading {\ +color: rgb(12, 7, 255);\ +}\ +.ace-tm .ace_list {\ +color:rgb(185, 6, 144);\ +}\ +.ace-tm .ace_meta.ace_tag {\ +color:rgb(0, 22, 142);\ +}\ +.ace-tm .ace_string.ace_regex {\ +color: rgb(255, 0, 0)\ +}\ +.ace-tm .ace_marker-layer .ace_selection {\ +background: rgb(181, 213, 255);\ +}\ +.ace-tm.ace_multiselect .ace_selection.ace_start {\ +box-shadow: 0 0 3px 0px white;\ +border-radius: 2px;\ +}\ +.ace-tm .ace_marker-layer .ace_step {\ +background: rgb(252, 255, 0);\ +}\ +.ace-tm .ace_marker-layer .ace_stack {\ +background: rgb(164, 229, 101);\ +}\ +.ace-tm .ace_marker-layer .ace_bracket {\ +margin: -1px 0 0 -1px;\ +border: 1px solid rgb(192, 192, 192);\ +}\ +.ace-tm .ace_marker-layer .ace_active-line {\ +background: rgba(0, 0, 0, 0.07);\ +}\ +.ace-tm .ace_gutter-active-line {\ +background-color : #dcdcdc;\ +}\ +.ace-tm .ace_marker-layer .ace_selected-word {\ +background: rgb(250, 250, 255);\ +border: 1px solid rgb(200, 200, 250);\ +}\ +.ace-tm .ace_indent-guide {\ +background: url(\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAE0lEQVQImWP4////f4bLly//BwAmVgd1/w11/gAAAABJRU5ErkJggg==\") right repeat-y;\ +}\ +"; + +var dom = require("../lib/dom"); +dom.importCssString(exports.cssText, exports.cssClass); +}); + +ace.define('ace/ext/error_marker', ['require', 'exports', 'module' , 'ace/line_widgets', 'ace/lib/dom', 'ace/range'], function(require, exports, module) { + +var LineWidgets = require("ace/line_widgets").LineWidgets; +var dom = require("ace/lib/dom"); +var Range = require("ace/range").Range; + +function binarySearch(array, needle, comparator) { + var first = 0; + var last = array.length - 1; + + while (first <= last) { + var mid = (first + last) >> 1; + var c = comparator(needle, array[mid]); + if (c > 0) + first = mid + 1; + else if (c < 0) + last = mid - 1; + else + return mid; + } + return -(first + 1); +} + +function findAnnotations(session, row, dir) { + var annotations = session.getAnnotations().sort(Range.comparePoints); + if (!annotations.length) + return; + + var i = binarySearch(annotations, {row: row, column: -1}, Range.comparePoints); + if (i < 0) + i = -i - 1; + + if (i >= annotations.length - 1) + i = dir > 0 ? 0 : annotations.length - 1; + else if (i === 0 && dir < 0) + i = annotations.length - 1; + + var annotation = annotations[i]; + if (!annotation || !dir) + return; + + if (annotation.row === row) { + do { + annotation = annotations[i += dir]; + } while (annotation && annotation.row === row); + if (!annotation) + return annotations.slice(); + } + + + var matched = []; + row = annotation.row; + do { + matched[dir < 0 ? "unshift" : "push"](annotation); + annotation = annotations[i += dir]; + } while (annotation && annotation.row == row); + return matched.length && matched; +} + +exports.showErrorMarker = function(editor, dir) { + var session = editor.session; + if (!session.widgetManager) { + session.widgetManager = new LineWidgets(session); + session.widgetManager.attach(editor); + } + + var pos = editor.getCursorPosition(); + var row = pos.row; + var oldWidget = session.lineWidgets && session.lineWidgets[row]; + if (oldWidget) { + oldWidget.destroy(); + } else { + row -= dir; + } + var annotations = findAnnotations(session, row, dir); + var gutterAnno; + if (annotations) { + var annotation = annotations[0]; + pos.column = (annotation.pos && typeof annotation.column != "number" + ? annotation.pos.sc + : annotation.column) || 0; + pos.row = annotation.row; + gutterAnno = editor.renderer.$gutterLayer.$annotations[pos.row]; + } else if (oldWidget) { + return; + } else { + gutterAnno = { + text: ["Looks good!"], + className: "ace_ok" + }; + } + editor.session.unfold(pos.row); + editor.selection.moveToPosition(pos); + + var w = { + row: pos.row, + fixedWidth: true, + coverGutter: true, + el: dom.createElement("div") + }; + var el = w.el.appendChild(dom.createElement("div")); + var arrow = w.el.appendChild(dom.createElement("div")); + arrow.className = "error_widget_arrow " + gutterAnno.className; + + var left = editor.renderer.$cursorLayer + .getPixelPosition(pos).left; + arrow.style.left = left + editor.renderer.gutterWidth - 5 + "px"; + + w.el.className = "error_widget_wrapper"; + el.className = "error_widget " + gutterAnno.className; + el.innerHTML = gutterAnno.text.join("
    "); + + el.appendChild(dom.createElement("div")); + + var kb = function(_, hashId, keyString) { + if (hashId === 0 && (keyString === "esc" || keyString === "return")) { + w.destroy(); + return {command: "null"}; + } + }; + + w.destroy = function() { + if (editor.$mouseHandler.isMousePressed) + return; + editor.keyBinding.removeKeyboardHandler(kb); + session.widgetManager.removeLineWidget(w); + editor.off("changeSelection", w.destroy); + editor.off("changeSession", w.destroy); + editor.off("mouseup", w.destroy); + editor.off("change", w.destroy); + }; + + editor.keyBinding.addKeyboardHandler(kb); + editor.on("changeSelection", w.destroy); + editor.on("changeSession", w.destroy); + editor.on("mouseup", w.destroy); + editor.on("change", w.destroy); + + editor.session.widgetManager.addLineWidget(w); + + w.el.onmousedown = editor.focus.bind(editor); + + editor.renderer.scrollCursorIntoView(null, 0.5, {bottom: w.el.offsetHeight}); +}; + + +dom.importCssString("\ + .error_widget_wrapper {\ + background: inherit;\ + color: inherit;\ + border:none\ + }\ + .error_widget {\ + border-top: solid 2px;\ + border-bottom: solid 2px;\ + margin: 5px 0;\ + padding: 10px 40px;\ + white-space: pre-wrap;\ + }\ + .error_widget.ace_error, .error_widget_arrow.ace_error{\ + border-color: #ff5a5a\ + }\ + .error_widget.ace_warning, .error_widget_arrow.ace_warning{\ + border-color: #F1D817\ + }\ + .error_widget.ace_info, .error_widget_arrow.ace_info{\ + border-color: #5a5a5a\ + }\ + .error_widget.ace_ok, .error_widget_arrow.ace_ok{\ + border-color: #5aaa5a\ + }\ + .error_widget_arrow {\ + position: absolute;\ + border: solid 5px;\ + border-top-color: transparent!important;\ + border-right-color: transparent!important;\ + border-left-color: transparent!important;\ + top: -5px;\ + }\ +", ""); + +}); + +ace.define('ace/line_widgets', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/dom', 'ace/range'], function(require, exports, module) { + + +var oop = require("./lib/oop"); +var dom = require("./lib/dom"); +var Range = require("./range").Range; + + +function LineWidgets(session) { + this.session = session; + this.session.widgetManager = this; + this.session.getRowLength = this.getRowLength; + this.session.$getWidgetScreenLength = this.$getWidgetScreenLength; + this.updateOnChange = this.updateOnChange.bind(this); + this.renderWidgets = this.renderWidgets.bind(this); + this.measureWidgets = this.measureWidgets.bind(this); + this.session._changedWidgets = []; + this.detach = this.detach.bind(this); + + this.session.on("change", this.updateOnChange); +} + +(function() { + this.getRowLength = function(row) { + var h; + if (this.lineWidgets) + h = this.lineWidgets[row] && this.lineWidgets[row].rowCount || 0; + else + h = 0; + if (!this.$useWrapMode || !this.$wrapData[row]) { + return 1 + h; + } else { + return this.$wrapData[row].length + 1 + h; + } + }; + + this.$getWidgetScreenLength = function() { + var screenRows = 0; + this.lineWidgets.forEach(function(w){ + if (w && w.rowCount) + screenRows +=w.rowCount; + }); + return screenRows; + }; + + this.attach = function(editor) { + if (editor.widgetManager && editor.widgetManager != this) + editor.widgetManager.detach(); + + if (this.editor == editor) + return; + + this.detach(); + this.editor = editor; + + this.editor.on("changeSession", this.detach); + + editor.widgetManager = this; + + editor.setOption("enableLineWidgets", true); + editor.renderer.on("beforeRender", this.measureWidgets); + editor.renderer.on("afterRender", this.renderWidgets); + }; + this.detach = function(e) { + if (e && e.session == this.session) + return; // sometimes attach can be called before setSession + var editor = this.editor; + if (!editor) + return; + + editor.off("changeSession", this.detach); + + this.editor = null; + editor.widgetManager = null; + + editor.renderer.off("beforeRender", this.measureWidgets); + editor.renderer.off("afterRender", this.renderWidgets); + var lineWidgets = this.session.lineWidgets; + lineWidgets && lineWidgets.forEach(function(w) { + if (w && w.el && w.el.parentNode) { + w._inDocument = false; + w.el.parentNode.removeChild(w.el); + } + }); + }; + + this.updateOnChange = function(e) { + var lineWidgets = this.session.lineWidgets; + if (!lineWidgets) return; + + var delta = e.data; + var range = delta.range; + var startRow = range.start.row; + var len = range.end.row - startRow; + + if (len === 0) { + } else if (delta.action == "removeText" || delta.action == "removeLines") { + var removed = lineWidgets.splice(startRow + 1, len); + removed.forEach(function(w) { + w && this.removeLineWidget(w); + }, this); + this.$updateRows(); + } else { + var args = new Array(len); + args.unshift(startRow, 0); + lineWidgets.splice.apply(lineWidgets, args); + this.$updateRows(); + } + }; + + this.$updateRows = function() { + var lineWidgets = this.session.lineWidgets; + if (!lineWidgets) return; + var noWidgets = true; + lineWidgets.forEach(function(w, i) { + if (w) { + noWidgets = false; + w.row = i; + } + }); + if (noWidgets) + this.session.lineWidgets = null; + }; + + this.addLineWidget = function(w) { + if (!this.session.lineWidgets) + this.session.lineWidgets = new Array(this.session.getLength()); + + this.session.lineWidgets[w.row] = w; + + var renderer = this.editor.renderer; + if (w.html && !w.el) { + w.el = dom.createElement("div"); + w.el.innerHTML = w.html; + } + if (w.el) { + dom.addCssClass(w.el, "ace_lineWidgetContainer"); + w.el.style.position = "absolute"; + w.el.style.zIndex = 5; + renderer.container.appendChild(w.el); + w._inDocument = true; + } + + if (!w.coverGutter) { + w.el.style.zIndex = 3; + } + if (!w.pixelHeight) { + w.pixelHeight = w.el.offsetHeight; + } + if (w.rowCount == null) + w.rowCount = w.pixelHeight / renderer.layerConfig.lineHeight; + + this.session._emit("changeFold", {data:{start:{row: w.row}}}); + + this.$updateRows(); + this.renderWidgets(null, renderer); + return w; + }; + + this.removeLineWidget = function(w) { + w._inDocument = false; + if (w.el && w.el.parentNode) + w.el.parentNode.removeChild(w.el); + if (w.editor && w.editor.destroy) try { + w.editor.destroy(); + } catch(e){} + if (this.session.lineWidgets) + this.session.lineWidgets[w.row] = undefined; + this.session._emit("changeFold", {data:{start:{row: w.row}}}); + this.$updateRows(); + }; + + this.onWidgetChanged = function(w) { + this.session._changedWidgets.push(w); + this.editor && this.editor.renderer.updateFull(); + }; + + this.measureWidgets = function(e, renderer) { + var changedWidgets = this.session._changedWidgets; + var config = renderer.layerConfig; + + if (!changedWidgets || !changedWidgets.length) return; + var min = Infinity; + for (var i = 0; i < changedWidgets.length; i++) { + var w = changedWidgets[i]; + if (!w._inDocument) { + w._inDocument = true; + renderer.container.appendChild(w.el); + } + + w.h = w.el.offsetHeight; + + if (!w.fixedWidth) { + w.w = w.el.offsetWidth; + w.screenWidth = Math.ceil(w.w / config.characterWidth); + } + + var rowCount = w.h / config.lineHeight; + if (w.coverLine) { + rowCount -= this.session.getRowLineCount(w.row); + if (rowCount < 0) + rowCount = 0; + } + if (w.rowCount != rowCount) { + w.rowCount = rowCount; + if (w.row < min) + min = w.row; + } + } + if (min != Infinity) { + this.session._emit("changeFold", {data:{start:{row: min}}}); + this.session.lineWidgetWidth = null; + } + this.session._changedWidgets = []; + }; + + this.renderWidgets = function(e, renderer) { + var config = renderer.layerConfig; + var lineWidgets = this.session.lineWidgets; + if (!lineWidgets) + return; + var first = Math.min(this.firstRow, config.firstRow); + var last = Math.max(this.lastRow, config.lastRow, lineWidgets.length); + + while (first > 0 && !lineWidgets[first]) + first--; + + this.firstRow = config.firstRow; + this.lastRow = config.lastRow; + + renderer.$cursorLayer.config = config; + for (var i = first; i <= last; i++) { + var w = lineWidgets[i]; + if (!w || !w.el) continue; + + if (!w._inDocument) { + w._inDocument = true; + renderer.container.appendChild(w.el); + } + var top = renderer.$cursorLayer.getPixelPosition({row: i, column:0}, true).top; + if (!w.coverLine) + top += config.lineHeight * this.session.getRowLineCount(w.row); + w.el.style.top = top - config.offset + "px"; + + var left = w.coverGutter ? 0 : renderer.gutterWidth; + if (!w.fixedWidth) + left -= renderer.scrollLeft; + w.el.style.left = left + "px"; + + if (w.fixedWidth) { + w.el.style.right = renderer.scrollBar.getWidth() + "px"; + } else { + w.el.style.right = ""; + } + } + }; + +}).call(LineWidgets.prototype); + + +exports.LineWidgets = LineWidgets; + +}); + + + + +; + (function() { + ace.require(["ace/ace"], function(a) { + a && a.config.init(); + if (!window.ace) + window.ace = {}; + for (var key in a) if (a.hasOwnProperty(key)) + ace[key] = a[key]; + }); + })(); + \ No newline at end of file diff --git a/tutor/app/assets/javascripts/mode-java.js b/tutor/app/assets/javascripts/mode-java.js new file mode 100644 index 00000000..6d2fbb8c --- /dev/null +++ b/tutor/app/assets/javascripts/mode-java.js @@ -0,0 +1,1078 @@ +ace.define('ace/mode/java', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/javascript', 'ace/mode/java_highlight_rules'], function(require, exports, module) { + + +var oop = require("../lib/oop"); +var JavaScriptMode = require("./javascript").Mode; +var JavaHighlightRules = require("./java_highlight_rules").JavaHighlightRules; + +var Mode = function() { + JavaScriptMode.call(this); + this.HighlightRules = JavaHighlightRules; +}; +oop.inherits(Mode, JavaScriptMode); + +(function() { + + this.createWorker = function(session) { + return null; + }; + + this.$id = "ace/mode/java"; +}).call(Mode.prototype); + +exports.Mode = Mode; +}); + +ace.define('ace/mode/javascript', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/mode/javascript_highlight_rules', 'ace/mode/matching_brace_outdent', 'ace/range', 'ace/worker/worker_client', 'ace/mode/behaviour/cstyle', 'ace/mode/folding/cstyle'], function(require, exports, module) { + + +var oop = require("../lib/oop"); +var TextMode = require("./text").Mode; +var JavaScriptHighlightRules = require("./javascript_highlight_rules").JavaScriptHighlightRules; +var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent; +var Range = require("../range").Range; +var WorkerClient = require("../worker/worker_client").WorkerClient; +var CstyleBehaviour = require("./behaviour/cstyle").CstyleBehaviour; +var CStyleFoldMode = require("./folding/cstyle").FoldMode; + +var Mode = function() { + this.HighlightRules = JavaScriptHighlightRules; + + this.$outdent = new MatchingBraceOutdent(); + this.$behaviour = new CstyleBehaviour(); + this.foldingRules = new CStyleFoldMode(); +}; +oop.inherits(Mode, TextMode); + +(function() { + + this.lineCommentStart = "//"; + this.blockComment = {start: "/*", end: "*/"}; + + this.getNextLineIndent = function(state, line, tab) { + var indent = this.$getIndent(line); + + var tokenizedLine = this.getTokenizer().getLineTokens(line, state); + var tokens = tokenizedLine.tokens; + var endState = tokenizedLine.state; + + if (tokens.length && tokens[tokens.length-1].type == "comment") { + return indent; + } + + if (state == "start" || state == "no_regex") { + var match = line.match(/^.*(?:\bcase\b.*\:|[\{\(\[])\s*$/); + if (match) { + indent += tab; + } + } else if (state == "doc-start") { + if (endState == "start" || endState == "no_regex") { + return ""; + } + var match = line.match(/^\s*(\/?)\*/); + if (match) { + if (match[1]) { + indent += " "; + } + indent += "* "; + } + } + + return indent; + }; + + this.checkOutdent = function(state, line, input) { + return this.$outdent.checkOutdent(line, input); + }; + + this.autoOutdent = function(state, doc, row) { + this.$outdent.autoOutdent(doc, row); + }; + + this.createWorker = function(session) { + var worker = new WorkerClient(["ace"], "ace/mode/javascript_worker", "JavaScriptWorker"); + worker.attachToDocument(session.getDocument()); + + worker.on("jslint", function(results) { + session.setAnnotations(results.data); + }); + + worker.on("terminate", function() { + session.clearAnnotations(); + }); + + return worker; + }; + + this.$id = "ace/mode/javascript"; +}).call(Mode.prototype); + +exports.Mode = Mode; +}); + +ace.define('ace/mode/javascript_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/doc_comment_highlight_rules', 'ace/mode/text_highlight_rules'], function(require, exports, module) { + + +var oop = require("../lib/oop"); +var DocCommentHighlightRules = require("./doc_comment_highlight_rules").DocCommentHighlightRules; +var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules; + +var JavaScriptHighlightRules = function() { + var keywordMapper = this.createKeywordMapper({ + "variable.language": + "Array|Boolean|Date|Function|Iterator|Number|Object|RegExp|String|Proxy|" + // Constructors + "Namespace|QName|XML|XMLList|" + // E4X + "ArrayBuffer|Float32Array|Float64Array|Int16Array|Int32Array|Int8Array|" + + "Uint16Array|Uint32Array|Uint8Array|Uint8ClampedArray|" + + "Error|EvalError|InternalError|RangeError|ReferenceError|StopIteration|" + // Errors + "SyntaxError|TypeError|URIError|" + + "decodeURI|decodeURIComponent|encodeURI|encodeURIComponent|eval|isFinite|" + // Non-constructor functions + "isNaN|parseFloat|parseInt|" + + "JSON|Math|" + // Other + "this|arguments|prototype|window|document" , // Pseudo + "keyword": + "const|yield|import|get|set|" + + "break|case|catch|continue|default|delete|do|else|finally|for|function|" + + "if|in|instanceof|new|return|switch|throw|try|typeof|let|var|while|with|debugger|" + + "__parent__|__count__|escape|unescape|with|__proto__|" + + "class|enum|extends|super|export|implements|private|public|interface|package|protected|static", + "storage.type": + "const|let|var|function", + "constant.language": + "null|Infinity|NaN|undefined", + "support.function": + "alert", + "constant.language.boolean": "true|false" + }, "identifier"); + var kwBeforeRe = "case|do|else|finally|in|instanceof|return|throw|try|typeof|yield|void"; + var identifierRe = "[a-zA-Z\\$_\u00a1-\uffff][a-zA-Z\\d\\$_\u00a1-\uffff]*\\b"; + + var escapedRe = "\\\\(?:x[0-9a-fA-F]{2}|" + // hex + "u[0-9a-fA-F]{4}|" + // unicode + "[0-2][0-7]{0,2}|" + // oct + "3[0-6][0-7]?|" + // oct + "37[0-7]?|" + // oct + "[4-7][0-7]?|" + //oct + ".)"; + + this.$rules = { + "no_regex" : [ + { + token : "comment", + regex : "\\/\\/", + next : "line_comment" + }, + DocCommentHighlightRules.getStartRule("doc-start"), + { + token : "comment", // multi line comment + regex : /\/\*/, + next : "comment" + }, { + token : "string", + regex : "'(?=.)", + next : "qstring" + }, { + token : "string", + regex : '"(?=.)', + next : "qqstring" + }, { + token : "constant.numeric", // hex + regex : /0[xX][0-9a-fA-F]+\b/ + }, { + token : "constant.numeric", // float + regex : /[+-]?\d+(?:(?:\.\d*)?(?:[eE][+-]?\d+)?)?\b/ + }, { + token : [ + "storage.type", "punctuation.operator", "support.function", + "punctuation.operator", "entity.name.function", "text","keyword.operator" + ], + regex : "(" + identifierRe + ")(\\.)(prototype)(\\.)(" + identifierRe +")(\\s*)(=)", + next: "function_arguments" + }, { + token : [ + "storage.type", "punctuation.operator", "entity.name.function", "text", + "keyword.operator", "text", "storage.type", "text", "paren.lparen" + ], + regex : "(" + identifierRe + ")(\\.)(" + identifierRe +")(\\s*)(=)(\\s*)(function)(\\s*)(\\()", + next: "function_arguments" + }, { + token : [ + "entity.name.function", "text", "keyword.operator", "text", "storage.type", + "text", "paren.lparen" + ], + regex : "(" + identifierRe +")(\\s*)(=)(\\s*)(function)(\\s*)(\\()", + next: "function_arguments" + }, { + token : [ + "storage.type", "punctuation.operator", "entity.name.function", "text", + "keyword.operator", "text", + "storage.type", "text", "entity.name.function", "text", "paren.lparen" + ], + regex : "(" + identifierRe + ")(\\.)(" + identifierRe +")(\\s*)(=)(\\s*)(function)(\\s+)(\\w+)(\\s*)(\\()", + next: "function_arguments" + }, { + token : [ + "storage.type", "text", "entity.name.function", "text", "paren.lparen" + ], + regex : "(function)(\\s+)(" + identifierRe + ")(\\s*)(\\()", + next: "function_arguments" + }, { + token : [ + "entity.name.function", "text", "punctuation.operator", + "text", "storage.type", "text", "paren.lparen" + ], + regex : "(" + identifierRe + ")(\\s*)(:)(\\s*)(function)(\\s*)(\\()", + next: "function_arguments" + }, { + token : [ + "text", "text", "storage.type", "text", "paren.lparen" + ], + regex : "(:)(\\s*)(function)(\\s*)(\\()", + next: "function_arguments" + }, { + token : "keyword", + regex : "(?:" + kwBeforeRe + ")\\b", + next : "start" + }, { + token : ["punctuation.operator", "support.function"], + regex : /(\.)(s(?:h(?:ift|ow(?:Mod(?:elessDialog|alDialog)|Help))|croll(?:X|By(?:Pages|Lines)?|Y|To)?|t(?:op|rike)|i(?:n|zeToContent|debar|gnText)|ort|u(?:p|b(?:str(?:ing)?)?)|pli(?:ce|t)|e(?:nd|t(?:Re(?:sizable|questHeader)|M(?:i(?:nutes|lliseconds)|onth)|Seconds|Ho(?:tKeys|urs)|Year|Cursor|Time(?:out)?|Interval|ZOptions|Date|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Date|FullYear)|FullYear|Active)|arch)|qrt|lice|avePreferences|mall)|h(?:ome|andleEvent)|navigate|c(?:har(?:CodeAt|At)|o(?:s|n(?:cat|textual|firm)|mpile)|eil|lear(?:Timeout|Interval)?|a(?:ptureEvents|ll)|reate(?:StyleSheet|Popup|EventObject))|t(?:o(?:GMTString|S(?:tring|ource)|U(?:TCString|pperCase)|Lo(?:caleString|werCase))|est|a(?:n|int(?:Enabled)?))|i(?:s(?:NaN|Finite)|ndexOf|talics)|d(?:isableExternalCapture|ump|etachEvent)|u(?:n(?:shift|taint|escape|watch)|pdateCommands)|j(?:oin|avaEnabled)|p(?:o(?:p|w)|ush|lugins.refresh|a(?:ddings|rse(?:Int|Float)?)|r(?:int|ompt|eference))|e(?:scape|nableExternalCapture|val|lementFromPoint|x(?:p|ec(?:Script|Command)?))|valueOf|UTC|queryCommand(?:State|Indeterm|Enabled|Value)|f(?:i(?:nd|le(?:ModifiedDate|Size|CreatedDate|UpdatedDate)|xed)|o(?:nt(?:size|color)|rward)|loor|romCharCode)|watch|l(?:ink|o(?:ad|g)|astIndexOf)|a(?:sin|nchor|cos|t(?:tachEvent|ob|an(?:2)?)|pply|lert|b(?:s|ort))|r(?:ou(?:nd|teEvents)|e(?:size(?:By|To)|calc|turnValue|place|verse|l(?:oad|ease(?:Capture|Events)))|andom)|g(?:o|et(?:ResponseHeader|M(?:i(?:nutes|lliseconds)|onth)|Se(?:conds|lection)|Hours|Year|Time(?:zoneOffset)?|Da(?:y|te)|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Da(?:y|te)|FullYear)|FullYear|A(?:ttention|llResponseHeaders)))|m(?:in|ove(?:B(?:y|elow)|To(?:Absolute)?|Above)|ergeAttributes|a(?:tch|rgins|x))|b(?:toa|ig|o(?:ld|rderWidths)|link|ack))\b(?=\()/ + }, { + token : ["punctuation.operator", "support.function.dom"], + regex : /(\.)(s(?:ub(?:stringData|mit)|plitText|e(?:t(?:NamedItem|Attribute(?:Node)?)|lect))|has(?:ChildNodes|Feature)|namedItem|c(?:l(?:ick|o(?:se|neNode))|reate(?:C(?:omment|DATASection|aption)|T(?:Head|extNode|Foot)|DocumentFragment|ProcessingInstruction|E(?:ntityReference|lement)|Attribute))|tabIndex|i(?:nsert(?:Row|Before|Cell|Data)|tem)|open|delete(?:Row|C(?:ell|aption)|T(?:Head|Foot)|Data)|focus|write(?:ln)?|a(?:dd|ppend(?:Child|Data))|re(?:set|place(?:Child|Data)|move(?:NamedItem|Child|Attribute(?:Node)?)?)|get(?:NamedItem|Element(?:sBy(?:Name|TagName)|ById)|Attribute(?:Node)?)|blur)\b(?=\()/ + }, { + token : ["punctuation.operator", "support.constant"], + regex : /(\.)(s(?:ystemLanguage|cr(?:ipts|ollbars|een(?:X|Y|Top|Left))|t(?:yle(?:Sheets)?|atus(?:Text|bar)?)|ibling(?:Below|Above)|ource|uffixes|e(?:curity(?:Policy)?|l(?:ection|f)))|h(?:istory|ost(?:name)?|as(?:h|Focus))|y|X(?:MLDocument|SLDocument)|n(?:ext|ame(?:space(?:s|URI)|Prop))|M(?:IN_VALUE|AX_VALUE)|c(?:haracterSet|o(?:n(?:structor|trollers)|okieEnabled|lorDepth|mp(?:onents|lete))|urrent|puClass|l(?:i(?:p(?:boardData)?|entInformation)|osed|asses)|alle(?:e|r)|rypto)|t(?:o(?:olbar|p)|ext(?:Transform|Indent|Decoration|Align)|ags)|SQRT(?:1_2|2)|i(?:n(?:ner(?:Height|Width)|put)|ds|gnoreCase)|zIndex|o(?:scpu|n(?:readystatechange|Line)|uter(?:Height|Width)|p(?:sProfile|ener)|ffscreenBuffering)|NEGATIVE_INFINITY|d(?:i(?:splay|alog(?:Height|Top|Width|Left|Arguments)|rectories)|e(?:scription|fault(?:Status|Ch(?:ecked|arset)|View)))|u(?:ser(?:Profile|Language|Agent)|n(?:iqueID|defined)|pdateInterval)|_content|p(?:ixelDepth|ort|ersonalbar|kcs11|l(?:ugins|atform)|a(?:thname|dding(?:Right|Bottom|Top|Left)|rent(?:Window|Layer)?|ge(?:X(?:Offset)?|Y(?:Offset)?))|r(?:o(?:to(?:col|type)|duct(?:Sub)?|mpter)|e(?:vious|fix)))|e(?:n(?:coding|abledPlugin)|x(?:ternal|pando)|mbeds)|v(?:isibility|endor(?:Sub)?|Linkcolor)|URLUnencoded|P(?:I|OSITIVE_INFINITY)|f(?:ilename|o(?:nt(?:Size|Family|Weight)|rmName)|rame(?:s|Element)|gColor)|E|whiteSpace|l(?:i(?:stStyleType|n(?:eHeight|kColor))|o(?:ca(?:tion(?:bar)?|lName)|wsrc)|e(?:ngth|ft(?:Context)?)|a(?:st(?:M(?:odified|atch)|Index|Paren)|yer(?:s|X)|nguage))|a(?:pp(?:MinorVersion|Name|Co(?:deName|re)|Version)|vail(?:Height|Top|Width|Left)|ll|r(?:ity|guments)|Linkcolor|bove)|r(?:ight(?:Context)?|e(?:sponse(?:XML|Text)|adyState))|global|x|m(?:imeTypes|ultiline|enubar|argin(?:Right|Bottom|Top|Left))|L(?:N(?:10|2)|OG(?:10E|2E))|b(?:o(?:ttom|rder(?:Width|RightWidth|BottomWidth|Style|Color|TopWidth|LeftWidth))|ufferDepth|elow|ackground(?:Color|Image)))\b/ + }, { + token : ["storage.type", "punctuation.operator", "support.function.firebug"], + regex : /(console)(\.)(warn|info|log|error|time|timeEnd|assert)\b/ + }, { + token : keywordMapper, + regex : identifierRe + }, { + token : "keyword.operator", + regex : /--|\+\+|[!$%&*+\-~]|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\|\||\?\:|\*=|%=|\+=|\-=|&=|\^=/, + next : "start" + }, { + token : "punctuation.operator", + regex : /\?|\:|\,|\;|\./, + next : "start" + }, { + token : "paren.lparen", + regex : /[\[({]/, + next : "start" + }, { + token : "paren.rparen", + regex : /[\])}]/ + }, { + token : "keyword.operator", + regex : /\/=?/, + next : "start" + }, { + token: "comment", + regex: /^#!.*$/ + } + ], + "start": [ + DocCommentHighlightRules.getStartRule("doc-start"), + { + token : "comment", // multi line comment + regex : "\\/\\*", + next : "comment_regex_allowed" + }, { + token : "comment", + regex : "\\/\\/", + next : "line_comment_regex_allowed" + }, { + token: "string.regexp", + regex: "\\/", + next: "regex" + }, { + token : "text", + regex : "\\s+|^$", + next : "start" + }, { + token: "empty", + regex: "", + next: "no_regex" + } + ], + "regex": [ + { + token: "regexp.keyword.operator", + regex: "\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)" + }, { + token: "string.regexp", + regex: "/[sxngimy]*", + next: "no_regex" + }, { + token : "invalid", + regex: /\{\d+\b,?\d*\}[+*]|[+*$^?][+*]|[$^][?]|\?{3,}/ + }, { + token : "constant.language.escape", + regex: /\(\?[:=!]|\)|\{\d+\b,?\d*\}|[+*]\?|[()$^+*?.]/ + }, { + token : "constant.language.delimiter", + regex: /\|/ + }, { + token: "constant.language.escape", + regex: /\[\^?/, + next: "regex_character_class" + }, { + token: "empty", + regex: "$", + next: "no_regex" + }, { + defaultToken: "string.regexp" + } + ], + "regex_character_class": [ + { + token: "regexp.keyword.operator", + regex: "\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)" + }, { + token: "constant.language.escape", + regex: "]", + next: "regex" + }, { + token: "constant.language.escape", + regex: "-" + }, { + token: "empty", + regex: "$", + next: "no_regex" + }, { + defaultToken: "string.regexp.charachterclass" + } + ], + "function_arguments": [ + { + token: "variable.parameter", + regex: identifierRe + }, { + token: "punctuation.operator", + regex: "[, ]+" + }, { + token: "punctuation.operator", + regex: "$" + }, { + token: "empty", + regex: "", + next: "no_regex" + } + ], + "comment_regex_allowed" : [ + {token : "comment", regex : "\\*\\/", next : "start"}, + {defaultToken : "comment"} + ], + "comment" : [ + {token : "comment", regex : "\\*\\/", next : "no_regex"}, + {defaultToken : "comment"} + ], + "line_comment_regex_allowed" : [ + {token : "comment", regex : "$|^", next : "start"}, + {defaultToken : "comment"} + ], + "line_comment" : [ + {token : "comment", regex : "$|^", next : "no_regex"}, + {defaultToken : "comment"} + ], + "qqstring" : [ + { + token : "constant.language.escape", + regex : escapedRe + }, { + token : "string", + regex : "\\\\$", + next : "qqstring" + }, { + token : "string", + regex : '"|$', + next : "no_regex" + }, { + defaultToken: "string" + } + ], + "qstring" : [ + { + token : "constant.language.escape", + regex : escapedRe + }, { + token : "string", + regex : "\\\\$", + next : "qstring" + }, { + token : "string", + regex : "'|$", + next : "no_regex" + }, { + defaultToken: "string" + } + ] + }; + + this.embedRules(DocCommentHighlightRules, "doc-", + [ DocCommentHighlightRules.getEndRule("no_regex") ]); +}; + +oop.inherits(JavaScriptHighlightRules, TextHighlightRules); + +exports.JavaScriptHighlightRules = JavaScriptHighlightRules; +}); + +ace.define('ace/mode/doc_comment_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text_highlight_rules'], function(require, exports, module) { + + +var oop = require("../lib/oop"); +var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules; + +var DocCommentHighlightRules = function() { + + this.$rules = { + "start" : [ { + token : "comment.doc.tag", + regex : "@[\\w\\d_]+" // TODO: fix email addresses + }, { + token : "comment.doc.tag", + regex : "\\bTODO\\b" + }, { + defaultToken : "comment.doc" + }] + }; +}; + +oop.inherits(DocCommentHighlightRules, TextHighlightRules); + +DocCommentHighlightRules.getStartRule = function(start) { + return { + token : "comment.doc", // doc comment + regex : "\\/\\*(?=\\*)", + next : start + }; +}; + +DocCommentHighlightRules.getEndRule = function (start) { + return { + token : "comment.doc", // closing comment + regex : "\\*\\/", + next : start + }; +}; + + +exports.DocCommentHighlightRules = DocCommentHighlightRules; + +}); + +ace.define('ace/mode/matching_brace_outdent', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) { + + +var Range = require("../range").Range; + +var MatchingBraceOutdent = function() {}; + +(function() { + + this.checkOutdent = function(line, input) { + if (! /^\s+$/.test(line)) + return false; + + return /^\s*\}/.test(input); + }; + + this.autoOutdent = function(doc, row) { + var line = doc.getLine(row); + var match = line.match(/^(\s*\})/); + + if (!match) return 0; + + var column = match[1].length; + var openBracePos = doc.findMatchingBracket({row: row, column: column}); + + if (!openBracePos || openBracePos.row == row) return 0; + + var indent = this.$getIndent(doc.getLine(openBracePos.row)); + doc.replace(new Range(row, 0, row, column-1), indent); + }; + + this.$getIndent = function(line) { + return line.match(/^\s*/)[0]; + }; + +}).call(MatchingBraceOutdent.prototype); + +exports.MatchingBraceOutdent = MatchingBraceOutdent; +}); + +ace.define('ace/mode/behaviour/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/behaviour', 'ace/token_iterator', 'ace/lib/lang'], function(require, exports, module) { + + +var oop = require("../../lib/oop"); +var Behaviour = require("../behaviour").Behaviour; +var TokenIterator = require("../../token_iterator").TokenIterator; +var lang = require("../../lib/lang"); + +var SAFE_INSERT_IN_TOKENS = + ["text", "paren.rparen", "punctuation.operator"]; +var SAFE_INSERT_BEFORE_TOKENS = + ["text", "paren.rparen", "punctuation.operator", "comment"]; + +var context; +var contextCache = {} +var initContext = function(editor) { + var id = -1; + if (editor.multiSelect) { + id = editor.selection.id; + if (contextCache.rangeCount != editor.multiSelect.rangeCount) + contextCache = {rangeCount: editor.multiSelect.rangeCount}; + } + if (contextCache[id]) + return context = contextCache[id]; + context = contextCache[id] = { + autoInsertedBrackets: 0, + autoInsertedRow: -1, + autoInsertedLineEnd: "", + maybeInsertedBrackets: 0, + maybeInsertedRow: -1, + maybeInsertedLineStart: "", + maybeInsertedLineEnd: "" + }; +}; + +var CstyleBehaviour = function() { + this.add("braces", "insertion", function(state, action, editor, session, text) { + var cursor = editor.getCursorPosition(); + var line = session.doc.getLine(cursor.row); + if (text == '{') { + initContext(editor); + var selection = editor.getSelectionRange(); + var selected = session.doc.getTextRange(selection); + if (selected !== "" && selected !== "{" && editor.getWrapBehavioursEnabled()) { + return { + text: '{' + selected + '}', + selection: false + }; + } else if (CstyleBehaviour.isSaneInsertion(editor, session)) { + if (/[\]\}\)]/.test(line[cursor.column]) || editor.inMultiSelectMode) { + CstyleBehaviour.recordAutoInsert(editor, session, "}"); + return { + text: '{}', + selection: [1, 1] + }; + } else { + CstyleBehaviour.recordMaybeInsert(editor, session, "{"); + return { + text: '{', + selection: [1, 1] + }; + } + } + } else if (text == '}') { + initContext(editor); + var rightChar = line.substring(cursor.column, cursor.column + 1); + if (rightChar == '}') { + var matching = session.$findOpeningBracket('}', {column: cursor.column + 1, row: cursor.row}); + if (matching !== null && CstyleBehaviour.isAutoInsertedClosing(cursor, line, text)) { + CstyleBehaviour.popAutoInsertedClosing(); + return { + text: '', + selection: [1, 1] + }; + } + } + } else if (text == "\n" || text == "\r\n") { + initContext(editor); + var closing = ""; + if (CstyleBehaviour.isMaybeInsertedClosing(cursor, line)) { + closing = lang.stringRepeat("}", context.maybeInsertedBrackets); + CstyleBehaviour.clearMaybeInsertedClosing(); + } + var rightChar = line.substring(cursor.column, cursor.column + 1); + if (rightChar === '}') { + var openBracePos = session.findMatchingBracket({row: cursor.row, column: cursor.column+1}, '}'); + if (!openBracePos) + return null; + var next_indent = this.$getIndent(session.getLine(openBracePos.row)); + } else if (closing) { + var next_indent = this.$getIndent(line); + } else { + CstyleBehaviour.clearMaybeInsertedClosing(); + return; + } + var indent = next_indent + session.getTabString(); + + return { + text: '\n' + indent + '\n' + next_indent + closing, + selection: [1, indent.length, 1, indent.length] + }; + } else { + CstyleBehaviour.clearMaybeInsertedClosing(); + } + }); + + this.add("braces", "deletion", function(state, action, editor, session, range) { + var selected = session.doc.getTextRange(range); + if (!range.isMultiLine() && selected == '{') { + initContext(editor); + var line = session.doc.getLine(range.start.row); + var rightChar = line.substring(range.end.column, range.end.column + 1); + if (rightChar == '}') { + range.end.column++; + return range; + } else { + context.maybeInsertedBrackets--; + } + } + }); + + this.add("parens", "insertion", function(state, action, editor, session, text) { + if (text == '(') { + initContext(editor); + var selection = editor.getSelectionRange(); + var selected = session.doc.getTextRange(selection); + if (selected !== "" && editor.getWrapBehavioursEnabled()) { + return { + text: '(' + selected + ')', + selection: false + }; + } else if (CstyleBehaviour.isSaneInsertion(editor, session)) { + CstyleBehaviour.recordAutoInsert(editor, session, ")"); + return { + text: '()', + selection: [1, 1] + }; + } + } else if (text == ')') { + initContext(editor); + var cursor = editor.getCursorPosition(); + var line = session.doc.getLine(cursor.row); + var rightChar = line.substring(cursor.column, cursor.column + 1); + if (rightChar == ')') { + var matching = session.$findOpeningBracket(')', {column: cursor.column + 1, row: cursor.row}); + if (matching !== null && CstyleBehaviour.isAutoInsertedClosing(cursor, line, text)) { + CstyleBehaviour.popAutoInsertedClosing(); + return { + text: '', + selection: [1, 1] + }; + } + } + } + }); + + this.add("parens", "deletion", function(state, action, editor, session, range) { + var selected = session.doc.getTextRange(range); + if (!range.isMultiLine() && selected == '(') { + initContext(editor); + var line = session.doc.getLine(range.start.row); + var rightChar = line.substring(range.start.column + 1, range.start.column + 2); + if (rightChar == ')') { + range.end.column++; + return range; + } + } + }); + + this.add("brackets", "insertion", function(state, action, editor, session, text) { + if (text == '[') { + initContext(editor); + var selection = editor.getSelectionRange(); + var selected = session.doc.getTextRange(selection); + if (selected !== "" && editor.getWrapBehavioursEnabled()) { + return { + text: '[' + selected + ']', + selection: false + }; + } else if (CstyleBehaviour.isSaneInsertion(editor, session)) { + CstyleBehaviour.recordAutoInsert(editor, session, "]"); + return { + text: '[]', + selection: [1, 1] + }; + } + } else if (text == ']') { + initContext(editor); + var cursor = editor.getCursorPosition(); + var line = session.doc.getLine(cursor.row); + var rightChar = line.substring(cursor.column, cursor.column + 1); + if (rightChar == ']') { + var matching = session.$findOpeningBracket(']', {column: cursor.column + 1, row: cursor.row}); + if (matching !== null && CstyleBehaviour.isAutoInsertedClosing(cursor, line, text)) { + CstyleBehaviour.popAutoInsertedClosing(); + return { + text: '', + selection: [1, 1] + }; + } + } + } + }); + + this.add("brackets", "deletion", function(state, action, editor, session, range) { + var selected = session.doc.getTextRange(range); + if (!range.isMultiLine() && selected == '[') { + initContext(editor); + var line = session.doc.getLine(range.start.row); + var rightChar = line.substring(range.start.column + 1, range.start.column + 2); + if (rightChar == ']') { + range.end.column++; + return range; + } + } + }); + + this.add("string_dquotes", "insertion", function(state, action, editor, session, text) { + if (text == '"' || text == "'") { + initContext(editor); + var quote = text; + var selection = editor.getSelectionRange(); + var selected = session.doc.getTextRange(selection); + if (selected !== "" && selected !== "'" && selected != '"' && editor.getWrapBehavioursEnabled()) { + return { + text: quote + selected + quote, + selection: false + }; + } else { + var cursor = editor.getCursorPosition(); + var line = session.doc.getLine(cursor.row); + var leftChar = line.substring(cursor.column-1, cursor.column); + if (leftChar == '\\') { + return null; + } + var tokens = session.getTokens(selection.start.row); + var col = 0, token; + var quotepos = -1; // Track whether we're inside an open quote. + + for (var x = 0; x < tokens.length; x++) { + token = tokens[x]; + if (token.type == "string") { + quotepos = -1; + } else if (quotepos < 0) { + quotepos = token.value.indexOf(quote); + } + if ((token.value.length + col) > selection.start.column) { + break; + } + col += tokens[x].value.length; + } + if (!token || (quotepos < 0 && token.type !== "comment" && (token.type !== "string" || ((selection.start.column !== token.value.length+col-1) && token.value.lastIndexOf(quote) === token.value.length-1)))) { + if (!CstyleBehaviour.isSaneInsertion(editor, session)) + return; + return { + text: quote + quote, + selection: [1,1] + }; + } else if (token && token.type === "string") { + var rightChar = line.substring(cursor.column, cursor.column + 1); + if (rightChar == quote) { + return { + text: '', + selection: [1, 1] + }; + } + } + } + } + }); + + this.add("string_dquotes", "deletion", function(state, action, editor, session, range) { + var selected = session.doc.getTextRange(range); + if (!range.isMultiLine() && (selected == '"' || selected == "'")) { + initContext(editor); + var line = session.doc.getLine(range.start.row); + var rightChar = line.substring(range.start.column + 1, range.start.column + 2); + if (rightChar == selected) { + range.end.column++; + return range; + } + } + }); + +}; + + +CstyleBehaviour.isSaneInsertion = function(editor, session) { + var cursor = editor.getCursorPosition(); + var iterator = new TokenIterator(session, cursor.row, cursor.column); + if (!this.$matchTokenType(iterator.getCurrentToken() || "text", SAFE_INSERT_IN_TOKENS)) { + var iterator2 = new TokenIterator(session, cursor.row, cursor.column + 1); + if (!this.$matchTokenType(iterator2.getCurrentToken() || "text", SAFE_INSERT_IN_TOKENS)) + return false; + } + iterator.stepForward(); + return iterator.getCurrentTokenRow() !== cursor.row || + this.$matchTokenType(iterator.getCurrentToken() || "text", SAFE_INSERT_BEFORE_TOKENS); +}; + +CstyleBehaviour.$matchTokenType = function(token, types) { + return types.indexOf(token.type || token) > -1; +}; + +CstyleBehaviour.recordAutoInsert = function(editor, session, bracket) { + var cursor = editor.getCursorPosition(); + var line = session.doc.getLine(cursor.row); + if (!this.isAutoInsertedClosing(cursor, line, context.autoInsertedLineEnd[0])) + context.autoInsertedBrackets = 0; + context.autoInsertedRow = cursor.row; + context.autoInsertedLineEnd = bracket + line.substr(cursor.column); + context.autoInsertedBrackets++; +}; + +CstyleBehaviour.recordMaybeInsert = function(editor, session, bracket) { + var cursor = editor.getCursorPosition(); + var line = session.doc.getLine(cursor.row); + if (!this.isMaybeInsertedClosing(cursor, line)) + context.maybeInsertedBrackets = 0; + context.maybeInsertedRow = cursor.row; + context.maybeInsertedLineStart = line.substr(0, cursor.column) + bracket; + context.maybeInsertedLineEnd = line.substr(cursor.column); + context.maybeInsertedBrackets++; +}; + +CstyleBehaviour.isAutoInsertedClosing = function(cursor, line, bracket) { + return context.autoInsertedBrackets > 0 && + cursor.row === context.autoInsertedRow && + bracket === context.autoInsertedLineEnd[0] && + line.substr(cursor.column) === context.autoInsertedLineEnd; +}; + +CstyleBehaviour.isMaybeInsertedClosing = function(cursor, line) { + return context.maybeInsertedBrackets > 0 && + cursor.row === context.maybeInsertedRow && + line.substr(cursor.column) === context.maybeInsertedLineEnd && + line.substr(0, cursor.column) == context.maybeInsertedLineStart; +}; + +CstyleBehaviour.popAutoInsertedClosing = function() { + context.autoInsertedLineEnd = context.autoInsertedLineEnd.substr(1); + context.autoInsertedBrackets--; +}; + +CstyleBehaviour.clearMaybeInsertedClosing = function() { + if (context) { + context.maybeInsertedBrackets = 0; + context.maybeInsertedRow = -1; + } +}; + + + +oop.inherits(CstyleBehaviour, Behaviour); + +exports.CstyleBehaviour = CstyleBehaviour; +}); + +ace.define('ace/mode/folding/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/range', 'ace/mode/folding/fold_mode'], function(require, exports, module) { + + +var oop = require("../../lib/oop"); +var Range = require("../../range").Range; +var BaseFoldMode = require("./fold_mode").FoldMode; + +var FoldMode = exports.FoldMode = function(commentRegex) { + if (commentRegex) { + this.foldingStartMarker = new RegExp( + this.foldingStartMarker.source.replace(/\|[^|]*?$/, "|" + commentRegex.start) + ); + this.foldingStopMarker = new RegExp( + this.foldingStopMarker.source.replace(/\|[^|]*?$/, "|" + commentRegex.end) + ); + } +}; +oop.inherits(FoldMode, BaseFoldMode); + +(function() { + + this.foldingStartMarker = /(\{|\[)[^\}\]]*$|^\s*(\/\*)/; + this.foldingStopMarker = /^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/; + + this.getFoldWidgetRange = function(session, foldStyle, row, forceMultiline) { + var line = session.getLine(row); + var match = line.match(this.foldingStartMarker); + if (match) { + var i = match.index; + + if (match[1]) + return this.openingBracketBlock(session, match[1], row, i); + + var range = session.getCommentFoldRange(row, i + match[0].length, 1); + + if (range && !range.isMultiLine()) { + if (forceMultiline) { + range = this.getSectionRange(session, row); + } else if (foldStyle != "all") + range = null; + } + + return range; + } + + if (foldStyle === "markbegin") + return; + + var match = line.match(this.foldingStopMarker); + if (match) { + var i = match.index + match[0].length; + + if (match[1]) + return this.closingBracketBlock(session, match[1], row, i); + + return session.getCommentFoldRange(row, i, -1); + } + }; + + this.getSectionRange = function(session, row) { + var line = session.getLine(row); + var startIndent = line.search(/\S/); + var startRow = row; + var startColumn = line.length; + row = row + 1; + var endRow = row; + var maxRow = session.getLength(); + while (++row < maxRow) { + line = session.getLine(row); + var indent = line.search(/\S/); + if (indent === -1) + continue; + if (startIndent > indent) + break; + var subRange = this.getFoldWidgetRange(session, "all", row); + + if (subRange) { + if (subRange.start.row <= startRow) { + break; + } else if (subRange.isMultiLine()) { + row = subRange.end.row; + } else if (startIndent == indent) { + break; + } + } + endRow = row; + } + + return new Range(startRow, startColumn, endRow, session.getLine(endRow).length); + }; + +}).call(FoldMode.prototype); + +}); +ace.define('ace/mode/java_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/doc_comment_highlight_rules', 'ace/mode/text_highlight_rules'], function(require, exports, module) { + + +var oop = require("../lib/oop"); +var DocCommentHighlightRules = require("./doc_comment_highlight_rules").DocCommentHighlightRules; +var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules; + +var JavaHighlightRules = function() { + var keywords = ( + "abstract|continue|for|new|switch|" + + "assert|default|goto|package|synchronized|" + + "boolean|do|if|private|this|" + + "break|double|implements|protected|throw|" + + "byte|else|import|public|throws|" + + "case|enum|instanceof|return|transient|" + + "catch|extends|int|short|try|" + + "char|final|interface|static|void|" + + "class|finally|long|strictfp|volatile|" + + "const|float|native|super|while" + ); + + var buildinConstants = ("null|Infinity|NaN|undefined"); + + + var langClasses = ( + "AbstractMethodError|AssertionError|ClassCircularityError|"+ + "ClassFormatError|Deprecated|EnumConstantNotPresentException|"+ + "ExceptionInInitializerError|IllegalAccessError|"+ + "IllegalThreadStateException|InstantiationError|InternalError|"+ + "NegativeArraySizeException|NoSuchFieldError|Override|Process|"+ + "ProcessBuilder|SecurityManager|StringIndexOutOfBoundsException|"+ + "SuppressWarnings|TypeNotPresentException|UnknownError|"+ + "UnsatisfiedLinkError|UnsupportedClassVersionError|VerifyError|"+ + "InstantiationException|IndexOutOfBoundsException|"+ + "ArrayIndexOutOfBoundsException|CloneNotSupportedException|"+ + "NoSuchFieldException|IllegalArgumentException|NumberFormatException|"+ + "SecurityException|Void|InheritableThreadLocal|IllegalStateException|"+ + "InterruptedException|NoSuchMethodException|IllegalAccessException|"+ + "UnsupportedOperationException|Enum|StrictMath|Package|Compiler|"+ + "Readable|Runtime|StringBuilder|Math|IncompatibleClassChangeError|"+ + "NoSuchMethodError|ThreadLocal|RuntimePermission|ArithmeticException|"+ + "NullPointerException|Long|Integer|Short|Byte|Double|Number|Float|"+ + "Character|Boolean|StackTraceElement|Appendable|StringBuffer|"+ + "Iterable|ThreadGroup|Runnable|Thread|IllegalMonitorStateException|"+ + "StackOverflowError|OutOfMemoryError|VirtualMachineError|"+ + "ArrayStoreException|ClassCastException|LinkageError|"+ + "NoClassDefFoundError|ClassNotFoundException|RuntimeException|"+ + "Exception|ThreadDeath|Error|Throwable|System|ClassLoader|"+ + "Cloneable|Class|CharSequence|Comparable|String|Object" + ); + + var keywordMapper = this.createKeywordMapper({ + "variable.language": "this", + "keyword": keywords, + "constant.language": buildinConstants, + "support.function": langClasses + }, "identifier"); + + this.$rules = { + "start" : [ + { + token : "comment", + regex : "\\/\\/.*$" + }, + DocCommentHighlightRules.getStartRule("doc-start"), + { + token : "comment", // multi line comment + regex : "\\/\\*", + next : "comment" + }, { + token : "string", // single line + regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]' + }, { + token : "string", // single line + regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']" + }, { + token : "constant.numeric", // hex + regex : "0[xX][0-9a-fA-F]+\\b" + }, { + token : "constant.numeric", // float + regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b" + }, { + token : "constant.language.boolean", + regex : "(?:true|false)\\b" + }, { + token : keywordMapper, + regex : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b" + }, { + token : "keyword.operator", + regex : "!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)" + }, { + token : "lparen", + regex : "[[({]" + }, { + token : "rparen", + regex : "[\\])}]" + }, { + token : "text", + regex : "\\s+" + } + ], + "comment" : [ + { + token : "comment", // closing comment + regex : ".*?\\*\\/", + next : "start" + }, { + token : "comment", // comment spanning whole line + regex : ".+" + } + ] + }; + + this.embedRules(DocCommentHighlightRules, "doc-", + [ DocCommentHighlightRules.getEndRule("start") ]); +}; + +oop.inherits(JavaHighlightRules, TextHighlightRules); + +exports.JavaHighlightRules = JavaHighlightRules; +}); \ No newline at end of file diff --git a/tutor/app/assets/javascripts/theme-twilight.js b/tutor/app/assets/javascripts/theme-twilight.js new file mode 100644 index 00000000..53f1480f --- /dev/null +++ b/tutor/app/assets/javascripts/theme-twilight.js @@ -0,0 +1,140 @@ +/* ***** BEGIN LICENSE BLOCK ***** + * Distributed under the BSD license: + * + * Copyright (c) 2010, Ajax.org B.V. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of Ajax.org B.V. nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * ***** END LICENSE BLOCK ***** */ + +ace.define('ace/theme/twilight', ['require', 'exports', 'module' , 'ace/lib/dom'], function(require, exports, module) { + +exports.isDark = true; +exports.cssClass = "ace-twilight"; +exports.cssText = ".ace-twilight .ace_gutter {\ +background: #232323;\ +color: #E2E2E2\ +}\ +.ace-twilight .ace_print-margin {\ +width: 1px;\ +background: #232323\ +}\ +.ace-twilight {\ +background-color: #141414;\ +color: #F8F8F8\ +}\ +.ace-twilight .ace_cursor {\ +color: #A7A7A7\ +}\ +.ace-twilight .ace_marker-layer .ace_selection {\ +background: rgba(221, 240, 255, 0.20)\ +}\ +.ace-twilight.ace_multiselect .ace_selection.ace_start {\ +box-shadow: 0 0 3px 0px #141414;\ +border-radius: 2px\ +}\ +.ace-twilight .ace_marker-layer .ace_step {\ +background: rgb(102, 82, 0)\ +}\ +.ace-twilight .ace_marker-layer .ace_bracket {\ +margin: -1px 0 0 -1px;\ +border: 1px solid rgba(255, 255, 255, 0.25)\ +}\ +.ace-twilight .ace_marker-layer .ace_active-line {\ +background: rgba(255, 255, 255, 0.031)\ +}\ +.ace-twilight .ace_gutter-active-line {\ +background-color: rgba(255, 255, 255, 0.031)\ +}\ +.ace-twilight .ace_marker-layer .ace_selected-word {\ +border: 1px solid rgba(221, 240, 255, 0.20)\ +}\ +.ace-twilight .ace_invisible {\ +color: rgba(255, 255, 255, 0.25)\ +}\ +.ace-twilight .ace_keyword,\ +.ace-twilight .ace_meta {\ +color: #CDA869\ +}\ +.ace-twilight .ace_constant,\ +.ace-twilight .ace_constant.ace_character,\ +.ace-twilight .ace_constant.ace_character.ace_escape,\ +.ace-twilight .ace_constant.ace_other,\ +.ace-twilight .ace_heading,\ +.ace-twilight .ace_markup.ace_heading,\ +.ace-twilight .ace_support.ace_constant {\ +color: #CF6A4C\ +}\ +.ace-twilight .ace_invalid.ace_illegal {\ +color: #F8F8F8;\ +background-color: rgba(86, 45, 86, 0.75)\ +}\ +.ace-twilight .ace_invalid.ace_deprecated {\ +text-decoration: underline;\ +font-style: italic;\ +color: #D2A8A1\ +}\ +.ace-twilight .ace_support {\ +color: #9B859D\ +}\ +.ace-twilight .ace_fold {\ +background-color: #AC885B;\ +border-color: #F8F8F8\ +}\ +.ace-twilight .ace_support.ace_function {\ +color: #DAD085\ +}\ +.ace-twilight .ace_list,\ +.ace-twilight .ace_markup.ace_list,\ +.ace-twilight .ace_storage {\ +color: #F9EE98\ +}\ +.ace-twilight .ace_entity.ace_name.ace_function,\ +.ace-twilight .ace_meta.ace_tag,\ +.ace-twilight .ace_variable {\ +color: #AC885B\ +}\ +.ace-twilight .ace_string {\ +color: #8F9D6A\ +}\ +.ace-twilight .ace_string.ace_regexp {\ +color: #E9C062\ +}\ +.ace-twilight .ace_comment {\ +font-style: italic;\ +color: #5F5A60\ +}\ +.ace-twilight .ace_variable {\ +color: #7587A6\ +}\ +.ace-twilight .ace_xml-pe {\ +color: #494949\ +}\ +.ace-twilight .ace_indent-guide {\ +background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWMQERFpYLC1tf0PAAgOAnPnhxyiAAAAAElFTkSuQmCC) right repeat-y\ +}"; + +var dom = require("../lib/dom"); +dom.importCssString(exports.cssText, exports.cssClass); +}); \ No newline at end of file From 12d08b07afc05a566219bbc6a97a80f0edd34110 Mon Sep 17 00:00:00 2001 From: Khaled Date: Fri, 18 Apr 2014 19:35:00 +0200 Subject: [PATCH 041/938] Issue #216 Finished teaching_assistant registeration --- .../app/controllers/application_controller.rb | 4 +- tutor/app/models/student.rb | 2 +- tutor/app/models/teaching_assistant.rb | 6 ++ .../views/students/registrations/new.html.erb | 2 +- .../registrations/new.html.erb | 57 +++++++++++++++---- 5 files changed, 58 insertions(+), 13 deletions(-) diff --git a/tutor/app/controllers/application_controller.rb b/tutor/app/controllers/application_controller.rb index 80f1c87d..4557f49d 100644 --- a/tutor/app/controllers/application_controller.rb +++ b/tutor/app/controllers/application_controller.rb @@ -21,7 +21,9 @@ def update_sanitized_params } elsif "#{resource_name}" == "teaching_assistant" devise_parameter_sanitizer.for(:sign_up) { - |u| u.permit(:name, :email, :password, :password_confirmation) + |u| u.permit(:name, :email, :password, :password_confirmation, :gender, :dob, + :graduated_from, :graduated_year, :department, :profile_image, + :profile_image_cache) } end end diff --git a/tutor/app/models/student.rb b/tutor/app/models/student.rb index 60cf3697..c95d7021 100644 --- a/tutor/app/models/student.rb +++ b/tutor/app/models/student.rb @@ -10,7 +10,7 @@ class Student < ActiveRecord::Base validates :name, presence: true validates :faculty, presence: true validates :major, presence: true - validates :semester, presence: true, numericality: {only_integer: true, message: "must be a number."} + validates :semester, presence: true, numericality: {only_integer: true, message: "must be a number"} #Relations has_many :solutions, dependent: :destroy diff --git a/tutor/app/models/teaching_assistant.rb b/tutor/app/models/teaching_assistant.rb index 541e789e..798d2acc 100644 --- a/tutor/app/models/teaching_assistant.rb +++ b/tutor/app/models/teaching_assistant.rb @@ -4,7 +4,13 @@ class TeachingAssistant < ActiveRecord::Base devise :database_authenticatable, :registerable, :recoverable, :rememberable, :trackable, :validatable + mount_uploader :profile_image, ProfileImageUploader + #Validations + validates :name, presence: true + validates :graduated_from, presence: true + validates :graduated_year, presence: true, numericality: {only_integer: true, message: "must be a number"} + validates :department, presence: true #Relations has_many :posts, as: :owner, dependent: :destroy diff --git a/tutor/app/views/students/registrations/new.html.erb b/tutor/app/views/students/registrations/new.html.erb index dbb6cca2..26e873dd 100644 --- a/tutor/app/views/students/registrations/new.html.erb +++ b/tutor/app/views/students/registrations/new.html.erb @@ -37,7 +37,7 @@
    - <%= f.text_field :semester, class: "form-control", style: "width:300px", placeholder: "Semester"%> + <%= f.number_field :semester, class: "form-control", style: "width:300px", placeholder: "Semester"%>
    diff --git a/tutor/app/views/teaching_assistants/registrations/new.html.erb b/tutor/app/views/teaching_assistants/registrations/new.html.erb index 305592e1..558d2f0b 100644 --- a/tutor/app/views/teaching_assistants/registrations/new.html.erb +++ b/tutor/app/views/teaching_assistants/registrations/new.html.erb @@ -1,18 +1,55 @@

    Sign up

    + <%= form_for(resource, as: resource_name, url: registration_path(resource_name), :html => {:multipart => true}) do |f| %> + <%= devise_error_messages! %> + +
    + <%= f.email_field :email, autofocus: true, class: "form-control", style: "width:300px", placeholder: "Email"%> +
    -<%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %> - <%= devise_error_messages! %> +
    + <%= f.text_field :name, class: "form-control", style: "width:300px", placeholder: "Name"%> +
    -
    <%= f.label :email %>
    - <%= f.email_field :email, autofocus: true %>
    +
    + <%= f.password_field :password, autocomplete: "off", class:"form-control", style:"width:300px", placeholder:"Password"%> +
    -
    <%= f.label :password %>
    - <%= f.password_field :password, autocomplete: "off" %>
    +
    + <%= f.password_field :password_confirmation, autocomplete: "off", class:"form-control", style:"width:300px",placeholder: "Confirm Password" %> +
    -
    <%= f.label :password_confirmation %>
    - <%= f.password_field :password_confirmation, autocomplete: "off" %>
    +
    + <%= f.label :gender %> + <%= f.select(:gender, [['Male', true], ['Female', false]]) %> +
    -
    <%= f.submit "Sign up" %>
    -<% end %> +
    + <%= f.label :date_of_birth %> + <%= f.date_select :dob, {:start_year => Date.today.year-90, :end_year => Date.today.year} %> +
    + +
    + <%= f.text_field :graduated_from, class: "form-control", style: "width:300px", placeholder: "Graduated From"%> +
    + +
    + <%= f.number_field :graduated_year, class: "form-control", style: "width:300px", placeholder: "Graduation Year"%> +
    + +
    + <%= f.text_field :department, class: "form-control", style: "width:300px", placeholder: "Department"%> +
    + +
    +
    + <%= f.label :profile_image %>
    + <%= image_tag(@teaching_assistant.profile_image_url.to_s) if @teaching_assistant.profile_image? %> + <%= f.file_field :profile_image, {:accept => 'image/png,image/gif,image/jpeg'} %> + <%= f.hidden_field :profile_image_cache %> +
    +
    + +
    <%= f.submit "Sign up", class: "btn btn-success", style: "margin-top:10px" %>
    + <% end %> <%= render "teaching_assistants/shared/links" %> \ No newline at end of file From fdc7f449aa8b8a01d4f2dd2ca487fef2ad5c10d9 Mon Sep 17 00:00:00 2001 From: Rami Khalil Date: Fri, 18 Apr 2014 19:54:10 +0200 Subject: [PATCH 042/938] Added coffeescript method stubs for interactive interface. --- .../assets/javascripts/solutions.js.coffee | 28 +++++++++++++++++++ tutor/app/views/solutions/_new.html.erb | 18 ++++++------ 2 files changed, 37 insertions(+), 9 deletions(-) diff --git a/tutor/app/assets/javascripts/solutions.js.coffee b/tutor/app/assets/javascripts/solutions.js.coffee index e69de29b..830519a2 100644 --- a/tutor/app/assets/javascripts/solutions.js.coffee +++ b/tutor/app/assets/javascripts/solutions.js.coffee @@ -0,0 +1,28 @@ +root = exports ? this + +root.toggleDebug = () -> + $('#debugButton').prop 'hidden', !$('#debugButton').prop 'hidden' + $('#compileButton').prop 'hidden', !$('#compileButton').prop 'hidden' + $('#testButton').prop 'hidden', !$('#testButton').prop 'hidden' + + $('#nextButton').prop 'hidden', !$('#nextButton').prop 'hidden' + $('#previousButton').prop 'hidden', !$('#previousButton').prop 'hidden' + $('#stopButton').prop 'hidden', !$('#stopButton').prop 'hidden' + +root.compile = () -> + alert "Compiling'" + +root.test = () -> + alert "Testing" + +root.debug = () -> + toggleDebug() + +root.next = () -> + alert "Next Step" + +root.previous = () -> + alert "Previous Step" + +root.stop = () -> + toggleDebug() diff --git a/tutor/app/views/solutions/_new.html.erb b/tutor/app/views/solutions/_new.html.erb index e999d5b6..7342e79b 100644 --- a/tutor/app/views/solutions/_new.html.erb +++ b/tutor/app/views/solutions/_new.html.erb @@ -6,9 +6,8 @@ Time spent: 0:00 -<%= form_for :solution, - :url => { :controller => "solutions", :action => "create" }, - :html => {:method => :post} do |f| %> +<%= form_for :solution, url: { controller: 'solutions', action: 'create' }, + html: {method: 'post'} do |f| %> <%= @code = f.text_area :code, placeholder: "Write your code here and then click submit", class: "editor" %> <%= f.hidden_field :problem_id, value: params[:id] %> @@ -16,18 +15,19 @@
    - <%= button_tag 'Compile', id:'compile' %> - <%= button_tag 'Test', id: 'test' %> - <%= button_tag 'Debug', id: 'debug' %> - <%= button_tag 'Previous Step', id: 'previous', disabled: true %> - <%= button_tag 'Next Step', id: 'next', disabled: true %> + <%= button_tag 'Compile', type: 'Button', id:'compileButton', onClick: 'compile()' %> + <%= button_tag 'Test', type: 'Button', id: 'testButton', onClick: 'test()' %> + <%= button_tag 'Start Debugging', type: 'Button', id: 'debugButton', onClick: 'debug()' %> + <%= button_tag 'Previous', type: 'Button', id: 'previousButton', onClick: 'previous()', hidden: true %> + <%= button_tag 'Next', type: 'Button', id: 'nextButton', onClick: 'next()', hidden: true %> + <%= button_tag 'Stop Debugging', type: 'Button', id: 'stopButton', onClick: 'stop()', hidden: true %> Accepted Wrong Answer Runtime Error Compilation Error - <%= f.submit "Submit"%> + <%= f.submit "Submit", confirm: 'Are you sure you want to submit your solution?' %>
    From 038e38591f0006fc7652339961ffef5be48ebb6b Mon Sep 17 00:00:00 2001 From: Mimi Date: Fri, 18 Apr 2014 20:00:13 +0200 Subject: [PATCH 043/938] modify solutions view to create an instance of Ace editor --- tutor/app/assets/stylesheets/solutions.css | 8 ++++++++ tutor/app/views/solutions/_new.html.erb | 18 ++++++++++++++++-- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/tutor/app/assets/stylesheets/solutions.css b/tutor/app/assets/stylesheets/solutions.css index 4a3a4b5c..f37830f0 100644 --- a/tutor/app/assets/stylesheets/solutions.css +++ b/tutor/app/assets/stylesheets/solutions.css @@ -29,4 +29,12 @@ textarea { .presentation_error { display: none; color: blue; +} +#editor { + position: relative; + left:0; + right: 0; + top: 0; + bottom: 0; + height: 20pc; } \ No newline at end of file diff --git a/tutor/app/views/solutions/_new.html.erb b/tutor/app/views/solutions/_new.html.erb index e999d5b6..55b05b00 100644 --- a/tutor/app/views/solutions/_new.html.erb +++ b/tutor/app/views/solutions/_new.html.erb @@ -6,11 +6,14 @@ Time spent: 0:00 + +
    +
    + <%= form_for :solution, :url => { :controller => "solutions", :action => "create" }, :html => {:method => :post} do |f| %> - <%= @code = f.text_area :code, placeholder: "Write your code here and then click submit", - class: "editor" %> + <%= @code = f.hidden_field "code", :id =>'result' %> <%= f.hidden_field :problem_id, value: params[:id] %>
    @@ -37,4 +40,15 @@

    Output response

    + + <% end %> \ No newline at end of file From e6e37809d67fa74025fe1ecaa6435f4f873d6198 Mon Sep 17 00:00:00 2001 From: Rami Khalil Date: Fri, 18 Apr 2014 20:37:52 +0200 Subject: [PATCH 044/938] Modified seeds to fix initial difficulty for tracks. --- tutor/db/seeds.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tutor/db/seeds.rb b/tutor/db/seeds.rb index d2dc1213..41b5e38e 100644 --- a/tutor/db/seeds.rb +++ b/tutor/db/seeds.rb @@ -86,9 +86,9 @@ Problem.create(title:"Problem 3" , description:"This wont be a hard Problem") puts("# -----------------------Tracks---------------------------") - Track.create(title: "Track 1" , difficulty: 1) - Track.create(title: "Track 2" , difficulty: 2) - Track.create(title: "Track 3" , difficulty: 3) + Track.create(title: "Track 1" , difficulty: 0) + Track.create(title: "Track 2" , difficulty: 1) + Track.create(title: "Track 3" , difficulty: 2) puts("# -----------------------Solutions---------------------------") Solution.create(code:"println(My first solution)",length:5,status:3) From bea16815c32e5661fa5a66db44624f56bb5518c0 Mon Sep 17 00:00:00 2001 From: Linsara Date: Fri, 18 Apr 2014 22:58:58 +0200 Subject: [PATCH 045/938] Issue #182 fixed drag&drop functionality Conflicts: tutor/app/views/tracks/index.html.erb tutor/app/views/tracks/show.html.erb --- tutor/app/controllers/tracks_controller.rb | 5 + tutor/app/views/tracks/index.html.erb | 50 ++++++- tutor/app/views/tracks/show.html.erb | 5 + .../assets/javascripts/html.sortable.js | 138 ++++++++++++++++++ 4 files changed, 197 insertions(+), 1 deletion(-) create mode 100644 tutor/vendor/assets/javascripts/html.sortable.js diff --git a/tutor/app/controllers/tracks_controller.rb b/tutor/app/controllers/tracks_controller.rb index d6f8f94f..7ca8e457 100644 --- a/tutor/app/controllers/tracks_controller.rb +++ b/tutor/app/controllers/tracks_controller.rb @@ -17,6 +17,11 @@ def new # id: The id of the topic # Returns: The view of the requested topic # Author: Mussab ElDash + + def index + @tracks= Track.all + end + def show boool = flash[:notice] != "Successfully created..." boool&&=flash[:notice] != "The required Fields are missing" diff --git a/tutor/app/views/tracks/index.html.erb b/tutor/app/views/tracks/index.html.erb index 9348968f..f5116df5 100644 --- a/tutor/app/views/tracks/index.html.erb +++ b/tutor/app/views/tracks/index.html.erb @@ -1,3 +1,4 @@ +<<<<<<< HEAD
      @@ -19,4 +20,51 @@ - \ No newline at end of file + +======= + + + + + +jQuery UI Sortable - Default functionality + + + + + + + + + +
        +<%- @tracks.each do |track| %> +
      • <%= track.title %>
        • +<% end %> +
      + + + + +>>>>>>> de3242e... Issue #182 fixed drag&drop functionality diff --git a/tutor/app/views/tracks/show.html.erb b/tutor/app/views/tracks/show.html.erb index bf98d2fd..8f941ebd 100644 --- a/tutor/app/views/tracks/show.html.erb +++ b/tutor/app/views/tracks/show.html.erb @@ -34,8 +34,13 @@ other buttons only shows an alert -->
    indentation --- tutor/app/views/profile/index.html.erb | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/tutor/app/views/profile/index.html.erb b/tutor/app/views/profile/index.html.erb index e029cba9..0bc76099 100644 --- a/tutor/app/views/profile/index.html.erb +++ b/tutor/app/views/profile/index.html.erb @@ -7,12 +7,14 @@
    +<<<<<<< HEAD <%= button_to "Edit track rating", action: "index" %> +======= + + <%= button_to "Edit Track Rating", action: "index" %> +>>>>>>> de3242e... Issue #182 fixed drag&drop functionality diff --git a/tutor/vendor/assets/javascripts/html.sortable.js b/tutor/vendor/assets/javascripts/html.sortable.js new file mode 100644 index 00000000..51a7fb18 --- /dev/null +++ b/tutor/vendor/assets/javascripts/html.sortable.js @@ -0,0 +1,138 @@ +/* + * HTML5 Sortable jQuery Plugin + * https://github.com/voidberg/html5sortable + * + * Original code copyright 2012 Ali Farhadi. + * This version is mantained by Alexandru Badiu + * + * Thanks to the following contributors: andyburke, bistoco, daemianmack, drskullster, flying-sheep, OscarGodson, Parikshit N. Samant, rodolfospalenza, ssafejava + * + * Released under the MIT license. + */ +'use strict'; + +(function ($) { + var dragging, placeholders = $(); + $.fn.sortable = function (options) { + var method = String(options); + + options = $.extend({ + connectWith: false, + placeholder: null, + dragImage: null + }, options); + + return this.each(function () { + if (method === 'reload') { + $(this).children(options.items).off('dragstart.h5s dragend.h5s selectstart.h5s dragover.h5s dragenter.h5s drop.h5s'); + } + if (/^enable|disable|destroy$/.test(method)) { + var citems = $(this).children($(this).data('items')).attr('draggable', method === 'enable'); + if (method === 'destroy') { + $(this).off('sortupdate'); + citems.add(this).removeData('connectWith items') + .off('dragstart.h5s dragend.h5s selectstart.h5s dragover.h5s dragenter.h5s drop.h5s').off('sortupdate'); + } + return; + } + + var soptions = $(this).data('opts'); + + if (typeof soptions === 'undefined') { + $(this).data('opts', options); + } + else { + options = soptions; + } + + var isHandle, index, items = $(this).children(options.items); + var startParent, newParent; + var placeholder = ( options.placeholder === null ) ? $('<' + (/^ul|ol$/i.test(this.tagName) ? 'li' : 'div') + ' class="sortable-placeholder">') : $(options.placeholder).addClass('sortable-placeholder'); + items.find(options.handle).mousedown(function () { + isHandle = true; + }).mouseup(function () { + isHandle = false; + }); + $(this).data('items', options.items); + placeholders = placeholders.add(placeholder); + if (options.connectWith) { + $(options.connectWith).add(this).data('connectWith', options.connectWith); + } + items.attr('draggable', 'true').on('dragstart.h5s',function (e) { + e.stopImmediatePropagation(); + if (options.handle && !isHandle) { + return false; + } + isHandle = false; + var dt = e.originalEvent.dataTransfer; + dt.effectAllowed = 'move'; + dt.setData('Text', 'dummy'); + + if (options.dragImage && dt.setDragImage) { + dt.setDragImage(options.dragImage, 0, 0); + } + + index = (dragging = $(this)).addClass('sortable-dragging').index(); + startParent = $(this).parent(); + }).on('dragend.h5s',function () { + if (!dragging) { + return; + } + dragging.removeClass('sortable-dragging').show(); + placeholders.detach(); + newParent = $(this).parent(); + if (index !== dragging.index() || startParent !== newParent) { + dragging.parent().triggerHandler('sortupdate', {item: dragging, oldindex: index, startparent: startParent, endparent: newParent}); + } + dragging = null; + }).not('a[href], img').on('selectstart.h5s',function () { + if (options.handle && !isHandle) { + return true; + } + + if (this.dragDrop) { + this.dragDrop(); + } + return false; + }).end().add([this, placeholder]).on('dragover.h5s dragenter.h5s drop.h5s', function (e) { + if (!items.is(dragging) && options.connectWith !== $(dragging).parent().data('connectWith')) { + return true; + } + if (e.type === 'drop') { + e.stopPropagation(); + placeholders.filter(':visible').after(dragging); + dragging.trigger('dragend.h5s'); + return false; + } + e.preventDefault(); + e.originalEvent.dataTransfer.dropEffect = 'move'; + if (items.is(this)) { + var draggingHeight = dragging.outerHeight(), thisHeight = $(this).outerHeight(); + if (options.forcePlaceholderSize) { + placeholder.height(draggingHeight); + } + + // Check if $(this) is bigger than the draggable. If it is, we have to define a dead zone to prevent flickering + if (thisHeight > draggingHeight) { + // Dead zone? + var deadZone = thisHeight - draggingHeight, offsetTop = $(this).offset().top; + if (placeholder.index() < $(this).index() && e.originalEvent.pageY < offsetTop + deadZone) { + return false; + } + else if (placeholder.index() > $(this).index() && e.originalEvent.pageY > offsetTop + thisHeight - deadZone) { + return false; + } + } + + dragging.hide(); + $(this)[placeholder.index() < $(this).index() ? 'after' : 'before'](placeholder); + placeholders.not(placeholder).detach(); + } else if (!placeholders.is(this) && !$(this).children(options.items).length) { + placeholders.detach(); + $(this).append(placeholder); + } + return false; + }); + }); + }; +})($); From 1403dadaff4d005197d1758b928b11eaa07e16e8 Mon Sep 17 00:00:00 2001 From: Khaled Date: Sat, 19 Apr 2014 07:27:22 +0200 Subject: [PATCH 046/938] Issue #216 Fixed layout of lecturer --- .../lecturers/confirmations/new.html.erb | 9 ++++--- .../views/lecturers/passwords/edit.html.erb | 12 +++++---- .../views/lecturers/passwords/new.html.erb | 7 ++--- .../app/views/lecturers/sessions/new.html.erb | 26 +++++++++++++------ .../app/views/lecturers/unlocks/new.html.erb | 9 ++++--- tutor/app/views/site/index.html.erb | 5 ++++ tutor/config/locales/devise.en.yml | 6 ++--- 7 files changed, 47 insertions(+), 27 deletions(-) diff --git a/tutor/app/views/lecturers/confirmations/new.html.erb b/tutor/app/views/lecturers/confirmations/new.html.erb index 896c821a..5df570e4 100644 --- a/tutor/app/views/lecturers/confirmations/new.html.erb +++ b/tutor/app/views/lecturers/confirmations/new.html.erb @@ -1,12 +1,13 @@

    Resend confirmation instructions

    <%= form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f| %> - <%= devise_error_messages! %> + <%= devise_error_messages! %> -
    <%= f.label :email %>
    - <%= f.email_field :email, autofocus: true %>
    +
    + <%= f.email_field :email, autofocus: true, class: "form-control", style: "width:300px", placeholder: "Email"%> +
    -
    <%= f.submit "Resend confirmation instructions" %>
    +
    <%= f.submit "Resend confirmation instructions", class: "btn btn-success", style: "margin-top:10px" %>
    <% end %> <%= render "lecturers/shared/links" %> diff --git a/tutor/app/views/lecturers/passwords/edit.html.erb b/tutor/app/views/lecturers/passwords/edit.html.erb index 3ab4deb8..98cb535f 100644 --- a/tutor/app/views/lecturers/passwords/edit.html.erb +++ b/tutor/app/views/lecturers/passwords/edit.html.erb @@ -4,13 +4,15 @@ <%= devise_error_messages! %> <%= f.hidden_field :reset_password_token %> -
    <%= f.label :password, "New password" %>
    - <%= f.password_field :password, autofocus: true, autocomplete: "off" %>
    +
    + <%= f.password_field :password, autofocus: true, autocomplete: "off", class:"form-control", style:"width:300px", placeholder:"Password"%> +
    -
    <%= f.label :password_confirmation, "Confirm new password" %>
    - <%= f.password_field :password_confirmation, autocomplete: "off" %>
    +
    + <%= f.password_field :password_confirmation, autocomplete: "off", class:"form-control", style:"width:300px",placeholder: "Confirm Password" %> +
    -
    <%= f.submit "Change my password" %>
    +
    <%= f.submit "Change my password", class: "btn btn-success", style: "margin-top:10px" %>
    <% end %> <%= render "lecturers/shared/links" %> diff --git a/tutor/app/views/lecturers/passwords/new.html.erb b/tutor/app/views/lecturers/passwords/new.html.erb index 16789b88..0e457fee 100644 --- a/tutor/app/views/lecturers/passwords/new.html.erb +++ b/tutor/app/views/lecturers/passwords/new.html.erb @@ -3,10 +3,11 @@ <%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %> <%= devise_error_messages! %> -
    <%= f.label :email %>
    - <%= f.email_field :email, autofocus: true %>
    +
    + <%= f.email_field :email, autofocus: true, class: "form-control", style: "width:300px", placeholder: "Email"%> +
    -
    <%= f.submit "Send me reset password instructions" %>
    +
    <%= f.submit "Send me reset password instructions", class: "btn btn-success", style: "margin-top:10px" %>
    <% end %> <%= render "lecturers/shared/links" %> diff --git a/tutor/app/views/lecturers/sessions/new.html.erb b/tutor/app/views/lecturers/sessions/new.html.erb index 72eb9c8e..61537a87 100644 --- a/tutor/app/views/lecturers/sessions/new.html.erb +++ b/tutor/app/views/lecturers/sessions/new.html.erb @@ -1,17 +1,27 @@

    Sign in

    <%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %> -
    <%= f.label :email %>
    - <%= f.email_field :email, autofocus: true %>
    + <% if flash[:alert] %> +
    +
    + <%= flash[:alert] %> +
    +

    + <% end %> -
    <%= f.label :password %>
    - <%= f.password_field :password, autocomplete: "off" %>
    +
    + <%= f.email_field :email, autofocus: true, class: "form-control", style: "width:300px", placeholder: "Email"%> +
    - <% if devise_mapping.rememberable? -%> -
    <%= f.check_box :remember_me %> <%= f.label :remember_me %>
    - <% end -%> +
    + <%= f.password_field :password, autocomplete: "off", class:"form-control", style:"width:300px", placeholder:"Password"%> +
    -
    <%= f.submit "Sign in" %>
    + <% if devise_mapping.rememberable? -%> +
    <%= f.check_box :remember_me %> <%= f.label :remember_me %>
    + <% end -%> + +
    <%= f.submit "Sign in", class: "btn btn-success", style: "margin-top:10px" %>
    <% end %> <%= render "lecturers/shared/links" %> diff --git a/tutor/app/views/lecturers/unlocks/new.html.erb b/tutor/app/views/lecturers/unlocks/new.html.erb index 308bb295..b0a48d1c 100644 --- a/tutor/app/views/lecturers/unlocks/new.html.erb +++ b/tutor/app/views/lecturers/unlocks/new.html.erb @@ -1,12 +1,13 @@

    Resend unlock instructions

    <%= form_for(resource, as: resource_name, url: unlock_path(resource_name), html: { method: :post }) do |f| %> - <%= devise_error_messages! %> + <%= devise_error_messages! %> -
    <%= f.label :email %>
    - <%= f.email_field :email, autofocus: true %>
    +
    + <%= f.email_field :email, autofocus: true, class: "form-control", style: "width:300px", placeholder: "Email"%> +
    -
    <%= f.submit "Resend unlock instructions" %>
    +
    <%= f.submit "Resend unlock instructions", class: "btn btn-success", style: "margin-top:10px" %>
    <% end %> <%= render "lecturers/shared/links" %> diff --git a/tutor/app/views/site/index.html.erb b/tutor/app/views/site/index.html.erb index 47d8fdb4..90b4e6c1 100644 --- a/tutor/app/views/site/index.html.erb +++ b/tutor/app/views/site/index.html.erb @@ -53,6 +53,11 @@ Author: Ahmed Akram --> <% if signed_in? %> + <% if flash[:notice] %> +
    + <%= flash[:notice] %> +
    + <% end %> <%= button_to "My Courses", {:controller => 'courses', :action => 'index'}, class: "btn btn-success", style: "margin-left:auto; margin-right:auto; margin-top: 80px", method: :get %>


    <% if(lecturer_signed_in?) %> diff --git a/tutor/config/locales/devise.en.yml b/tutor/config/locales/devise.en.yml index abccdb08..bb64a7d4 100644 --- a/tutor/config/locales/devise.en.yml +++ b/tutor/config/locales/devise.en.yml @@ -18,11 +18,11 @@ en: unconfirmed: "You have to confirm your account before continuing." mailer: confirmation_instructions: - subject: "Confirmation instructions" + subject: "Coolsoft - Confirmation instructions" reset_password_instructions: - subject: "Reset password instructions" + subject: "Coolsoft - Reset password instructions" unlock_instructions: - subject: "Unlock Instructions" + subject: "Coolsoft - Unlock Instructions" omniauth_callbacks: failure: "Could not authenticate you from %{kind} because \"%{reason}\"." success: "Successfully authenticated from %{kind} account." From e386270b7a3d882fb8586e19e707443f3f1ac949 Mon Sep 17 00:00:00 2001 From: Khaled Date: Sat, 19 Apr 2014 07:30:57 +0200 Subject: [PATCH 047/938] Issue #216 Fixed layout of student --- .../views/students/confirmations/new.html.erb | 9 ++++--- .../views/students/passwords/edit.html.erb | 12 +++++---- .../app/views/students/passwords/new.html.erb | 7 ++--- .../app/views/students/sessions/new.html.erb | 26 +++++++++++++------ tutor/app/views/students/unlocks/new.html.erb | 9 ++++--- 5 files changed, 39 insertions(+), 24 deletions(-) diff --git a/tutor/app/views/students/confirmations/new.html.erb b/tutor/app/views/students/confirmations/new.html.erb index 7d4c997d..a30f26cd 100644 --- a/tutor/app/views/students/confirmations/new.html.erb +++ b/tutor/app/views/students/confirmations/new.html.erb @@ -1,12 +1,13 @@

    Resend confirmation instructions

    <%= form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f| %> - <%= devise_error_messages! %> + <%= devise_error_messages! %> -
    <%= f.label :email %>
    - <%= f.email_field :email, autofocus: true %>
    +
    + <%= f.email_field :email, autofocus: true, class: "form-control", style: "width:300px", placeholder: "Email"%> +
    -
    <%= f.submit "Resend confirmation instructions" %>
    +
    <%= f.submit "Resend confirmation instructions", class: "btn btn-success", style: "margin-top:10px" %>
    <% end %> <%= render "students/shared/links" %> \ No newline at end of file diff --git a/tutor/app/views/students/passwords/edit.html.erb b/tutor/app/views/students/passwords/edit.html.erb index d302a497..11633403 100644 --- a/tutor/app/views/students/passwords/edit.html.erb +++ b/tutor/app/views/students/passwords/edit.html.erb @@ -4,13 +4,15 @@ <%= devise_error_messages! %> <%= f.hidden_field :reset_password_token %> -
    <%= f.label :password, "New password" %>
    - <%= f.password_field :password, autofocus: true, autocomplete: "off" %>
    +
    + <%= f.password_field :password, autofocus: true, autocomplete: "off", class:"form-control", style:"width:300px", placeholder:"Password"%> +
    -
    <%= f.label :password_confirmation, "Confirm new password" %>
    - <%= f.password_field :password_confirmation, autocomplete: "off" %>
    +
    + <%= f.password_field :password_confirmation, autocomplete: "off", class:"form-control", style:"width:300px",placeholder: "Confirm Password" %> +
    -
    <%= f.submit "Change my password" %>
    +
    <%= f.submit "Change my password", class: "btn btn-success", style: "margin-top:10px" %>
    <% end %> <%= render "students/shared/links" %> \ No newline at end of file diff --git a/tutor/app/views/students/passwords/new.html.erb b/tutor/app/views/students/passwords/new.html.erb index b17da591..db3fbf09 100644 --- a/tutor/app/views/students/passwords/new.html.erb +++ b/tutor/app/views/students/passwords/new.html.erb @@ -3,10 +3,11 @@ <%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %> <%= devise_error_messages! %> -
    <%= f.label :email %>
    - <%= f.email_field :email, autofocus: true %>
    +
    + <%= f.email_field :email, autofocus: true, class: "form-control", style: "width:300px", placeholder: "Email"%> +
    -
    <%= f.submit "Send me reset password instructions" %>
    +
    <%= f.submit "Send me reset password instructions", class: "btn btn-success", style: "margin-top:10px" %>
    <% end %> <%= render "students/shared/links" %> \ No newline at end of file diff --git a/tutor/app/views/students/sessions/new.html.erb b/tutor/app/views/students/sessions/new.html.erb index 9f99178a..5e1cf2d7 100644 --- a/tutor/app/views/students/sessions/new.html.erb +++ b/tutor/app/views/students/sessions/new.html.erb @@ -1,17 +1,27 @@

    Sign in

    <%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %> -
    <%= f.label :email %>
    - <%= f.email_field :email, autofocus: true %>
    + <% if flash[:alert] %> +
    +
    + <%= flash[:alert] %> +
    +

    + <% end %> -
    <%= f.label :password %>
    - <%= f.password_field :password, autocomplete: "off" %>
    +
    + <%= f.email_field :email, autofocus: true, class: "form-control", style: "width:300px", placeholder: "Email"%> +
    - <% if devise_mapping.rememberable? -%> -
    <%= f.check_box :remember_me %> <%= f.label :remember_me %>
    - <% end -%> +
    + <%= f.password_field :password, autocomplete: "off", class:"form-control", style:"width:300px", placeholder:"Password"%> +
    -
    <%= f.submit "Sign in" %>
    + <% if devise_mapping.rememberable? -%> +
    <%= f.check_box :remember_me %> <%= f.label :remember_me %>
    + <% end -%> + +
    <%= f.submit "Sign in", class: "btn btn-success", style: "margin-top:10px" %>
    <% end %> <%= render "students/shared/links" %> \ No newline at end of file diff --git a/tutor/app/views/students/unlocks/new.html.erb b/tutor/app/views/students/unlocks/new.html.erb index 32583423..f13e8c20 100644 --- a/tutor/app/views/students/unlocks/new.html.erb +++ b/tutor/app/views/students/unlocks/new.html.erb @@ -1,12 +1,13 @@

    Resend unlock instructions

    <%= form_for(resource, as: resource_name, url: unlock_path(resource_name), html: { method: :post }) do |f| %> - <%= devise_error_messages! %> + <%= devise_error_messages! %> -
    <%= f.label :email %>
    - <%= f.email_field :email, autofocus: true %>
    +
    + <%= f.email_field :email, autofocus: true, class: "form-control", style: "width:300px", placeholder: "Email"%> +
    -
    <%= f.submit "Resend unlock instructions" %>
    +
    <%= f.submit "Resend unlock instructions", class: "btn btn-success", style: "margin-top:10px" %>
    <% end %> <%= render "students/shared/links" %> \ No newline at end of file From 703d1dc2279b5d2bd1773b94213c8e27aa37739c Mon Sep 17 00:00:00 2001 From: Khaled Date: Sat, 19 Apr 2014 07:33:56 +0200 Subject: [PATCH 048/938] Issue #216 Fixed layout of teaching_assistant --- .../confirmations/new.html.erb | 9 ++++--- .../passwords/edit.html.erb | 12 +++++---- .../passwords/new.html.erb | 7 ++--- .../teaching_assistants/sessions/new.html.erb | 26 +++++++++++++------ .../teaching_assistants/unlocks/new.html.erb | 9 ++++--- 5 files changed, 39 insertions(+), 24 deletions(-) diff --git a/tutor/app/views/teaching_assistants/confirmations/new.html.erb b/tutor/app/views/teaching_assistants/confirmations/new.html.erb index f6b80b4d..94b266c0 100644 --- a/tutor/app/views/teaching_assistants/confirmations/new.html.erb +++ b/tutor/app/views/teaching_assistants/confirmations/new.html.erb @@ -1,12 +1,13 @@

    Resend confirmation instructions

    <%= form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f| %> - <%= devise_error_messages! %> + <%= devise_error_messages! %> -
    <%= f.label :email %>
    - <%= f.email_field :email, autofocus: true %>
    +
    + <%= f.email_field :email, autofocus: true, class: "form-control", style: "width:300px", placeholder: "Email"%> +
    -
    <%= f.submit "Resend confirmation instructions" %>
    +
    <%= f.submit "Resend confirmation instructions", class: "btn btn-success", style: "margin-top:10px" %>
    <% end %> <%= render "teaching_assistants/shared/links" %> \ No newline at end of file diff --git a/tutor/app/views/teaching_assistants/passwords/edit.html.erb b/tutor/app/views/teaching_assistants/passwords/edit.html.erb index 3477cbc0..aa9b5cb0 100644 --- a/tutor/app/views/teaching_assistants/passwords/edit.html.erb +++ b/tutor/app/views/teaching_assistants/passwords/edit.html.erb @@ -4,13 +4,15 @@ <%= devise_error_messages! %> <%= f.hidden_field :reset_password_token %> -
    <%= f.label :password, "New password" %>
    - <%= f.password_field :password, autofocus: true, autocomplete: "off" %>
    +
    + <%= f.password_field :password, autofocus: true, autocomplete: "off", class:"form-control", style:"width:300px", placeholder:"Password"%> +
    -
    <%= f.label :password_confirmation, "Confirm new password" %>
    - <%= f.password_field :password_confirmation, autocomplete: "off" %>
    +
    + <%= f.password_field :password_confirmation, autocomplete: "off", class:"form-control", style:"width:300px",placeholder: "Confirm Password" %> +
    -
    <%= f.submit "Change my password" %>
    +
    <%= f.submit "Change my password", class: "btn btn-success", style: "margin-top:10px" %>
    <% end %> <%= render "teaching_assistants/shared/links" %> \ No newline at end of file diff --git a/tutor/app/views/teaching_assistants/passwords/new.html.erb b/tutor/app/views/teaching_assistants/passwords/new.html.erb index db32ee64..8544e455 100644 --- a/tutor/app/views/teaching_assistants/passwords/new.html.erb +++ b/tutor/app/views/teaching_assistants/passwords/new.html.erb @@ -3,10 +3,11 @@ <%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %> <%= devise_error_messages! %> -
    <%= f.label :email %>
    - <%= f.email_field :email, autofocus: true %>
    +
    + <%= f.email_field :email, autofocus: true, class: "form-control", style: "width:300px", placeholder: "Email"%> +
    -
    <%= f.submit "Send me reset password instructions" %>
    +
    <%= f.submit "Send me reset password instructions", class: "btn btn-success", style: "margin-top:10px" %>
    <% end %> <%= render "teaching_assistants/shared/links" %> \ No newline at end of file diff --git a/tutor/app/views/teaching_assistants/sessions/new.html.erb b/tutor/app/views/teaching_assistants/sessions/new.html.erb index de1d04f4..d9727994 100644 --- a/tutor/app/views/teaching_assistants/sessions/new.html.erb +++ b/tutor/app/views/teaching_assistants/sessions/new.html.erb @@ -1,17 +1,27 @@

    Sign in

    <%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %> -
    <%= f.label :email %>
    - <%= f.email_field :email, autofocus: true %>
    + <% if flash[:alert] %> +
    +
    + <%= flash[:alert] %> +
    +

    + <% end %> -
    <%= f.label :password %>
    - <%= f.password_field :password, autocomplete: "off" %>
    +
    + <%= f.email_field :email, autofocus: true, class: "form-control", style: "width:300px", placeholder: "Email"%> +
    - <% if devise_mapping.rememberable? -%> -
    <%= f.check_box :remember_me %> <%= f.label :remember_me %>
    - <% end -%> +
    + <%= f.password_field :password, autocomplete: "off", class:"form-control", style:"width:300px", placeholder:"Password"%> +
    -
    <%= f.submit "Sign in" %>
    + <% if devise_mapping.rememberable? -%> +
    <%= f.check_box :remember_me %> <%= f.label :remember_me %>
    + <% end -%> + +
    <%= f.submit "Sign in", class: "btn btn-success", style: "margin-top:10px" %>
    <% end %> <%= render "teaching_assistants/shared/links" %> \ No newline at end of file diff --git a/tutor/app/views/teaching_assistants/unlocks/new.html.erb b/tutor/app/views/teaching_assistants/unlocks/new.html.erb index fcb5ac32..467f3d09 100644 --- a/tutor/app/views/teaching_assistants/unlocks/new.html.erb +++ b/tutor/app/views/teaching_assistants/unlocks/new.html.erb @@ -1,12 +1,13 @@

    Resend unlock instructions

    <%= form_for(resource, as: resource_name, url: unlock_path(resource_name), html: { method: :post }) do |f| %> - <%= devise_error_messages! %> + <%= devise_error_messages! %> -
    <%= f.label :email %>
    - <%= f.email_field :email, autofocus: true %>
    +
    + <%= f.email_field :email, autofocus: true, class: "form-control", style: "width:300px", placeholder: "Email"%> +
    -
    <%= f.submit "Resend unlock instructions" %>
    +
    <%= f.submit "Resend unlock instructions", class: "btn btn-success", style: "margin-top:10px" %>
    <% end %> <%= render "teaching_assistants/shared/links" %> \ No newline at end of file From 4134014e0a403bd08802d4d88e4f3054c50aa10d Mon Sep 17 00:00:00 2001 From: Khaled Date: Sat, 19 Apr 2014 08:24:00 +0200 Subject: [PATCH 049/938] Issue #216 Fixed validations of name and number fields --- tutor/app/models/lecturer.rb | 1 + tutor/app/models/student.rb | 3 ++- tutor/app/models/teaching_assistant.rb | 4 +++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/tutor/app/models/lecturer.rb b/tutor/app/models/lecturer.rb index 563a2f96..8a71a4bf 100644 --- a/tutor/app/models/lecturer.rb +++ b/tutor/app/models/lecturer.rb @@ -8,6 +8,7 @@ class Lecturer < ActiveRecord::Base #Validations validates :name, presence: true + validates_format_of :name, :with => /\A[^0-9`!@#\$%\^&*+_=]+\z/ validates :degree, presence: true validates :department, presence: true diff --git a/tutor/app/models/student.rb b/tutor/app/models/student.rb index c95d7021..daa1b216 100644 --- a/tutor/app/models/student.rb +++ b/tutor/app/models/student.rb @@ -8,9 +8,10 @@ class Student < ActiveRecord::Base #Validations validates :name, presence: true + validates_format_of :name, :with => /\A[^0-9`!@#\$%\^&*+_=]+\z/ validates :faculty, presence: true validates :major, presence: true - validates :semester, presence: true, numericality: {only_integer: true, message: "must be a number"} + validates :semester, presence: true, numericality: {only_integer: true, greater_than: 0, less_than: 11} #Relations has_many :solutions, dependent: :destroy diff --git a/tutor/app/models/teaching_assistant.rb b/tutor/app/models/teaching_assistant.rb index 798d2acc..1a30c6bf 100644 --- a/tutor/app/models/teaching_assistant.rb +++ b/tutor/app/models/teaching_assistant.rb @@ -8,8 +8,10 @@ class TeachingAssistant < ActiveRecord::Base #Validations validates :name, presence: true + validates_format_of :name, :with => /\A[^0-9`!@#\$%\^&*+_=]+\z/ validates :graduated_from, presence: true - validates :graduated_year, presence: true, numericality: {only_integer: true, message: "must be a number"} + validates :graduated_year, presence: true, numericality: {only_integer: true, + greater_than_or_equal_to: Date.today.year-90, less_than_or_equal_to: Date.today.year} validates :department, presence: true #Relations From 7393be82143f6f020661b11f9828cce8d0ef5c93 Mon Sep 17 00:00:00 2001 From: Khaled Date: Sat, 19 Apr 2014 08:35:10 +0200 Subject: [PATCH 050/938] Issue #216 Fixed validations of degree and number fields --- tutor/app/models/lecturer.rb | 3 ++- tutor/app/models/student.rb | 4 ++-- tutor/app/models/teaching_assistant.rb | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/tutor/app/models/lecturer.rb b/tutor/app/models/lecturer.rb index 8a71a4bf..15996534 100644 --- a/tutor/app/models/lecturer.rb +++ b/tutor/app/models/lecturer.rb @@ -8,8 +8,9 @@ class Lecturer < ActiveRecord::Base #Validations validates :name, presence: true - validates_format_of :name, :with => /\A[^0-9`!@#\$%\^&*+_=]+\z/ + validates_format_of :name, :with => /\A[^0-9`!@#\$%\^&*+_=]+\z|\A\z/ validates :degree, presence: true + validates_format_of :degree, :with => /\A[^0-9`!@#\$%\^&*+_=]+\z|\A\z/ validates :department, presence: true #Relations diff --git a/tutor/app/models/student.rb b/tutor/app/models/student.rb index daa1b216..dd8f9fd6 100644 --- a/tutor/app/models/student.rb +++ b/tutor/app/models/student.rb @@ -8,10 +8,10 @@ class Student < ActiveRecord::Base #Validations validates :name, presence: true - validates_format_of :name, :with => /\A[^0-9`!@#\$%\^&*+_=]+\z/ + validates_format_of :name, :with => /\A[^0-9`!@#\$%\^&*+_=]+\z|\A\z/ validates :faculty, presence: true validates :major, presence: true - validates :semester, presence: true, numericality: {only_integer: true, greater_than: 0, less_than: 11} + validates :semester, presence: false, numericality: {only_integer: true, greater_than: 0, less_than: 11} #Relations has_many :solutions, dependent: :destroy diff --git a/tutor/app/models/teaching_assistant.rb b/tutor/app/models/teaching_assistant.rb index 1a30c6bf..f3d4a104 100644 --- a/tutor/app/models/teaching_assistant.rb +++ b/tutor/app/models/teaching_assistant.rb @@ -8,9 +8,9 @@ class TeachingAssistant < ActiveRecord::Base #Validations validates :name, presence: true - validates_format_of :name, :with => /\A[^0-9`!@#\$%\^&*+_=]+\z/ + validates_format_of :name, :with => /\A[^0-9`!@#\$%\^&*+_=]+\z|\A\z/ validates :graduated_from, presence: true - validates :graduated_year, presence: true, numericality: {only_integer: true, + validates :graduated_year, presence: false, numericality: {only_integer: true, greater_than_or_equal_to: Date.today.year-90, less_than_or_equal_to: Date.today.year} validates :department, presence: true From 14f8b5cc15da0bc29d73c2269220ad3e8211684c Mon Sep 17 00:00:00 2001 From: Khaled Date: Sat, 19 Apr 2014 09:08:25 +0200 Subject: [PATCH 051/938] Issue #216 Fixed validations of duplicate emails across tables --- tutor/app/models/lecturer.rb | 8 ++++++-- tutor/app/models/student.rb | 9 +++++++-- tutor/app/models/teaching_assistant.rb | 8 ++++++-- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/tutor/app/models/lecturer.rb b/tutor/app/models/lecturer.rb index 15996534..e1107ba3 100644 --- a/tutor/app/models/lecturer.rb +++ b/tutor/app/models/lecturer.rb @@ -7,6 +7,7 @@ class Lecturer < ActiveRecord::Base mount_uploader :profile_image, ProfileImageUploader #Validations + validate :duplicate_email validates :name, presence: true validates_format_of :name, :with => /\A[^0-9`!@#\$%\^&*+_=]+\z|\A\z/ validates :degree, presence: true @@ -30,8 +31,11 @@ class Lecturer < ActiveRecord::Base has_many :test_cases, as: :owner has_many :hints, as: :owner - #Scoops - #Methods + def duplicate_email + if Student.find_by email: email or TeachingAssistant.find_by email: email + errors.add(:email, "has already been taken") + end + end end diff --git a/tutor/app/models/student.rb b/tutor/app/models/student.rb index dd8f9fd6..68d01d9c 100644 --- a/tutor/app/models/student.rb +++ b/tutor/app/models/student.rb @@ -7,6 +7,7 @@ class Student < ActiveRecord::Base mount_uploader :profile_image, ProfileImageUploader #Validations + validate :duplicate_email validates :name, presence: true validates_format_of :name, :with => /\A[^0-9`!@#\$%\^&*+_=]+\z|\A\z/ validates :faculty, presence: true @@ -23,10 +24,14 @@ class Student < ActiveRecord::Base has_many :recommended_problems, class_name: 'Problem', through: :recommendations, source: :problem has_and_belongs_to_many :courses, join_table: 'courses_students' - - #Scoops #Methods + def duplicate_email + if Lecturer.find_by email: email or TeachingAssistant.find_by email: email + errors.add(:email, "has already been taken") + end + end + # [Find Recommendations - Story 3.9] # Returns a suggested problem to solve for this user # Parameters: None diff --git a/tutor/app/models/teaching_assistant.rb b/tutor/app/models/teaching_assistant.rb index f3d4a104..5b313511 100644 --- a/tutor/app/models/teaching_assistant.rb +++ b/tutor/app/models/teaching_assistant.rb @@ -7,6 +7,7 @@ class TeachingAssistant < ActiveRecord::Base mount_uploader :profile_image, ProfileImageUploader #Validations + validate :duplicate_email validates :name, presence: true validates_format_of :name, :with => /\A[^0-9`!@#\$%\^&*+_=]+\z|\A\z/ validates :graduated_from, presence: true @@ -29,8 +30,11 @@ class TeachingAssistant < ActiveRecord::Base has_many :test_cases, as: :owner has_many :hints, as: :ownert - #Scoops - #Methods + def duplicate_email + if Student.find_by email: email or Lecturer.find_by email: email + errors.add(:email, "has already been taken") + end + end end From 24b87ba321b188e2e6410f3b1c07282e9a065141 Mon Sep 17 00:00:00 2001 From: Linsara Date: Sat, 19 Apr 2014 14:11:36 +0200 Subject: [PATCH 052/938] Issue #182 used a new plugin for the drag&drop 'tablednd' and used 'acts_as_list' gem --- tutor/Gemfile | 1 + tutor/Gemfile.lock | 3 + tutor/app/assets/stylesheets/style.css | 1 + tutor/app/controllers/tracks_controller.rb | 32 +- tutor/app/models/track.rb | 3 +- tutor/app/views/tracks/index.html.erb | 88 +- tutor/app/views/tracks/show.html.erb | 6 +- tutor/config/routes.rb | 4 +- .../assets/javascripts/html.sortable.js | 138 - .../vendor/assets/javascripts/jquery-2.1.0.js | 9111 +++++++++++++++++ .../assets/javascripts/jquery.sortable.js | 81 - .../assets/javascripts/jquery.sortable.min.js | 3 - .../javascripts/jquery.tablednd.0.6.min.js | 1 + .../assets/javascripts/jquery.tablednd.js | 664 ++ 14 files changed, 9827 insertions(+), 309 deletions(-) create mode 100644 tutor/app/assets/stylesheets/style.css delete mode 100644 tutor/vendor/assets/javascripts/html.sortable.js create mode 100644 tutor/vendor/assets/javascripts/jquery-2.1.0.js delete mode 100644 tutor/vendor/assets/javascripts/jquery.sortable.js delete mode 100644 tutor/vendor/assets/javascripts/jquery.sortable.min.js create mode 100644 tutor/vendor/assets/javascripts/jquery.tablednd.0.6.min.js create mode 100644 tutor/vendor/assets/javascripts/jquery.tablednd.js diff --git a/tutor/Gemfile b/tutor/Gemfile index 703e1ea5..4d105f52 100644 --- a/tutor/Gemfile +++ b/tutor/Gemfile @@ -53,5 +53,6 @@ gem 'foreman' gem 'composite_primary_keys', '~> 6.0.1' # +gem 'acts_as_list' diff --git a/tutor/Gemfile.lock b/tutor/Gemfile.lock index fa0d2aac..b3b19568 100644 --- a/tutor/Gemfile.lock +++ b/tutor/Gemfile.lock @@ -25,6 +25,8 @@ GEM multi_json (~> 1.3) thread_safe (~> 0.1) tzinfo (~> 0.3.37) + acts_as_list (0.4.0) + activerecord (>= 3.0) arel (4.0.2) atomic (1.1.16) bcrypt (3.1.7) @@ -131,6 +133,7 @@ PLATFORMS ruby DEPENDENCIES + acts_as_list coffee-rails (~> 4.0.0) composite_primary_keys (~> 6.0.1) devise diff --git a/tutor/app/assets/stylesheets/style.css b/tutor/app/assets/stylesheets/style.css new file mode 100644 index 00000000..8578dc19 --- /dev/null +++ b/tutor/app/assets/stylesheets/style.css @@ -0,0 +1 @@ +.handle:hover{cursor: move;} \ No newline at end of file diff --git a/tutor/app/controllers/tracks_controller.rb b/tutor/app/controllers/tracks_controller.rb index 7ca8e457..44207aae 100644 --- a/tutor/app/controllers/tracks_controller.rb +++ b/tutor/app/controllers/tracks_controller.rb @@ -1,10 +1,5 @@ class TracksController < ApplicationController - - def index - @tracks = Track.all - end - def new @track = Track.new() end @@ -84,18 +79,19 @@ def permitCreate params.require(:Track).permit(:topic_id , :title , :difficulty) end - ##def sort - # @topic = Topic.find(params[:id]) - # @Topic.tracks.each do | track | - # track.difficulty = params["list-of-tracks"].index(f.id.to_s)+1 - # f.save - # end - #end + #Lin + def index + @tracks = Track.order('tracks.difficulty ASC') + end + + #Lin + def sort + Track.all.each do |track| + if difficulty = params[:tracks].index(track.id.to_s) + track.update_attribute(:difficulty, difficulty + 1) unless track.difficulty == difficulty + 1 + end + end + render :nothing => true, :status => 200 + end - def sort - params[:tracks].each_with_index do |id, index| - Track.update_all([โ€™difficulty=?โ€™, index+1], [โ€™id=?โ€™, id]) - end - render :nothing => true - end end \ No newline at end of file diff --git a/tutor/app/models/track.rb b/tutor/app/models/track.rb index 8542e90d..117a1a88 100644 --- a/tutor/app/models/track.rb +++ b/tutor/app/models/track.rb @@ -1,5 +1,7 @@ class Track < ActiveRecord::Base + acts_as_list :scope => :topic + default_scope :order => :difficulty #Validations validates :difficulty, presence: true @@ -14,5 +16,4 @@ class Track < ActiveRecord::Base #Scoops #Methods - end diff --git a/tutor/app/views/tracks/index.html.erb b/tutor/app/views/tracks/index.html.erb index f5116df5..4abc3c7f 100644 --- a/tutor/app/views/tracks/index.html.erb +++ b/tutor/app/views/tracks/index.html.erb @@ -1,70 +1,34 @@ -<<<<<<< HEAD - -
      - <%- @tracks.each do |track| %> - -
    • <%= track.title %>
      • - - <% end %> -
    -<%= javascript_include_tag 'jquery.sortable.js' %> - - - - - - - - - - -======= - - - - - -jQuery UI Sortable - Default functionality - - - - - - - -
      -<%- @tracks.each do |track| %> -
    • <%= track.title %>
      • -<% end %> -
    - + + <%- @tracks.each do |track| %> + + <% end %> +
    <%= track.title %>
    + - ->>>>>>> de3242e... Issue #182 fixed drag&drop functionality diff --git a/tutor/app/views/tracks/show.html.erb b/tutor/app/views/tracks/show.html.erb index 8f941ebd..5ea6d7b4 100644 --- a/tutor/app/views/tracks/show.html.erb +++ b/tutor/app/views/tracks/show.html.erb @@ -34,13 +34,9 @@ other buttons only shows an alert -->     		-<<<<<<< HEAD - <%= button_to "Edit track rating", action: "index" %> -======= <%= button_to "Edit Track Rating", action: "index" %> ->>>>>>> de3242e... Issue #182 fixed drag&drop functionality + diff --git a/tutor/config/routes.rb b/tutor/config/routes.rb index 74dba6ca..d8495d32 100644 --- a/tutor/config/routes.rb +++ b/tutor/config/routes.rb @@ -8,11 +8,13 @@ # You can have the root of your site routed with "root" - resources :tracks, :collection => { :sort => :post} + #resources :tracks, :collection => { :sort => :post} + root 'site#index' resources :tracks do post 'getProblems', on: :member + post :sort, on: :collection end resources :problems_by_tas resources :solutions diff --git a/tutor/vendor/assets/javascripts/html.sortable.js b/tutor/vendor/assets/javascripts/html.sortable.js deleted file mode 100644 index 51a7fb18..00000000 --- a/tutor/vendor/assets/javascripts/html.sortable.js +++ /dev/null @@ -1,138 +0,0 @@ -/* - * HTML5 Sortable jQuery Plugin - * https://github.com/voidberg/html5sortable - * - * Original code copyright 2012 Ali Farhadi. - * This version is mantained by Alexandru Badiu - * - * Thanks to the following contributors: andyburke, bistoco, daemianmack, drskullster, flying-sheep, OscarGodson, Parikshit N. Samant, rodolfospalenza, ssafejava - * - * Released under the MIT license. - */ -'use strict'; - -(function ($) { - var dragging, placeholders = $(); - $.fn.sortable = function (options) { - var method = String(options); - - options = $.extend({ - connectWith: false, - placeholder: null, - dragImage: null - }, options); - - return this.each(function () { - if (method === 'reload') { - $(this).children(options.items).off('dragstart.h5s dragend.h5s selectstart.h5s dragover.h5s dragenter.h5s drop.h5s'); - } - if (/^enable|disable|destroy$/.test(method)) { - var citems = $(this).children($(this).data('items')).attr('draggable', method === 'enable'); - if (method === 'destroy') { - $(this).off('sortupdate'); - citems.add(this).removeData('connectWith items') - .off('dragstart.h5s dragend.h5s selectstart.h5s dragover.h5s dragenter.h5s drop.h5s').off('sortupdate'); - } - return; - } - - var soptions = $(this).data('opts'); - - if (typeof soptions === 'undefined') { - $(this).data('opts', options); - } - else { - options = soptions; - } - - var isHandle, index, items = $(this).children(options.items); - var startParent, newParent; - var placeholder = ( options.placeholder === null ) ? $('<' + (/^ul|ol$/i.test(this.tagName) ? 'li' : 'div') + ' class="sortable-placeholder">') : $(options.placeholder).addClass('sortable-placeholder'); - items.find(options.handle).mousedown(function () { - isHandle = true; - }).mouseup(function () { - isHandle = false; - }); - $(this).data('items', options.items); - placeholders = placeholders.add(placeholder); - if (options.connectWith) { - $(options.connectWith).add(this).data('connectWith', options.connectWith); - } - items.attr('draggable', 'true').on('dragstart.h5s',function (e) { - e.stopImmediatePropagation(); - if (options.handle && !isHandle) { - return false; - } - isHandle = false; - var dt = e.originalEvent.dataTransfer; - dt.effectAllowed = 'move'; - dt.setData('Text', 'dummy'); - - if (options.dragImage && dt.setDragImage) { - dt.setDragImage(options.dragImage, 0, 0); - } - - index = (dragging = $(this)).addClass('sortable-dragging').index(); - startParent = $(this).parent(); - }).on('dragend.h5s',function () { - if (!dragging) { - return; - } - dragging.removeClass('sortable-dragging').show(); - placeholders.detach(); - newParent = $(this).parent(); - if (index !== dragging.index() || startParent !== newParent) { - dragging.parent().triggerHandler('sortupdate', {item: dragging, oldindex: index, startparent: startParent, endparent: newParent}); - } - dragging = null; - }).not('a[href], img').on('selectstart.h5s',function () { - if (options.handle && !isHandle) { - return true; - } - - if (this.dragDrop) { - this.dragDrop(); - } - return false; - }).end().add([this, placeholder]).on('dragover.h5s dragenter.h5s drop.h5s', function (e) { - if (!items.is(dragging) && options.connectWith !== $(dragging).parent().data('connectWith')) { - return true; - } - if (e.type === 'drop') { - e.stopPropagation(); - placeholders.filter(':visible').after(dragging); - dragging.trigger('dragend.h5s'); - return false; - } - e.preventDefault(); - e.originalEvent.dataTransfer.dropEffect = 'move'; - if (items.is(this)) { - var draggingHeight = dragging.outerHeight(), thisHeight = $(this).outerHeight(); - if (options.forcePlaceholderSize) { - placeholder.height(draggingHeight); - } - - // Check if $(this) is bigger than the draggable. If it is, we have to define a dead zone to prevent flickering - if (thisHeight > draggingHeight) { - // Dead zone? - var deadZone = thisHeight - draggingHeight, offsetTop = $(this).offset().top; - if (placeholder.index() < $(this).index() && e.originalEvent.pageY < offsetTop + deadZone) { - return false; - } - else if (placeholder.index() > $(this).index() && e.originalEvent.pageY > offsetTop + thisHeight - deadZone) { - return false; - } - } - - dragging.hide(); - $(this)[placeholder.index() < $(this).index() ? 'after' : 'before'](placeholder); - placeholders.not(placeholder).detach(); - } else if (!placeholders.is(this) && !$(this).children(options.items).length) { - placeholders.detach(); - $(this).append(placeholder); - } - return false; - }); - }); - }; -})($); diff --git a/tutor/vendor/assets/javascripts/jquery-2.1.0.js b/tutor/vendor/assets/javascripts/jquery-2.1.0.js new file mode 100644 index 00000000..f7f42277 --- /dev/null +++ b/tutor/vendor/assets/javascripts/jquery-2.1.0.js @@ -0,0 +1,9111 @@ +/*! + * jQuery JavaScript Library v2.1.0 + * http://jquery.com/ + * + * Includes Sizzle.js + * http://sizzlejs.com/ + * + * Copyright 2005, 2014 jQuery Foundation, Inc. and other contributors + * Released under the MIT license + * http://jquery.org/license + * + * Date: 2014-01-23T21:10Z + */ + +(function( global, factory ) { + + if ( typeof module === "object" && typeof module.exports === "object" ) { + // For CommonJS and CommonJS-like environments where a proper window is present, + // execute the factory and get jQuery + // For environments that do not inherently posses a window with a document + // (such as Node.js), expose a jQuery-making factory as module.exports + // This accentuates the need for the creation of a real window + // e.g. var jQuery = require("jquery")(window); + // See ticket #14549 for more info + module.exports = global.document ? + factory( global, true ) : + function( w ) { + if ( !w.document ) { + throw new Error( "jQuery requires a window with a document" ); + } + return factory( w ); + }; + } else { + factory( global ); + } + +// Pass this if window is not defined yet +}(typeof window !== "undefined" ? window : this, function( window, noGlobal ) { + +// Can't do this because several apps including ASP.NET trace +// the stack via arguments.caller.callee and Firefox dies if +// you try to trace through "use strict" call chains. (#13335) +// Support: Firefox 18+ +// + +var arr = []; + +var slice = arr.slice; + +var concat = arr.concat; + +var push = arr.push; + +var indexOf = arr.indexOf; + +var class2type = {}; + +var toString = class2type.toString; + +var hasOwn = class2type.hasOwnProperty; + +var trim = "".trim; + +var support = {}; + + + +var + // Use the correct document accordingly with window argument (sandbox) + document = window.document, + + version = "2.1.0", + + // Define a local copy of jQuery + jQuery = function( selector, context ) { + // The jQuery object is actually just the init constructor 'enhanced' + // Need init if jQuery is called (just allow error to be thrown if not included) + return new jQuery.fn.init( selector, context ); + }, + + // Matches dashed string for camelizing + rmsPrefix = /^-ms-/, + rdashAlpha = /-([\da-z])/gi, + + // Used by jQuery.camelCase as callback to replace() + fcamelCase = function( all, letter ) { + return letter.toUpperCase(); + }; + +jQuery.fn = jQuery.prototype = { + // The current version of jQuery being used + jquery: version, + + constructor: jQuery, + + // Start with an empty selector + selector: "", + + // The default length of a jQuery object is 0 + length: 0, + + toArray: function() { + return slice.call( this ); + }, + + // Get the Nth element in the matched element set OR + // Get the whole matched element set as a clean array + get: function( num ) { + return num != null ? + + // Return a 'clean' array + ( num < 0 ? this[ num + this.length ] : this[ num ] ) : + + // Return just the object + slice.call( this ); + }, + + // Take an array of elements and push it onto the stack + // (returning the new matched element set) + pushStack: function( elems ) { + + // Build a new jQuery matched element set + var ret = jQuery.merge( this.constructor(), elems ); + + // Add the old object onto the stack (as a reference) + ret.prevObject = this; + ret.context = this.context; + + // Return the newly-formed element set + return ret; + }, + + // Execute a callback for every element in the matched set. + // (You can seed the arguments with an array of args, but this is + // only used internally.) + each: function( callback, args ) { + return jQuery.each( this, callback, args ); + }, + + map: function( callback ) { + return this.pushStack( jQuery.map(this, function( elem, i ) { + return callback.call( elem, i, elem ); + })); + }, + + slice: function() { + return this.pushStack( slice.apply( this, arguments ) ); + }, + + first: function() { + return this.eq( 0 ); + }, + + last: function() { + return this.eq( -1 ); + }, + + eq: function( i ) { + var len = this.length, + j = +i + ( i < 0 ? len : 0 ); + return this.pushStack( j >= 0 && j < len ? [ this[j] ] : [] ); + }, + + end: function() { + return this.prevObject || this.constructor(null); + }, + + // For internal use only. + // Behaves like an Array's method, not like a jQuery method. + push: push, + sort: arr.sort, + splice: arr.splice +}; + +jQuery.extend = jQuery.fn.extend = function() { + var options, name, src, copy, copyIsArray, clone, + target = arguments[0] || {}, + i = 1, + length = arguments.length, + deep = false; + + // Handle a deep copy situation + if ( typeof target === "boolean" ) { + deep = target; + + // skip the boolean and the target + target = arguments[ i ] || {}; + i++; + } + + // Handle case when target is a string or something (possible in deep copy) + if ( typeof target !== "object" && !jQuery.isFunction(target) ) { + target = {}; + } + + // extend jQuery itself if only one argument is passed + if ( i === length ) { + target = this; + i--; + } + + for ( ; i < length; i++ ) { + // Only deal with non-null/undefined values + if ( (options = arguments[ i ]) != null ) { + // Extend the base object + for ( name in options ) { + src = target[ name ]; + copy = options[ name ]; + + // Prevent never-ending loop + if ( target === copy ) { + continue; + } + + // Recurse if we're merging plain objects or arrays + if ( deep && copy && ( jQuery.isPlainObject(copy) || (copyIsArray = jQuery.isArray(copy)) ) ) { + if ( copyIsArray ) { + copyIsArray = false; + clone = src && jQuery.isArray(src) ? src : []; + + } else { + clone = src && jQuery.isPlainObject(src) ? src : {}; + } + + // Never move original objects, clone them + target[ name ] = jQuery.extend( deep, clone, copy ); + + // Don't bring in undefined values + } else if ( copy !== undefined ) { + target[ name ] = copy; + } + } + } + } + + // Return the modified object + return target; +}; + +jQuery.extend({ + // Unique for each copy of jQuery on the page + expando: "jQuery" + ( version + Math.random() ).replace( /\D/g, "" ), + + // Assume jQuery is ready without the ready module + isReady: true, + + error: function( msg ) { + throw new Error( msg ); + }, + + noop: function() {}, + + // See test/unit/core.js for details concerning isFunction. + // Since version 1.3, DOM methods and functions like alert + // aren't supported. They return false on IE (#2968). + isFunction: function( obj ) { + return jQuery.type(obj) === "function"; + }, + + isArray: Array.isArray, + + isWindow: function( obj ) { + return obj != null && obj === obj.window; + }, + + isNumeric: function( obj ) { + // parseFloat NaNs numeric-cast false positives (null|true|false|"") + // ...but misinterprets leading-number strings, particularly hex literals ("0x...") + // subtraction forces infinities to NaN + return obj - parseFloat( obj ) >= 0; + }, + + isPlainObject: function( obj ) { + // Not plain objects: + // - Any object or value whose internal [[Class]] property is not "[object Object]" + // - DOM nodes + // - window + if ( jQuery.type( obj ) !== "object" || obj.nodeType || jQuery.isWindow( obj ) ) { + return false; + } + + // Support: Firefox <20 + // The try/catch suppresses exceptions thrown when attempting to access + // the "constructor" property of certain host objects, ie. |window.location| + // https://bugzilla.mozilla.org/show_bug.cgi?id=814622 + try { + if ( obj.constructor && + !hasOwn.call( obj.constructor.prototype, "isPrototypeOf" ) ) { + return false; + } + } catch ( e ) { + return false; + } + + // If the function hasn't returned already, we're confident that + // |obj| is a plain object, created by {} or constructed with new Object + return true; + }, + + isEmptyObject: function( obj ) { + var name; + for ( name in obj ) { + return false; + } + return true; + }, + + type: function( obj ) { + if ( obj == null ) { + return obj + ""; + } + // Support: Android < 4.0, iOS < 6 (functionish RegExp) + return typeof obj === "object" || typeof obj === "function" ? + class2type[ toString.call(obj) ] || "object" : + typeof obj; + }, + + // Evaluates a script in a global context + globalEval: function( code ) { + var script, + indirect = eval; + + code = jQuery.trim( code ); + + if ( code ) { + // If the code includes a valid, prologue position + // strict mode pragma, execute code by injecting a + // script tag into the document. + if ( code.indexOf("use strict") === 1 ) { + script = document.createElement("script"); + script.text = code; + document.head.appendChild( script ).parentNode.removeChild( script ); + } else { + // Otherwise, avoid the DOM node creation, insertion + // and removal by using an indirect global eval + indirect( code ); + } + } + }, + + // Convert dashed to camelCase; used by the css and data modules + // Microsoft forgot to hump their vendor prefix (#9572) + camelCase: function( string ) { + return string.replace( rmsPrefix, "ms-" ).replace( rdashAlpha, fcamelCase ); + }, + + nodeName: function( elem, name ) { + return elem.nodeName && elem.nodeName.toLowerCase() === name.toLowerCase(); + }, + + // args is for internal usage only + each: function( obj, callback, args ) { + var value, + i = 0, + length = obj.length, + isArray = isArraylike( obj ); + + if ( args ) { + if ( isArray ) { + for ( ; i < length; i++ ) { + value = callback.apply( obj[ i ], args ); + + if ( value === false ) { + break; + } + } + } else { + for ( i in obj ) { + value = callback.apply( obj[ i ], args ); + + if ( value === false ) { + break; + } + } + } + + // A special, fast, case for the most common use of each + } else { + if ( isArray ) { + for ( ; i < length; i++ ) { + value = callback.call( obj[ i ], i, obj[ i ] ); + + if ( value === false ) { + break; + } + } + } else { + for ( i in obj ) { + value = callback.call( obj[ i ], i, obj[ i ] ); + + if ( value === false ) { + break; + } + } + } + } + + return obj; + }, + + trim: function( text ) { + return text == null ? "" : trim.call( text ); + }, + + // results is for internal usage only + makeArray: function( arr, results ) { + var ret = results || []; + + if ( arr != null ) { + if ( isArraylike( Object(arr) ) ) { + jQuery.merge( ret, + typeof arr === "string" ? + [ arr ] : arr + ); + } else { + push.call( ret, arr ); + } + } + + return ret; + }, + + inArray: function( elem, arr, i ) { + return arr == null ? -1 : indexOf.call( arr, elem, i ); + }, + + merge: function( first, second ) { + var len = +second.length, + j = 0, + i = first.length; + + for ( ; j < len; j++ ) { + first[ i++ ] = second[ j ]; + } + + first.length = i; + + return first; + }, + + grep: function( elems, callback, invert ) { + var callbackInverse, + matches = [], + i = 0, + length = elems.length, + callbackExpect = !invert; + + // Go through the array, only saving the items + // that pass the validator function + for ( ; i < length; i++ ) { + callbackInverse = !callback( elems[ i ], i ); + if ( callbackInverse !== callbackExpect ) { + matches.push( elems[ i ] ); + } + } + + return matches; + }, + + // arg is for internal usage only + map: function( elems, callback, arg ) { + var value, + i = 0, + length = elems.length, + isArray = isArraylike( elems ), + ret = []; + + // Go through the array, translating each of the items to their new values + if ( isArray ) { + for ( ; i < length; i++ ) { + value = callback( elems[ i ], i, arg ); + + if ( value != null ) { + ret.push( value ); + } + } + + // Go through every key on the object, + } else { + for ( i in elems ) { + value = callback( elems[ i ], i, arg ); + + if ( value != null ) { + ret.push( value ); + } + } + } + + // Flatten any nested arrays + return concat.apply( [], ret ); + }, + + // A global GUID counter for objects + guid: 1, + + // Bind a function to a context, optionally partially applying any + // arguments. + proxy: function( fn, context ) { + var tmp, args, proxy; + + if ( typeof context === "string" ) { + tmp = fn[ context ]; + context = fn; + fn = tmp; + } + + // Quick check to determine if target is callable, in the spec + // this throws a TypeError, but we will just return undefined. + if ( !jQuery.isFunction( fn ) ) { + return undefined; + } + + // Simulated bind + args = slice.call( arguments, 2 ); + proxy = function() { + return fn.apply( context || this, args.concat( slice.call( arguments ) ) ); + }; + + // Set the guid of unique handler to the same of original handler, so it can be removed + proxy.guid = fn.guid = fn.guid || jQuery.guid++; + + return proxy; + }, + + now: Date.now, + + // jQuery.support is not used in Core but other projects attach their + // properties to it so it needs to exist. + support: support +}); + +// Populate the class2type map +jQuery.each("Boolean Number String Function Array Date RegExp Object Error".split(" "), function(i, name) { + class2type[ "[object " + name + "]" ] = name.toLowerCase(); +}); + +function isArraylike( obj ) { + var length = obj.length, + type = jQuery.type( obj ); + + if ( type === "function" || jQuery.isWindow( obj ) ) { + return false; + } + + if ( obj.nodeType === 1 && length ) { + return true; + } + + return type === "array" || length === 0 || + typeof length === "number" && length > 0 && ( length - 1 ) in obj; +} +var Sizzle = +/*! + * Sizzle CSS Selector Engine v1.10.16 + * http://sizzlejs.com/ + * + * Copyright 2013 jQuery Foundation, Inc. and other contributors + * Released under the MIT license + * http://jquery.org/license + * + * Date: 2014-01-13 + */ +(function( window ) { + +var i, + support, + Expr, + getText, + isXML, + compile, + outermostContext, + sortInput, + hasDuplicate, + + // Local document vars + setDocument, + document, + docElem, + documentIsHTML, + rbuggyQSA, + rbuggyMatches, + matches, + contains, + + // Instance-specific data + expando = "sizzle" + -(new Date()), + preferredDoc = window.document, + dirruns = 0, + done = 0, + classCache = createCache(), + tokenCache = createCache(), + compilerCache = createCache(), + sortOrder = function( a, b ) { + if ( a === b ) { + hasDuplicate = true; + } + return 0; + }, + + // General-purpose constants + strundefined = typeof undefined, + MAX_NEGATIVE = 1 << 31, + + // Instance methods + hasOwn = ({}).hasOwnProperty, + arr = [], + pop = arr.pop, + push_native = arr.push, + push = arr.push, + slice = arr.slice, + // Use a stripped-down indexOf if we can't use a native one + indexOf = arr.indexOf || function( elem ) { + var i = 0, + len = this.length; + for ( ; i < len; i++ ) { + if ( this[i] === elem ) { + return i; + } + } + return -1; + }, + + booleans = "checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped", + + // Regular expressions + + // Whitespace characters http://www.w3.org/TR/css3-selectors/#whitespace + whitespace = "[\\x20\\t\\r\\n\\f]", + // http://www.w3.org/TR/css3-syntax/#characters + characterEncoding = "(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+", + + // Loosely modeled on CSS identifier characters + // An unquoted value should be a CSS identifier http://www.w3.org/TR/css3-selectors/#attribute-selectors + // Proper syntax: http://www.w3.org/TR/CSS21/syndata.html#value-def-identifier + identifier = characterEncoding.replace( "w", "w#" ), + + // Acceptable operators http://www.w3.org/TR/selectors/#attribute-selectors + attributes = "\\[" + whitespace + "*(" + characterEncoding + ")" + whitespace + + "*(?:([*^$|!~]?=)" + whitespace + "*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|(" + identifier + ")|)|)" + whitespace + "*\\]", + + // Prefer arguments quoted, + // then not containing pseudos/brackets, + // then attribute selectors/non-parenthetical expressions, + // then anything else + // These preferences are here to reduce the number of selectors + // needing tokenize in the PSEUDO preFilter + pseudos = ":(" + characterEncoding + ")(?:\\(((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|" + attributes.replace( 3, 8 ) + ")*)|.*)\\)|)", + + // Leading and non-escaped trailing whitespace, capturing some non-whitespace characters preceding the latter + rtrim = new RegExp( "^" + whitespace + "+|((?:^|[^\\\\])(?:\\\\.)*)" + whitespace + "+$", "g" ), + + rcomma = new RegExp( "^" + whitespace + "*," + whitespace + "*" ), + rcombinators = new RegExp( "^" + whitespace + "*([>+~]|" + whitespace + ")" + whitespace + "*" ), + + rattributeQuotes = new RegExp( "=" + whitespace + "*([^\\]'\"]*?)" + whitespace + "*\\]", "g" ), + + rpseudo = new RegExp( pseudos ), + ridentifier = new RegExp( "^" + identifier + "$" ), + + matchExpr = { + "ID": new RegExp( "^#(" + characterEncoding + ")" ), + "CLASS": new RegExp( "^\\.(" + characterEncoding + ")" ), + "TAG": new RegExp( "^(" + characterEncoding.replace( "w", "w*" ) + ")" ), + "ATTR": new RegExp( "^" + attributes ), + "PSEUDO": new RegExp( "^" + pseudos ), + "CHILD": new RegExp( "^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\(" + whitespace + + "*(even|odd|(([+-]|)(\\d*)n|)" + whitespace + "*(?:([+-]|)" + whitespace + + "*(\\d+)|))" + whitespace + "*\\)|)", "i" ), + "bool": new RegExp( "^(?:" + booleans + ")$", "i" ), + // For use in libraries implementing .is() + // We use this for POS matching in `select` + "needsContext": new RegExp( "^" + whitespace + "*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\(" + + whitespace + "*((?:-\\d)?\\d*)" + whitespace + "*\\)|)(?=[^-]|$)", "i" ) + }, + + rinputs = /^(?:input|select|textarea|button)$/i, + rheader = /^h\d$/i, + + rnative = /^[^{]+\{\s*\[native \w/, + + // Easily-parseable/retrievable ID or TAG or CLASS selectors + rquickExpr = /^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/, + + rsibling = /[+~]/, + rescape = /'|\\/g, + + // CSS escapes http://www.w3.org/TR/CSS21/syndata.html#escaped-characters + runescape = new RegExp( "\\\\([\\da-f]{1,6}" + whitespace + "?|(" + whitespace + ")|.)", "ig" ), + funescape = function( _, escaped, escapedWhitespace ) { + var high = "0x" + escaped - 0x10000; + // NaN means non-codepoint + // Support: Firefox + // Workaround erroneous numeric interpretation of +"0x" + return high !== high || escapedWhitespace ? + escaped : + high < 0 ? + // BMP codepoint + String.fromCharCode( high + 0x10000 ) : + // Supplemental Plane codepoint (surrogate pair) + String.fromCharCode( high >> 10 | 0xD800, high & 0x3FF | 0xDC00 ); + }; + +// Optimize for push.apply( _, NodeList ) +try { + push.apply( + (arr = slice.call( preferredDoc.childNodes )), + preferredDoc.childNodes + ); + // Support: Android<4.0 + // Detect silently failing push.apply + arr[ preferredDoc.childNodes.length ].nodeType; +} catch ( e ) { + push = { apply: arr.length ? + + // Leverage slice if possible + function( target, els ) { + push_native.apply( target, slice.call(els) ); + } : + + // Support: IE<9 + // Otherwise append directly + function( target, els ) { + var j = target.length, + i = 0; + // Can't trust NodeList.length + while ( (target[j++] = els[i++]) ) {} + target.length = j - 1; + } + }; +} + +function Sizzle( selector, context, results, seed ) { + var match, elem, m, nodeType, + // QSA vars + i, groups, old, nid, newContext, newSelector; + + if ( ( context ? context.ownerDocument || context : preferredDoc ) !== document ) { + setDocument( context ); + } + + context = context || document; + results = results || []; + + if ( !selector || typeof selector !== "string" ) { + return results; + } + + if ( (nodeType = context.nodeType) !== 1 && nodeType !== 9 ) { + return []; + } + + if ( documentIsHTML && !seed ) { + + // Shortcuts + if ( (match = rquickExpr.exec( selector )) ) { + // Speed-up: Sizzle("#ID") + if ( (m = match[1]) ) { + if ( nodeType === 9 ) { + elem = context.getElementById( m ); + // Check parentNode to catch when Blackberry 4.6 returns + // nodes that are no longer in the document (jQuery #6963) + if ( elem && elem.parentNode ) { + // Handle the case where IE, Opera, and Webkit return items + // by name instead of ID + if ( elem.id === m ) { + results.push( elem ); + return results; + } + } else { + return results; + } + } else { + // Context is not a document + if ( context.ownerDocument && (elem = context.ownerDocument.getElementById( m )) && + contains( context, elem ) && elem.id === m ) { + results.push( elem ); + return results; + } + } + + // Speed-up: Sizzle("TAG") + } else if ( match[2] ) { + push.apply( results, context.getElementsByTagName( selector ) ); + return results; + + // Speed-up: Sizzle(".CLASS") + } else if ( (m = match[3]) && support.getElementsByClassName && context.getElementsByClassName ) { + push.apply( results, context.getElementsByClassName( m ) ); + return results; + } + } + + // QSA path + if ( support.qsa && (!rbuggyQSA || !rbuggyQSA.test( selector )) ) { + nid = old = expando; + newContext = context; + newSelector = nodeType === 9 && selector; + + // qSA works strangely on Element-rooted queries + // We can work around this by specifying an extra ID on the root + // and working up from there (Thanks to Andrew Dupont for the technique) + // IE 8 doesn't work on object elements + if ( nodeType === 1 && context.nodeName.toLowerCase() !== "object" ) { + groups = tokenize( selector ); + + if ( (old = context.getAttribute("id")) ) { + nid = old.replace( rescape, "\\$&" ); + } else { + context.setAttribute( "id", nid ); + } + nid = "[id='" + nid + "'] "; + + i = groups.length; + while ( i-- ) { + groups[i] = nid + toSelector( groups[i] ); + } + newContext = rsibling.test( selector ) && testContext( context.parentNode ) || context; + newSelector = groups.join(","); + } + + if ( newSelector ) { + try { + push.apply( results, + newContext.querySelectorAll( newSelector ) + ); + return results; + } catch(qsaError) { + } finally { + if ( !old ) { + context.removeAttribute("id"); + } + } + } + } + } + + // All others + return select( selector.replace( rtrim, "$1" ), context, results, seed ); +} + +/** + * Create key-value caches of limited size + * @returns {Function(string, Object)} Returns the Object data after storing it on itself with + * property name the (space-suffixed) string and (if the cache is larger than Expr.cacheLength) + * deleting the oldest entry + */ +function createCache() { + var keys = []; + + function cache( key, value ) { + // Use (key + " ") to avoid collision with native prototype properties (see Issue #157) + if ( keys.push( key + " " ) > Expr.cacheLength ) { + // Only keep the most recent entries + delete cache[ keys.shift() ]; + } + return (cache[ key + " " ] = value); + } + return cache; +} + +/** + * Mark a function for special use by Sizzle + * @param {Function} fn The function to mark + */ +function markFunction( fn ) { + fn[ expando ] = true; + return fn; +} + +/** + * Support testing using an element + * @param {Function} fn Passed the created div and expects a boolean result + */ +function assert( fn ) { + var div = document.createElement("div"); + + try { + return !!fn( div ); + } catch (e) { + return false; + } finally { + // Remove from its parent by default + if ( div.parentNode ) { + div.parentNode.removeChild( div ); + } + // release memory in IE + div = null; + } +} + +/** + * Adds the same handler for all of the specified attrs + * @param {String} attrs Pipe-separated list of attributes + * @param {Function} handler The method that will be applied + */ +function addHandle( attrs, handler ) { + var arr = attrs.split("|"), + i = attrs.length; + + while ( i-- ) { + Expr.attrHandle[ arr[i] ] = handler; + } +} + +/** + * Checks document order of two siblings + * @param {Element} a + * @param {Element} b + * @returns {Number} Returns less than 0 if a precedes b, greater than 0 if a follows b + */ +function siblingCheck( a, b ) { + var cur = b && a, + diff = cur && a.nodeType === 1 && b.nodeType === 1 && + ( ~b.sourceIndex || MAX_NEGATIVE ) - + ( ~a.sourceIndex || MAX_NEGATIVE ); + + // Use IE sourceIndex if available on both nodes + if ( diff ) { + return diff; + } + + // Check if b follows a + if ( cur ) { + while ( (cur = cur.nextSibling) ) { + if ( cur === b ) { + return -1; + } + } + } + + return a ? 1 : -1; +} + +/** + * Returns a function to use in pseudos for input types + * @param {String} type + */ +function createInputPseudo( type ) { + return function( elem ) { + var name = elem.nodeName.toLowerCase(); + return name === "input" && elem.type === type; + }; +} + +/** + * Returns a function to use in pseudos for buttons + * @param {String} type + */ +function createButtonPseudo( type ) { + return function( elem ) { + var name = elem.nodeName.toLowerCase(); + return (name === "input" || name === "button") && elem.type === type; + }; +} + +/** + * Returns a function to use in pseudos for positionals + * @param {Function} fn + */ +function createPositionalPseudo( fn ) { + return markFunction(function( argument ) { + argument = +argument; + return markFunction(function( seed, matches ) { + var j, + matchIndexes = fn( [], seed.length, argument ), + i = matchIndexes.length; + + // Match elements found at the specified indexes + while ( i-- ) { + if ( seed[ (j = matchIndexes[i]) ] ) { + seed[j] = !(matches[j] = seed[j]); + } + } + }); + }); +} + +/** + * Checks a node for validity as a Sizzle context + * @param {Element|Object=} context + * @returns {Element|Object|Boolean} The input node if acceptable, otherwise a falsy value + */ +function testContext( context ) { + return context && typeof context.getElementsByTagName !== strundefined && context; +} + +// Expose support vars for convenience +support = Sizzle.support = {}; + +/** + * Detects XML nodes + * @param {Element|Object} elem An element or a document + * @returns {Boolean} True iff elem is a non-HTML XML node + */ +isXML = Sizzle.isXML = function( elem ) { + // documentElement is verified for cases where it doesn't yet exist + // (such as loading iframes in IE - #4833) + var documentElement = elem && (elem.ownerDocument || elem).documentElement; + return documentElement ? documentElement.nodeName !== "HTML" : false; +}; + +/** + * Sets document-related variables once based on the current document + * @param {Element|Object} [doc] An element or document object to use to set the document + * @returns {Object} Returns the current document + */ +setDocument = Sizzle.setDocument = function( node ) { + var hasCompare, + doc = node ? node.ownerDocument || node : preferredDoc, + parent = doc.defaultView; + + // If no document and documentElement is available, return + if ( doc === document || doc.nodeType !== 9 || !doc.documentElement ) { + return document; + } + + // Set our document + document = doc; + docElem = doc.documentElement; + + // Support tests + documentIsHTML = !isXML( doc ); + + // Support: IE>8 + // If iframe document is assigned to "document" variable and if iframe has been reloaded, + // IE will throw "permission denied" error when accessing "document" variable, see jQuery #13936 + // IE6-8 do not support the defaultView property so parent will be undefined + if ( parent && parent !== parent.top ) { + // IE11 does not have attachEvent, so all must suffer + if ( parent.addEventListener ) { + parent.addEventListener( "unload", function() { + setDocument(); + }, false ); + } else if ( parent.attachEvent ) { + parent.attachEvent( "onunload", function() { + setDocument(); + }); + } + } + + /* Attributes + ---------------------------------------------------------------------- */ + + // Support: IE<8 + // Verify that getAttribute really returns attributes and not properties (excepting IE8 booleans) + support.attributes = assert(function( div ) { + div.className = "i"; + return !div.getAttribute("className"); + }); + + /* getElement(s)By* + ---------------------------------------------------------------------- */ + + // Check if getElementsByTagName("*") returns only elements + support.getElementsByTagName = assert(function( div ) { + div.appendChild( doc.createComment("") ); + return !div.getElementsByTagName("*").length; + }); + + // Check if getElementsByClassName can be trusted + support.getElementsByClassName = rnative.test( doc.getElementsByClassName ) && assert(function( div ) { + div.innerHTML = "
    "; + + // Support: Safari<4 + // Catch class over-caching + div.firstChild.className = "i"; + // Support: Opera<10 + // Catch gEBCN failure to find non-leading classes + return div.getElementsByClassName("i").length === 2; + }); + + // Support: IE<10 + // Check if getElementById returns elements by name + // The broken getElementById methods don't pick up programatically-set names, + // so use a roundabout getElementsByName test + support.getById = assert(function( div ) { + docElem.appendChild( div ).id = expando; + return !doc.getElementsByName || !doc.getElementsByName( expando ).length; + }); + + // ID find and filter + if ( support.getById ) { + Expr.find["ID"] = function( id, context ) { + if ( typeof context.getElementById !== strundefined && documentIsHTML ) { + var m = context.getElementById( id ); + // Check parentNode to catch when Blackberry 4.6 returns + // nodes that are no longer in the document #6963 + return m && m.parentNode ? [m] : []; + } + }; + Expr.filter["ID"] = function( id ) { + var attrId = id.replace( runescape, funescape ); + return function( elem ) { + return elem.getAttribute("id") === attrId; + }; + }; + } else { + // Support: IE6/7 + // getElementById is not reliable as a find shortcut + delete Expr.find["ID"]; + + Expr.filter["ID"] = function( id ) { + var attrId = id.replace( runescape, funescape ); + return function( elem ) { + var node = typeof elem.getAttributeNode !== strundefined && elem.getAttributeNode("id"); + return node && node.value === attrId; + }; + }; + } + + // Tag + Expr.find["TAG"] = support.getElementsByTagName ? + function( tag, context ) { + if ( typeof context.getElementsByTagName !== strundefined ) { + return context.getElementsByTagName( tag ); + } + } : + function( tag, context ) { + var elem, + tmp = [], + i = 0, + results = context.getElementsByTagName( tag ); + + // Filter out possible comments + if ( tag === "*" ) { + while ( (elem = results[i++]) ) { + if ( elem.nodeType === 1 ) { + tmp.push( elem ); + } + } + + return tmp; + } + return results; + }; + + // Class + Expr.find["CLASS"] = support.getElementsByClassName && function( className, context ) { + if ( typeof context.getElementsByClassName !== strundefined && documentIsHTML ) { + return context.getElementsByClassName( className ); + } + }; + + /* QSA/matchesSelector + ---------------------------------------------------------------------- */ + + // QSA and matchesSelector support + + // matchesSelector(:active) reports false when true (IE9/Opera 11.5) + rbuggyMatches = []; + + // qSa(:focus) reports false when true (Chrome 21) + // We allow this because of a bug in IE8/9 that throws an error + // whenever `document.activeElement` is accessed on an iframe + // So, we allow :focus to pass through QSA all the time to avoid the IE error + // See http://bugs.jquery.com/ticket/13378 + rbuggyQSA = []; + + if ( (support.qsa = rnative.test( doc.querySelectorAll )) ) { + // Build QSA regex + // Regex strategy adopted from Diego Perini + assert(function( div ) { + // Select is set to empty string on purpose + // This is to test IE's treatment of not explicitly + // setting a boolean content attribute, + // since its presence should be enough + // http://bugs.jquery.com/ticket/12359 + div.innerHTML = ""; + + // Support: IE8, Opera 10-12 + // Nothing should be selected when empty strings follow ^= or $= or *= + if ( div.querySelectorAll("[t^='']").length ) { + rbuggyQSA.push( "[*^$]=" + whitespace + "*(?:''|\"\")" ); + } + + // Support: IE8 + // Boolean attributes and "value" are not treated correctly + if ( !div.querySelectorAll("[selected]").length ) { + rbuggyQSA.push( "\\[" + whitespace + "*(?:value|" + booleans + ")" ); + } + + // Webkit/Opera - :checked should return selected option elements + // http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked + // IE8 throws error here and will not see later tests + if ( !div.querySelectorAll(":checked").length ) { + rbuggyQSA.push(":checked"); + } + }); + + assert(function( div ) { + // Support: Windows 8 Native Apps + // The type and name attributes are restricted during .innerHTML assignment + var input = doc.createElement("input"); + input.setAttribute( "type", "hidden" ); + div.appendChild( input ).setAttribute( "name", "D" ); + + // Support: IE8 + // Enforce case-sensitivity of name attribute + if ( div.querySelectorAll("[name=d]").length ) { + rbuggyQSA.push( "name" + whitespace + "*[*^$|!~]?=" ); + } + + // FF 3.5 - :enabled/:disabled and hidden elements (hidden elements are still enabled) + // IE8 throws error here and will not see later tests + if ( !div.querySelectorAll(":enabled").length ) { + rbuggyQSA.push( ":enabled", ":disabled" ); + } + + // Opera 10-11 does not throw on post-comma invalid pseudos + div.querySelectorAll("*,:x"); + rbuggyQSA.push(",.*:"); + }); + } + + if ( (support.matchesSelector = rnative.test( (matches = docElem.webkitMatchesSelector || + docElem.mozMatchesSelector || + docElem.oMatchesSelector || + docElem.msMatchesSelector) )) ) { + + assert(function( div ) { + // Check to see if it's possible to do matchesSelector + // on a disconnected node (IE 9) + support.disconnectedMatch = matches.call( div, "div" ); + + // This should fail with an exception + // Gecko does not error, returns false instead + matches.call( div, "[s!='']:x" ); + rbuggyMatches.push( "!=", pseudos ); + }); + } + + rbuggyQSA = rbuggyQSA.length && new RegExp( rbuggyQSA.join("|") ); + rbuggyMatches = rbuggyMatches.length && new RegExp( rbuggyMatches.join("|") ); + + /* Contains + ---------------------------------------------------------------------- */ + hasCompare = rnative.test( docElem.compareDocumentPosition ); + + // Element contains another + // Purposefully does not implement inclusive descendent + // As in, an element does not contain itself + contains = hasCompare || rnative.test( docElem.contains ) ? + function( a, b ) { + var adown = a.nodeType === 9 ? a.documentElement : a, + bup = b && b.parentNode; + return a === bup || !!( bup && bup.nodeType === 1 && ( + adown.contains ? + adown.contains( bup ) : + a.compareDocumentPosition && a.compareDocumentPosition( bup ) & 16 + )); + } : + function( a, b ) { + if ( b ) { + while ( (b = b.parentNode) ) { + if ( b === a ) { + return true; + } + } + } + return false; + }; + + /* Sorting + ---------------------------------------------------------------------- */ + + // Document order sorting + sortOrder = hasCompare ? + function( a, b ) { + + // Flag for duplicate removal + if ( a === b ) { + hasDuplicate = true; + return 0; + } + + // Sort on method existence if only one input has compareDocumentPosition + var compare = !a.compareDocumentPosition - !b.compareDocumentPosition; + if ( compare ) { + return compare; + } + + // Calculate position if both inputs belong to the same document + compare = ( a.ownerDocument || a ) === ( b.ownerDocument || b ) ? + a.compareDocumentPosition( b ) : + + // Otherwise we know they are disconnected + 1; + + // Disconnected nodes + if ( compare & 1 || + (!support.sortDetached && b.compareDocumentPosition( a ) === compare) ) { + + // Choose the first element that is related to our preferred document + if ( a === doc || a.ownerDocument === preferredDoc && contains(preferredDoc, a) ) { + return -1; + } + if ( b === doc || b.ownerDocument === preferredDoc && contains(preferredDoc, b) ) { + return 1; + } + + // Maintain original order + return sortInput ? + ( indexOf.call( sortInput, a ) - indexOf.call( sortInput, b ) ) : + 0; + } + + return compare & 4 ? -1 : 1; + } : + function( a, b ) { + // Exit early if the nodes are identical + if ( a === b ) { + hasDuplicate = true; + return 0; + } + + var cur, + i = 0, + aup = a.parentNode, + bup = b.parentNode, + ap = [ a ], + bp = [ b ]; + + // Parentless nodes are either documents or disconnected + if ( !aup || !bup ) { + return a === doc ? -1 : + b === doc ? 1 : + aup ? -1 : + bup ? 1 : + sortInput ? + ( indexOf.call( sortInput, a ) - indexOf.call( sortInput, b ) ) : + 0; + + // If the nodes are siblings, we can do a quick check + } else if ( aup === bup ) { + return siblingCheck( a, b ); + } + + // Otherwise we need full lists of their ancestors for comparison + cur = a; + while ( (cur = cur.parentNode) ) { + ap.unshift( cur ); + } + cur = b; + while ( (cur = cur.parentNode) ) { + bp.unshift( cur ); + } + + // Walk down the tree looking for a discrepancy + while ( ap[i] === bp[i] ) { + i++; + } + + return i ? + // Do a sibling check if the nodes have a common ancestor + siblingCheck( ap[i], bp[i] ) : + + // Otherwise nodes in our document sort first + ap[i] === preferredDoc ? -1 : + bp[i] === preferredDoc ? 1 : + 0; + }; + + return doc; +}; + +Sizzle.matches = function( expr, elements ) { + return Sizzle( expr, null, null, elements ); +}; + +Sizzle.matchesSelector = function( elem, expr ) { + // Set document vars if needed + if ( ( elem.ownerDocument || elem ) !== document ) { + setDocument( elem ); + } + + // Make sure that attribute selectors are quoted + expr = expr.replace( rattributeQuotes, "='$1']" ); + + if ( support.matchesSelector && documentIsHTML && + ( !rbuggyMatches || !rbuggyMatches.test( expr ) ) && + ( !rbuggyQSA || !rbuggyQSA.test( expr ) ) ) { + + try { + var ret = matches.call( elem, expr ); + + // IE 9's matchesSelector returns false on disconnected nodes + if ( ret || support.disconnectedMatch || + // As well, disconnected nodes are said to be in a document + // fragment in IE 9 + elem.document && elem.document.nodeType !== 11 ) { + return ret; + } + } catch(e) {} + } + + return Sizzle( expr, document, null, [elem] ).length > 0; +}; + +Sizzle.contains = function( context, elem ) { + // Set document vars if needed + if ( ( context.ownerDocument || context ) !== document ) { + setDocument( context ); + } + return contains( context, elem ); +}; + +Sizzle.attr = function( elem, name ) { + // Set document vars if needed + if ( ( elem.ownerDocument || elem ) !== document ) { + setDocument( elem ); + } + + var fn = Expr.attrHandle[ name.toLowerCase() ], + // Don't get fooled by Object.prototype properties (jQuery #13807) + val = fn && hasOwn.call( Expr.attrHandle, name.toLowerCase() ) ? + fn( elem, name, !documentIsHTML ) : + undefined; + + return val !== undefined ? + val : + support.attributes || !documentIsHTML ? + elem.getAttribute( name ) : + (val = elem.getAttributeNode(name)) && val.specified ? + val.value : + null; +}; + +Sizzle.error = function( msg ) { + throw new Error( "Syntax error, unrecognized expression: " + msg ); +}; + +/** + * Document sorting and removing duplicates + * @param {ArrayLike} results + */ +Sizzle.uniqueSort = function( results ) { + var elem, + duplicates = [], + j = 0, + i = 0; + + // Unless we *know* we can detect duplicates, assume their presence + hasDuplicate = !support.detectDuplicates; + sortInput = !support.sortStable && results.slice( 0 ); + results.sort( sortOrder ); + + if ( hasDuplicate ) { + while ( (elem = results[i++]) ) { + if ( elem === results[ i ] ) { + j = duplicates.push( i ); + } + } + while ( j-- ) { + results.splice( duplicates[ j ], 1 ); + } + } + + // Clear input after sorting to release objects + // See https://github.com/jquery/sizzle/pull/225 + sortInput = null; + + return results; +}; + +/** + * Utility function for retrieving the text value of an array of DOM nodes + * @param {Array|Element} elem + */ +getText = Sizzle.getText = function( elem ) { + var node, + ret = "", + i = 0, + nodeType = elem.nodeType; + + if ( !nodeType ) { + // If no nodeType, this is expected to be an array + while ( (node = elem[i++]) ) { + // Do not traverse comment nodes + ret += getText( node ); + } + } else if ( nodeType === 1 || nodeType === 9 || nodeType === 11 ) { + // Use textContent for elements + // innerText usage removed for consistency of new lines (jQuery #11153) + if ( typeof elem.textContent === "string" ) { + return elem.textContent; + } else { + // Traverse its children + for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) { + ret += getText( elem ); + } + } + } else if ( nodeType === 3 || nodeType === 4 ) { + return elem.nodeValue; + } + // Do not include comment or processing instruction nodes + + return ret; +}; + +Expr = Sizzle.selectors = { + + // Can be adjusted by the user + cacheLength: 50, + + createPseudo: markFunction, + + match: matchExpr, + + attrHandle: {}, + + find: {}, + + relative: { + ">": { dir: "parentNode", first: true }, + " ": { dir: "parentNode" }, + "+": { dir: "previousSibling", first: true }, + "~": { dir: "previousSibling" } + }, + + preFilter: { + "ATTR": function( match ) { + match[1] = match[1].replace( runescape, funescape ); + + // Move the given value to match[3] whether quoted or unquoted + match[3] = ( match[4] || match[5] || "" ).replace( runescape, funescape ); + + if ( match[2] === "~=" ) { + match[3] = " " + match[3] + " "; + } + + return match.slice( 0, 4 ); + }, + + "CHILD": function( match ) { + /* matches from matchExpr["CHILD"] + 1 type (only|nth|...) + 2 what (child|of-type) + 3 argument (even|odd|\d*|\d*n([+-]\d+)?|...) + 4 xn-component of xn+y argument ([+-]?\d*n|) + 5 sign of xn-component + 6 x of xn-component + 7 sign of y-component + 8 y of y-component + */ + match[1] = match[1].toLowerCase(); + + if ( match[1].slice( 0, 3 ) === "nth" ) { + // nth-* requires argument + if ( !match[3] ) { + Sizzle.error( match[0] ); + } + + // numeric x and y parameters for Expr.filter.CHILD + // remember that false/true cast respectively to 0/1 + match[4] = +( match[4] ? match[5] + (match[6] || 1) : 2 * ( match[3] === "even" || match[3] === "odd" ) ); + match[5] = +( ( match[7] + match[8] ) || match[3] === "odd" ); + + // other types prohibit arguments + } else if ( match[3] ) { + Sizzle.error( match[0] ); + } + + return match; + }, + + "PSEUDO": function( match ) { + var excess, + unquoted = !match[5] && match[2]; + + if ( matchExpr["CHILD"].test( match[0] ) ) { + return null; + } + + // Accept quoted arguments as-is + if ( match[3] && match[4] !== undefined ) { + match[2] = match[4]; + + // Strip excess characters from unquoted arguments + } else if ( unquoted && rpseudo.test( unquoted ) && + // Get excess from tokenize (recursively) + (excess = tokenize( unquoted, true )) && + // advance to the next closing parenthesis + (excess = unquoted.indexOf( ")", unquoted.length - excess ) - unquoted.length) ) { + + // excess is a negative index + match[0] = match[0].slice( 0, excess ); + match[2] = unquoted.slice( 0, excess ); + } + + // Return only captures needed by the pseudo filter method (type and argument) + return match.slice( 0, 3 ); + } + }, + + filter: { + + "TAG": function( nodeNameSelector ) { + var nodeName = nodeNameSelector.replace( runescape, funescape ).toLowerCase(); + return nodeNameSelector === "*" ? + function() { return true; } : + function( elem ) { + return elem.nodeName && elem.nodeName.toLowerCase() === nodeName; + }; + }, + + "CLASS": function( className ) { + var pattern = classCache[ className + " " ]; + + return pattern || + (pattern = new RegExp( "(^|" + whitespace + ")" + className + "(" + whitespace + "|$)" )) && + classCache( className, function( elem ) { + return pattern.test( typeof elem.className === "string" && elem.className || typeof elem.getAttribute !== strundefined && elem.getAttribute("class") || "" ); + }); + }, + + "ATTR": function( name, operator, check ) { + return function( elem ) { + var result = Sizzle.attr( elem, name ); + + if ( result == null ) { + return operator === "!="; + } + if ( !operator ) { + return true; + } + + result += ""; + + return operator === "=" ? result === check : + operator === "!=" ? result !== check : + operator === "^=" ? check && result.indexOf( check ) === 0 : + operator === "*=" ? check && result.indexOf( check ) > -1 : + operator === "$=" ? check && result.slice( -check.length ) === check : + operator === "~=" ? ( " " + result + " " ).indexOf( check ) > -1 : + operator === "|=" ? result === check || result.slice( 0, check.length + 1 ) === check + "-" : + false; + }; + }, + + "CHILD": function( type, what, argument, first, last ) { + var simple = type.slice( 0, 3 ) !== "nth", + forward = type.slice( -4 ) !== "last", + ofType = what === "of-type"; + + return first === 1 && last === 0 ? + + // Shortcut for :nth-*(n) + function( elem ) { + return !!elem.parentNode; + } : + + function( elem, context, xml ) { + var cache, outerCache, node, diff, nodeIndex, start, + dir = simple !== forward ? "nextSibling" : "previousSibling", + parent = elem.parentNode, + name = ofType && elem.nodeName.toLowerCase(), + useCache = !xml && !ofType; + + if ( parent ) { + + // :(first|last|only)-(child|of-type) + if ( simple ) { + while ( dir ) { + node = elem; + while ( (node = node[ dir ]) ) { + if ( ofType ? node.nodeName.toLowerCase() === name : node.nodeType === 1 ) { + return false; + } + } + // Reverse direction for :only-* (if we haven't yet done so) + start = dir = type === "only" && !start && "nextSibling"; + } + return true; + } + + start = [ forward ? parent.firstChild : parent.lastChild ]; + + // non-xml :nth-child(...) stores cache data on `parent` + if ( forward && useCache ) { + // Seek `elem` from a previously-cached index + outerCache = parent[ expando ] || (parent[ expando ] = {}); + cache = outerCache[ type ] || []; + nodeIndex = cache[0] === dirruns && cache[1]; + diff = cache[0] === dirruns && cache[2]; + node = nodeIndex && parent.childNodes[ nodeIndex ]; + + while ( (node = ++nodeIndex && node && node[ dir ] || + + // Fallback to seeking `elem` from the start + (diff = nodeIndex = 0) || start.pop()) ) { + + // When found, cache indexes on `parent` and break + if ( node.nodeType === 1 && ++diff && node === elem ) { + outerCache[ type ] = [ dirruns, nodeIndex, diff ]; + break; + } + } + + // Use previously-cached element index if available + } else if ( useCache && (cache = (elem[ expando ] || (elem[ expando ] = {}))[ type ]) && cache[0] === dirruns ) { + diff = cache[1]; + + // xml :nth-child(...) or :nth-last-child(...) or :nth(-last)?-of-type(...) + } else { + // Use the same loop as above to seek `elem` from the start + while ( (node = ++nodeIndex && node && node[ dir ] || + (diff = nodeIndex = 0) || start.pop()) ) { + + if ( ( ofType ? node.nodeName.toLowerCase() === name : node.nodeType === 1 ) && ++diff ) { + // Cache the index of each encountered element + if ( useCache ) { + (node[ expando ] || (node[ expando ] = {}))[ type ] = [ dirruns, diff ]; + } + + if ( node === elem ) { + break; + } + } + } + } + + // Incorporate the offset, then check against cycle size + diff -= last; + return diff === first || ( diff % first === 0 && diff / first >= 0 ); + } + }; + }, + + "PSEUDO": function( pseudo, argument ) { + // pseudo-class names are case-insensitive + // http://www.w3.org/TR/selectors/#pseudo-classes + // Prioritize by case sensitivity in case custom pseudos are added with uppercase letters + // Remember that setFilters inherits from pseudos + var args, + fn = Expr.pseudos[ pseudo ] || Expr.setFilters[ pseudo.toLowerCase() ] || + Sizzle.error( "unsupported pseudo: " + pseudo ); + + // The user may use createPseudo to indicate that + // arguments are needed to create the filter function + // just as Sizzle does + if ( fn[ expando ] ) { + return fn( argument ); + } + + // But maintain support for old signatures + if ( fn.length > 1 ) { + args = [ pseudo, pseudo, "", argument ]; + return Expr.setFilters.hasOwnProperty( pseudo.toLowerCase() ) ? + markFunction(function( seed, matches ) { + var idx, + matched = fn( seed, argument ), + i = matched.length; + while ( i-- ) { + idx = indexOf.call( seed, matched[i] ); + seed[ idx ] = !( matches[ idx ] = matched[i] ); + } + }) : + function( elem ) { + return fn( elem, 0, args ); + }; + } + + return fn; + } + }, + + pseudos: { + // Potentially complex pseudos + "not": markFunction(function( selector ) { + // Trim the selector passed to compile + // to avoid treating leading and trailing + // spaces as combinators + var input = [], + results = [], + matcher = compile( selector.replace( rtrim, "$1" ) ); + + return matcher[ expando ] ? + markFunction(function( seed, matches, context, xml ) { + var elem, + unmatched = matcher( seed, null, xml, [] ), + i = seed.length; + + // Match elements unmatched by `matcher` + while ( i-- ) { + if ( (elem = unmatched[i]) ) { + seed[i] = !(matches[i] = elem); + } + } + }) : + function( elem, context, xml ) { + input[0] = elem; + matcher( input, null, xml, results ); + return !results.pop(); + }; + }), + + "has": markFunction(function( selector ) { + return function( elem ) { + return Sizzle( selector, elem ).length > 0; + }; + }), + + "contains": markFunction(function( text ) { + return function( elem ) { + return ( elem.textContent || elem.innerText || getText( elem ) ).indexOf( text ) > -1; + }; + }), + + // "Whether an element is represented by a :lang() selector + // is based solely on the element's language value + // being equal to the identifier C, + // or beginning with the identifier C immediately followed by "-". + // The matching of C against the element's language value is performed case-insensitively. + // The identifier C does not have to be a valid language name." + // http://www.w3.org/TR/selectors/#lang-pseudo + "lang": markFunction( function( lang ) { + // lang value must be a valid identifier + if ( !ridentifier.test(lang || "") ) { + Sizzle.error( "unsupported lang: " + lang ); + } + lang = lang.replace( runescape, funescape ).toLowerCase(); + return function( elem ) { + var elemLang; + do { + if ( (elemLang = documentIsHTML ? + elem.lang : + elem.getAttribute("xml:lang") || elem.getAttribute("lang")) ) { + + elemLang = elemLang.toLowerCase(); + return elemLang === lang || elemLang.indexOf( lang + "-" ) === 0; + } + } while ( (elem = elem.parentNode) && elem.nodeType === 1 ); + return false; + }; + }), + + // Miscellaneous + "target": function( elem ) { + var hash = window.location && window.location.hash; + return hash && hash.slice( 1 ) === elem.id; + }, + + "root": function( elem ) { + return elem === docElem; + }, + + "focus": function( elem ) { + return elem === document.activeElement && (!document.hasFocus || document.hasFocus()) && !!(elem.type || elem.href || ~elem.tabIndex); + }, + + // Boolean properties + "enabled": function( elem ) { + return elem.disabled === false; + }, + + "disabled": function( elem ) { + return elem.disabled === true; + }, + + "checked": function( elem ) { + // In CSS3, :checked should return both checked and selected elements + // http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked + var nodeName = elem.nodeName.toLowerCase(); + return (nodeName === "input" && !!elem.checked) || (nodeName === "option" && !!elem.selected); + }, + + "selected": function( elem ) { + // Accessing this property makes selected-by-default + // options in Safari work properly + if ( elem.parentNode ) { + elem.parentNode.selectedIndex; + } + + return elem.selected === true; + }, + + // Contents + "empty": function( elem ) { + // http://www.w3.org/TR/selectors/#empty-pseudo + // :empty is negated by element (1) or content nodes (text: 3; cdata: 4; entity ref: 5), + // but not by others (comment: 8; processing instruction: 7; etc.) + // nodeType < 6 works because attributes (2) do not appear as children + for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) { + if ( elem.nodeType < 6 ) { + return false; + } + } + return true; + }, + + "parent": function( elem ) { + return !Expr.pseudos["empty"]( elem ); + }, + + // Element/input types + "header": function( elem ) { + return rheader.test( elem.nodeName ); + }, + + "input": function( elem ) { + return rinputs.test( elem.nodeName ); + }, + + "button": function( elem ) { + var name = elem.nodeName.toLowerCase(); + return name === "input" && elem.type === "button" || name === "button"; + }, + + "text": function( elem ) { + var attr; + return elem.nodeName.toLowerCase() === "input" && + elem.type === "text" && + + // Support: IE<8 + // New HTML5 attribute values (e.g., "search") appear with elem.type === "text" + ( (attr = elem.getAttribute("type")) == null || attr.toLowerCase() === "text" ); + }, + + // Position-in-collection + "first": createPositionalPseudo(function() { + return [ 0 ]; + }), + + "last": createPositionalPseudo(function( matchIndexes, length ) { + return [ length - 1 ]; + }), + + "eq": createPositionalPseudo(function( matchIndexes, length, argument ) { + return [ argument < 0 ? argument + length : argument ]; + }), + + "even": createPositionalPseudo(function( matchIndexes, length ) { + var i = 0; + for ( ; i < length; i += 2 ) { + matchIndexes.push( i ); + } + return matchIndexes; + }), + + "odd": createPositionalPseudo(function( matchIndexes, length ) { + var i = 1; + for ( ; i < length; i += 2 ) { + matchIndexes.push( i ); + } + return matchIndexes; + }), + + "lt": createPositionalPseudo(function( matchIndexes, length, argument ) { + var i = argument < 0 ? argument + length : argument; + for ( ; --i >= 0; ) { + matchIndexes.push( i ); + } + return matchIndexes; + }), + + "gt": createPositionalPseudo(function( matchIndexes, length, argument ) { + var i = argument < 0 ? argument + length : argument; + for ( ; ++i < length; ) { + matchIndexes.push( i ); + } + return matchIndexes; + }) + } +}; + +Expr.pseudos["nth"] = Expr.pseudos["eq"]; + +// Add button/input type pseudos +for ( i in { radio: true, checkbox: true, file: true, password: true, image: true } ) { + Expr.pseudos[ i ] = createInputPseudo( i ); +} +for ( i in { submit: true, reset: true } ) { + Expr.pseudos[ i ] = createButtonPseudo( i ); +} + +// Easy API for creating new setFilters +function setFilters() {} +setFilters.prototype = Expr.filters = Expr.pseudos; +Expr.setFilters = new setFilters(); + +function tokenize( selector, parseOnly ) { + var matched, match, tokens, type, + soFar, groups, preFilters, + cached = tokenCache[ selector + " " ]; + + if ( cached ) { + return parseOnly ? 0 : cached.slice( 0 ); + } + + soFar = selector; + groups = []; + preFilters = Expr.preFilter; + + while ( soFar ) { + + // Comma and first run + if ( !matched || (match = rcomma.exec( soFar )) ) { + if ( match ) { + // Don't consume trailing commas as valid + soFar = soFar.slice( match[0].length ) || soFar; + } + groups.push( (tokens = []) ); + } + + matched = false; + + // Combinators + if ( (match = rcombinators.exec( soFar )) ) { + matched = match.shift(); + tokens.push({ + value: matched, + // Cast descendant combinators to space + type: match[0].replace( rtrim, " " ) + }); + soFar = soFar.slice( matched.length ); + } + + // Filters + for ( type in Expr.filter ) { + if ( (match = matchExpr[ type ].exec( soFar )) && (!preFilters[ type ] || + (match = preFilters[ type ]( match ))) ) { + matched = match.shift(); + tokens.push({ + value: matched, + type: type, + matches: match + }); + soFar = soFar.slice( matched.length ); + } + } + + if ( !matched ) { + break; + } + } + + // Return the length of the invalid excess + // if we're just parsing + // Otherwise, throw an error or return tokens + return parseOnly ? + soFar.length : + soFar ? + Sizzle.error( selector ) : + // Cache the tokens + tokenCache( selector, groups ).slice( 0 ); +} + +function toSelector( tokens ) { + var i = 0, + len = tokens.length, + selector = ""; + for ( ; i < len; i++ ) { + selector += tokens[i].value; + } + return selector; +} + +function addCombinator( matcher, combinator, base ) { + var dir = combinator.dir, + checkNonElements = base && dir === "parentNode", + doneName = done++; + + return combinator.first ? + // Check against closest ancestor/preceding element + function( elem, context, xml ) { + while ( (elem = elem[ dir ]) ) { + if ( elem.nodeType === 1 || checkNonElements ) { + return matcher( elem, context, xml ); + } + } + } : + + // Check against all ancestor/preceding elements + function( elem, context, xml ) { + var oldCache, outerCache, + newCache = [ dirruns, doneName ]; + + // We can't set arbitrary data on XML nodes, so they don't benefit from dir caching + if ( xml ) { + while ( (elem = elem[ dir ]) ) { + if ( elem.nodeType === 1 || checkNonElements ) { + if ( matcher( elem, context, xml ) ) { + return true; + } + } + } + } else { + while ( (elem = elem[ dir ]) ) { + if ( elem.nodeType === 1 || checkNonElements ) { + outerCache = elem[ expando ] || (elem[ expando ] = {}); + if ( (oldCache = outerCache[ dir ]) && + oldCache[ 0 ] === dirruns && oldCache[ 1 ] === doneName ) { + + // Assign to newCache so results back-propagate to previous elements + return (newCache[ 2 ] = oldCache[ 2 ]); + } else { + // Reuse newcache so results back-propagate to previous elements + outerCache[ dir ] = newCache; + + // A match means we're done; a fail means we have to keep checking + if ( (newCache[ 2 ] = matcher( elem, context, xml )) ) { + return true; + } + } + } + } + } + }; +} + +function elementMatcher( matchers ) { + return matchers.length > 1 ? + function( elem, context, xml ) { + var i = matchers.length; + while ( i-- ) { + if ( !matchers[i]( elem, context, xml ) ) { + return false; + } + } + return true; + } : + matchers[0]; +} + +function condense( unmatched, map, filter, context, xml ) { + var elem, + newUnmatched = [], + i = 0, + len = unmatched.length, + mapped = map != null; + + for ( ; i < len; i++ ) { + if ( (elem = unmatched[i]) ) { + if ( !filter || filter( elem, context, xml ) ) { + newUnmatched.push( elem ); + if ( mapped ) { + map.push( i ); + } + } + } + } + + return newUnmatched; +} + +function setMatcher( preFilter, selector, matcher, postFilter, postFinder, postSelector ) { + if ( postFilter && !postFilter[ expando ] ) { + postFilter = setMatcher( postFilter ); + } + if ( postFinder && !postFinder[ expando ] ) { + postFinder = setMatcher( postFinder, postSelector ); + } + return markFunction(function( seed, results, context, xml ) { + var temp, i, elem, + preMap = [], + postMap = [], + preexisting = results.length, + + // Get initial elements from seed or context + elems = seed || multipleContexts( selector || "*", context.nodeType ? [ context ] : context, [] ), + + // Prefilter to get matcher input, preserving a map for seed-results synchronization + matcherIn = preFilter && ( seed || !selector ) ? + condense( elems, preMap, preFilter, context, xml ) : + elems, + + matcherOut = matcher ? + // If we have a postFinder, or filtered seed, or non-seed postFilter or preexisting results, + postFinder || ( seed ? preFilter : preexisting || postFilter ) ? + + // ...intermediate processing is necessary + [] : + + // ...otherwise use results directly + results : + matcherIn; + + // Find primary matches + if ( matcher ) { + matcher( matcherIn, matcherOut, context, xml ); + } + + // Apply postFilter + if ( postFilter ) { + temp = condense( matcherOut, postMap ); + postFilter( temp, [], context, xml ); + + // Un-match failing elements by moving them back to matcherIn + i = temp.length; + while ( i-- ) { + if ( (elem = temp[i]) ) { + matcherOut[ postMap[i] ] = !(matcherIn[ postMap[i] ] = elem); + } + } + } + + if ( seed ) { + if ( postFinder || preFilter ) { + if ( postFinder ) { + // Get the final matcherOut by condensing this intermediate into postFinder contexts + temp = []; + i = matcherOut.length; + while ( i-- ) { + if ( (elem = matcherOut[i]) ) { + // Restore matcherIn since elem is not yet a final match + temp.push( (matcherIn[i] = elem) ); + } + } + postFinder( null, (matcherOut = []), temp, xml ); + } + + // Move matched elements from seed to results to keep them synchronized + i = matcherOut.length; + while ( i-- ) { + if ( (elem = matcherOut[i]) && + (temp = postFinder ? indexOf.call( seed, elem ) : preMap[i]) > -1 ) { + + seed[temp] = !(results[temp] = elem); + } + } + } + + // Add elements to results, through postFinder if defined + } else { + matcherOut = condense( + matcherOut === results ? + matcherOut.splice( preexisting, matcherOut.length ) : + matcherOut + ); + if ( postFinder ) { + postFinder( null, results, matcherOut, xml ); + } else { + push.apply( results, matcherOut ); + } + } + }); +} + +function matcherFromTokens( tokens ) { + var checkContext, matcher, j, + len = tokens.length, + leadingRelative = Expr.relative[ tokens[0].type ], + implicitRelative = leadingRelative || Expr.relative[" "], + i = leadingRelative ? 1 : 0, + + // The foundational matcher ensures that elements are reachable from top-level context(s) + matchContext = addCombinator( function( elem ) { + return elem === checkContext; + }, implicitRelative, true ), + matchAnyContext = addCombinator( function( elem ) { + return indexOf.call( checkContext, elem ) > -1; + }, implicitRelative, true ), + matchers = [ function( elem, context, xml ) { + return ( !leadingRelative && ( xml || context !== outermostContext ) ) || ( + (checkContext = context).nodeType ? + matchContext( elem, context, xml ) : + matchAnyContext( elem, context, xml ) ); + } ]; + + for ( ; i < len; i++ ) { + if ( (matcher = Expr.relative[ tokens[i].type ]) ) { + matchers = [ addCombinator(elementMatcher( matchers ), matcher) ]; + } else { + matcher = Expr.filter[ tokens[i].type ].apply( null, tokens[i].matches ); + + // Return special upon seeing a positional matcher + if ( matcher[ expando ] ) { + // Find the next relative operator (if any) for proper handling + j = ++i; + for ( ; j < len; j++ ) { + if ( Expr.relative[ tokens[j].type ] ) { + break; + } + } + return setMatcher( + i > 1 && elementMatcher( matchers ), + i > 1 && toSelector( + // If the preceding token was a descendant combinator, insert an implicit any-element `*` + tokens.slice( 0, i - 1 ).concat({ value: tokens[ i - 2 ].type === " " ? "*" : "" }) + ).replace( rtrim, "$1" ), + matcher, + i < j && matcherFromTokens( tokens.slice( i, j ) ), + j < len && matcherFromTokens( (tokens = tokens.slice( j )) ), + j < len && toSelector( tokens ) + ); + } + matchers.push( matcher ); + } + } + + return elementMatcher( matchers ); +} + +function matcherFromGroupMatchers( elementMatchers, setMatchers ) { + var bySet = setMatchers.length > 0, + byElement = elementMatchers.length > 0, + superMatcher = function( seed, context, xml, results, outermost ) { + var elem, j, matcher, + matchedCount = 0, + i = "0", + unmatched = seed && [], + setMatched = [], + contextBackup = outermostContext, + // We must always have either seed elements or outermost context + elems = seed || byElement && Expr.find["TAG"]( "*", outermost ), + // Use integer dirruns iff this is the outermost matcher + dirrunsUnique = (dirruns += contextBackup == null ? 1 : Math.random() || 0.1), + len = elems.length; + + if ( outermost ) { + outermostContext = context !== document && context; + } + + // Add elements passing elementMatchers directly to results + // Keep `i` a string if there are no elements so `matchedCount` will be "00" below + // Support: IE<9, Safari + // Tolerate NodeList properties (IE: "length"; Safari: ) matching elements by id + for ( ; i !== len && (elem = elems[i]) != null; i++ ) { + if ( byElement && elem ) { + j = 0; + while ( (matcher = elementMatchers[j++]) ) { + if ( matcher( elem, context, xml ) ) { + results.push( elem ); + break; + } + } + if ( outermost ) { + dirruns = dirrunsUnique; + } + } + + // Track unmatched elements for set filters + if ( bySet ) { + // They will have gone through all possible matchers + if ( (elem = !matcher && elem) ) { + matchedCount--; + } + + // Lengthen the array for every element, matched or not + if ( seed ) { + unmatched.push( elem ); + } + } + } + + // Apply set filters to unmatched elements + matchedCount += i; + if ( bySet && i !== matchedCount ) { + j = 0; + while ( (matcher = setMatchers[j++]) ) { + matcher( unmatched, setMatched, context, xml ); + } + + if ( seed ) { + // Reintegrate element matches to eliminate the need for sorting + if ( matchedCount > 0 ) { + while ( i-- ) { + if ( !(unmatched[i] || setMatched[i]) ) { + setMatched[i] = pop.call( results ); + } + } + } + + // Discard index placeholder values to get only actual matches + setMatched = condense( setMatched ); + } + + // Add matches to results + push.apply( results, setMatched ); + + // Seedless set matches succeeding multiple successful matchers stipulate sorting + if ( outermost && !seed && setMatched.length > 0 && + ( matchedCount + setMatchers.length ) > 1 ) { + + Sizzle.uniqueSort( results ); + } + } + + // Override manipulation of globals by nested matchers + if ( outermost ) { + dirruns = dirrunsUnique; + outermostContext = contextBackup; + } + + return unmatched; + }; + + return bySet ? + markFunction( superMatcher ) : + superMatcher; +} + +compile = Sizzle.compile = function( selector, group /* Internal Use Only */ ) { + var i, + setMatchers = [], + elementMatchers = [], + cached = compilerCache[ selector + " " ]; + + if ( !cached ) { + // Generate a function of recursive functions that can be used to check each element + if ( !group ) { + group = tokenize( selector ); + } + i = group.length; + while ( i-- ) { + cached = matcherFromTokens( group[i] ); + if ( cached[ expando ] ) { + setMatchers.push( cached ); + } else { + elementMatchers.push( cached ); + } + } + + // Cache the compiled function + cached = compilerCache( selector, matcherFromGroupMatchers( elementMatchers, setMatchers ) ); + } + return cached; +}; + +function multipleContexts( selector, contexts, results ) { + var i = 0, + len = contexts.length; + for ( ; i < len; i++ ) { + Sizzle( selector, contexts[i], results ); + } + return results; +} + +function select( selector, context, results, seed ) { + var i, tokens, token, type, find, + match = tokenize( selector ); + + if ( !seed ) { + // Try to minimize operations if there is only one group + if ( match.length === 1 ) { + + // Take a shortcut and set the context if the root selector is an ID + tokens = match[0] = match[0].slice( 0 ); + if ( tokens.length > 2 && (token = tokens[0]).type === "ID" && + support.getById && context.nodeType === 9 && documentIsHTML && + Expr.relative[ tokens[1].type ] ) { + + context = ( Expr.find["ID"]( token.matches[0].replace(runescape, funescape), context ) || [] )[0]; + if ( !context ) { + return results; + } + selector = selector.slice( tokens.shift().value.length ); + } + + // Fetch a seed set for right-to-left matching + i = matchExpr["needsContext"].test( selector ) ? 0 : tokens.length; + while ( i-- ) { + token = tokens[i]; + + // Abort if we hit a combinator + if ( Expr.relative[ (type = token.type) ] ) { + break; + } + if ( (find = Expr.find[ type ]) ) { + // Search, expanding context for leading sibling combinators + if ( (seed = find( + token.matches[0].replace( runescape, funescape ), + rsibling.test( tokens[0].type ) && testContext( context.parentNode ) || context + )) ) { + + // If seed is empty or no tokens remain, we can return early + tokens.splice( i, 1 ); + selector = seed.length && toSelector( tokens ); + if ( !selector ) { + push.apply( results, seed ); + return results; + } + + break; + } + } + } + } + } + + // Compile and execute a filtering function + // Provide `match` to avoid retokenization if we modified the selector above + compile( selector, match )( + seed, + context, + !documentIsHTML, + results, + rsibling.test( selector ) && testContext( context.parentNode ) || context + ); + return results; +} + +// One-time assignments + +// Sort stability +support.sortStable = expando.split("").sort( sortOrder ).join("") === expando; + +// Support: Chrome<14 +// Always assume duplicates if they aren't passed to the comparison function +support.detectDuplicates = !!hasDuplicate; + +// Initialize against the default document +setDocument(); + +// Support: Webkit<537.32 - Safari 6.0.3/Chrome 25 (fixed in Chrome 27) +// Detached nodes confoundingly follow *each other* +support.sortDetached = assert(function( div1 ) { + // Should return 1, but returns 4 (following) + return div1.compareDocumentPosition( document.createElement("div") ) & 1; +}); + +// Support: IE<8 +// Prevent attribute/property "interpolation" +// http://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx +if ( !assert(function( div ) { + div.innerHTML = ""; + return div.firstChild.getAttribute("href") === "#" ; +}) ) { + addHandle( "type|href|height|width", function( elem, name, isXML ) { + if ( !isXML ) { + return elem.getAttribute( name, name.toLowerCase() === "type" ? 1 : 2 ); + } + }); +} + +// Support: IE<9 +// Use defaultValue in place of getAttribute("value") +if ( !support.attributes || !assert(function( div ) { + div.innerHTML = ""; + div.firstChild.setAttribute( "value", "" ); + return div.firstChild.getAttribute( "value" ) === ""; +}) ) { + addHandle( "value", function( elem, name, isXML ) { + if ( !isXML && elem.nodeName.toLowerCase() === "input" ) { + return elem.defaultValue; + } + }); +} + +// Support: IE<9 +// Use getAttributeNode to fetch booleans when getAttribute lies +if ( !assert(function( div ) { + return div.getAttribute("disabled") == null; +}) ) { + addHandle( booleans, function( elem, name, isXML ) { + var val; + if ( !isXML ) { + return elem[ name ] === true ? name.toLowerCase() : + (val = elem.getAttributeNode( name )) && val.specified ? + val.value : + null; + } + }); +} + +return Sizzle; + +})( window ); + + + +jQuery.find = Sizzle; +jQuery.expr = Sizzle.selectors; +jQuery.expr[":"] = jQuery.expr.pseudos; +jQuery.unique = Sizzle.uniqueSort; +jQuery.text = Sizzle.getText; +jQuery.isXMLDoc = Sizzle.isXML; +jQuery.contains = Sizzle.contains; + + + +var rneedsContext = jQuery.expr.match.needsContext; + +var rsingleTag = (/^<(\w+)\s*\/?>(?:<\/\1>|)$/); + + + +var risSimple = /^.[^:#\[\.,]*$/; + +// Implement the identical functionality for filter and not +function winnow( elements, qualifier, not ) { + if ( jQuery.isFunction( qualifier ) ) { + return jQuery.grep( elements, function( elem, i ) { + /* jshint -W018 */ + return !!qualifier.call( elem, i, elem ) !== not; + }); + + } + + if ( qualifier.nodeType ) { + return jQuery.grep( elements, function( elem ) { + return ( elem === qualifier ) !== not; + }); + + } + + if ( typeof qualifier === "string" ) { + if ( risSimple.test( qualifier ) ) { + return jQuery.filter( qualifier, elements, not ); + } + + qualifier = jQuery.filter( qualifier, elements ); + } + + return jQuery.grep( elements, function( elem ) { + return ( indexOf.call( qualifier, elem ) >= 0 ) !== not; + }); +} + +jQuery.filter = function( expr, elems, not ) { + var elem = elems[ 0 ]; + + if ( not ) { + expr = ":not(" + expr + ")"; + } + + return elems.length === 1 && elem.nodeType === 1 ? + jQuery.find.matchesSelector( elem, expr ) ? [ elem ] : [] : + jQuery.find.matches( expr, jQuery.grep( elems, function( elem ) { + return elem.nodeType === 1; + })); +}; + +jQuery.fn.extend({ + find: function( selector ) { + var i, + len = this.length, + ret = [], + self = this; + + if ( typeof selector !== "string" ) { + return this.pushStack( jQuery( selector ).filter(function() { + for ( i = 0; i < len; i++ ) { + if ( jQuery.contains( self[ i ], this ) ) { + return true; + } + } + }) ); + } + + for ( i = 0; i < len; i++ ) { + jQuery.find( selector, self[ i ], ret ); + } + + // Needed because $( selector, context ) becomes $( context ).find( selector ) + ret = this.pushStack( len > 1 ? jQuery.unique( ret ) : ret ); + ret.selector = this.selector ? this.selector + " " + selector : selector; + return ret; + }, + filter: function( selector ) { + return this.pushStack( winnow(this, selector || [], false) ); + }, + not: function( selector ) { + return this.pushStack( winnow(this, selector || [], true) ); + }, + is: function( selector ) { + return !!winnow( + this, + + // If this is a positional/relative selector, check membership in the returned set + // so $("p:first").is("p:last") won't return true for a doc with two "p". + typeof selector === "string" && rneedsContext.test( selector ) ? + jQuery( selector ) : + selector || [], + false + ).length; + } +}); + + +// Initialize a jQuery object + + +// A central reference to the root jQuery(document) +var rootjQuery, + + // A simple way to check for HTML strings + // Prioritize #id over to avoid XSS via location.hash (#9521) + // Strict HTML recognition (#11290: must start with <) + rquickExpr = /^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/, + + init = jQuery.fn.init = function( selector, context ) { + var match, elem; + + // HANDLE: $(""), $(null), $(undefined), $(false) + if ( !selector ) { + return this; + } + + // Handle HTML strings + if ( typeof selector === "string" ) { + if ( selector[0] === "<" && selector[ selector.length - 1 ] === ">" && selector.length >= 3 ) { + // Assume that strings that start and end with <> are HTML and skip the regex check + match = [ null, selector, null ]; + + } else { + match = rquickExpr.exec( selector ); + } + + // Match html or make sure no context is specified for #id + if ( match && (match[1] || !context) ) { + + // HANDLE: $(html) -> $(array) + if ( match[1] ) { + context = context instanceof jQuery ? context[0] : context; + + // scripts is true for back-compat + // Intentionally let the error be thrown if parseHTML is not present + jQuery.merge( this, jQuery.parseHTML( + match[1], + context && context.nodeType ? context.ownerDocument || context : document, + true + ) ); + + // HANDLE: $(html, props) + if ( rsingleTag.test( match[1] ) && jQuery.isPlainObject( context ) ) { + for ( match in context ) { + // Properties of context are called as methods if possible + if ( jQuery.isFunction( this[ match ] ) ) { + this[ match ]( context[ match ] ); + + // ...and otherwise set as attributes + } else { + this.attr( match, context[ match ] ); + } + } + } + + return this; + + // HANDLE: $(#id) + } else { + elem = document.getElementById( match[2] ); + + // Check parentNode to catch when Blackberry 4.6 returns + // nodes that are no longer in the document #6963 + if ( elem && elem.parentNode ) { + // Inject the element directly into the jQuery object + this.length = 1; + this[0] = elem; + } + + this.context = document; + this.selector = selector; + return this; + } + + // HANDLE: $(expr, $(...)) + } else if ( !context || context.jquery ) { + return ( context || rootjQuery ).find( selector ); + + // HANDLE: $(expr, context) + // (which is just equivalent to: $(context).find(expr) + } else { + return this.constructor( context ).find( selector ); + } + + // HANDLE: $(DOMElement) + } else if ( selector.nodeType ) { + this.context = this[0] = selector; + this.length = 1; + return this; + + // HANDLE: $(function) + // Shortcut for document ready + } else if ( jQuery.isFunction( selector ) ) { + return typeof rootjQuery.ready !== "undefined" ? + rootjQuery.ready( selector ) : + // Execute immediately if ready is not present + selector( jQuery ); + } + + if ( selector.selector !== undefined ) { + this.selector = selector.selector; + this.context = selector.context; + } + + return jQuery.makeArray( selector, this ); + }; + +// Give the init function the jQuery prototype for later instantiation +init.prototype = jQuery.fn; + +// Initialize central reference +rootjQuery = jQuery( document ); + + +var rparentsprev = /^(?:parents|prev(?:Until|All))/, + // methods guaranteed to produce a unique set when starting from a unique set + guaranteedUnique = { + children: true, + contents: true, + next: true, + prev: true + }; + +jQuery.extend({ + dir: function( elem, dir, until ) { + var matched = [], + truncate = until !== undefined; + + while ( (elem = elem[ dir ]) && elem.nodeType !== 9 ) { + if ( elem.nodeType === 1 ) { + if ( truncate && jQuery( elem ).is( until ) ) { + break; + } + matched.push( elem ); + } + } + return matched; + }, + + sibling: function( n, elem ) { + var matched = []; + + for ( ; n; n = n.nextSibling ) { + if ( n.nodeType === 1 && n !== elem ) { + matched.push( n ); + } + } + + return matched; + } +}); + +jQuery.fn.extend({ + has: function( target ) { + var targets = jQuery( target, this ), + l = targets.length; + + return this.filter(function() { + var i = 0; + for ( ; i < l; i++ ) { + if ( jQuery.contains( this, targets[i] ) ) { + return true; + } + } + }); + }, + + closest: function( selectors, context ) { + var cur, + i = 0, + l = this.length, + matched = [], + pos = rneedsContext.test( selectors ) || typeof selectors !== "string" ? + jQuery( selectors, context || this.context ) : + 0; + + for ( ; i < l; i++ ) { + for ( cur = this[i]; cur && cur !== context; cur = cur.parentNode ) { + // Always skip document fragments + if ( cur.nodeType < 11 && (pos ? + pos.index(cur) > -1 : + + // Don't pass non-elements to Sizzle + cur.nodeType === 1 && + jQuery.find.matchesSelector(cur, selectors)) ) { + + matched.push( cur ); + break; + } + } + } + + return this.pushStack( matched.length > 1 ? jQuery.unique( matched ) : matched ); + }, + + // Determine the position of an element within + // the matched set of elements + index: function( elem ) { + + // No argument, return index in parent + if ( !elem ) { + return ( this[ 0 ] && this[ 0 ].parentNode ) ? this.first().prevAll().length : -1; + } + + // index in selector + if ( typeof elem === "string" ) { + return indexOf.call( jQuery( elem ), this[ 0 ] ); + } + + // Locate the position of the desired element + return indexOf.call( this, + + // If it receives a jQuery object, the first element is used + elem.jquery ? elem[ 0 ] : elem + ); + }, + + add: function( selector, context ) { + return this.pushStack( + jQuery.unique( + jQuery.merge( this.get(), jQuery( selector, context ) ) + ) + ); + }, + + addBack: function( selector ) { + return this.add( selector == null ? + this.prevObject : this.prevObject.filter(selector) + ); + } +}); + +function sibling( cur, dir ) { + while ( (cur = cur[dir]) && cur.nodeType !== 1 ) {} + return cur; +} + +jQuery.each({ + parent: function( elem ) { + var parent = elem.parentNode; + return parent && parent.nodeType !== 11 ? parent : null; + }, + parents: function( elem ) { + return jQuery.dir( elem, "parentNode" ); + }, + parentsUntil: function( elem, i, until ) { + return jQuery.dir( elem, "parentNode", until ); + }, + next: function( elem ) { + return sibling( elem, "nextSibling" ); + }, + prev: function( elem ) { + return sibling( elem, "previousSibling" ); + }, + nextAll: function( elem ) { + return jQuery.dir( elem, "nextSibling" ); + }, + prevAll: function( elem ) { + return jQuery.dir( elem, "previousSibling" ); + }, + nextUntil: function( elem, i, until ) { + return jQuery.dir( elem, "nextSibling", until ); + }, + prevUntil: function( elem, i, until ) { + return jQuery.dir( elem, "previousSibling", until ); + }, + siblings: function( elem ) { + return jQuery.sibling( ( elem.parentNode || {} ).firstChild, elem ); + }, + children: function( elem ) { + return jQuery.sibling( elem.firstChild ); + }, + contents: function( elem ) { + return elem.contentDocument || jQuery.merge( [], elem.childNodes ); + } +}, function( name, fn ) { + jQuery.fn[ name ] = function( until, selector ) { + var matched = jQuery.map( this, fn, until ); + + if ( name.slice( -5 ) !== "Until" ) { + selector = until; + } + + if ( selector && typeof selector === "string" ) { + matched = jQuery.filter( selector, matched ); + } + + if ( this.length > 1 ) { + // Remove duplicates + if ( !guaranteedUnique[ name ] ) { + jQuery.unique( matched ); + } + + // Reverse order for parents* and prev-derivatives + if ( rparentsprev.test( name ) ) { + matched.reverse(); + } + } + + return this.pushStack( matched ); + }; +}); +var rnotwhite = (/\S+/g); + + + +// String to Object options format cache +var optionsCache = {}; + +// Convert String-formatted options into Object-formatted ones and store in cache +function createOptions( options ) { + var object = optionsCache[ options ] = {}; + jQuery.each( options.match( rnotwhite ) || [], function( _, flag ) { + object[ flag ] = true; + }); + return object; +} + +/* + * Create a callback list using the following parameters: + * + * options: an optional list of space-separated options that will change how + * the callback list behaves or a more traditional option object + * + * By default a callback list will act like an event callback list and can be + * "fired" multiple times. + * + * Possible options: + * + * once: will ensure the callback list can only be fired once (like a Deferred) + * + * memory: will keep track of previous values and will call any callback added + * after the list has been fired right away with the latest "memorized" + * values (like a Deferred) + * + * unique: will ensure a callback can only be added once (no duplicate in the list) + * + * stopOnFalse: interrupt callings when a callback returns false + * + */ +jQuery.Callbacks = function( options ) { + + // Convert options from String-formatted to Object-formatted if needed + // (we check in cache first) + options = typeof options === "string" ? + ( optionsCache[ options ] || createOptions( options ) ) : + jQuery.extend( {}, options ); + + var // Last fire value (for non-forgettable lists) + memory, + // Flag to know if list was already fired + fired, + // Flag to know if list is currently firing + firing, + // First callback to fire (used internally by add and fireWith) + firingStart, + // End of the loop when firing + firingLength, + // Index of currently firing callback (modified by remove if needed) + firingIndex, + // Actual callback list + list = [], + // Stack of fire calls for repeatable lists + stack = !options.once && [], + // Fire callbacks + fire = function( data ) { + memory = options.memory && data; + fired = true; + firingIndex = firingStart || 0; + firingStart = 0; + firingLength = list.length; + firing = true; + for ( ; list && firingIndex < firingLength; firingIndex++ ) { + if ( list[ firingIndex ].apply( data[ 0 ], data[ 1 ] ) === false && options.stopOnFalse ) { + memory = false; // To prevent further calls using add + break; + } + } + firing = false; + if ( list ) { + if ( stack ) { + if ( stack.length ) { + fire( stack.shift() ); + } + } else if ( memory ) { + list = []; + } else { + self.disable(); + } + } + }, + // Actual Callbacks object + self = { + // Add a callback or a collection of callbacks to the list + add: function() { + if ( list ) { + // First, we save the current length + var start = list.length; + (function add( args ) { + jQuery.each( args, function( _, arg ) { + var type = jQuery.type( arg ); + if ( type === "function" ) { + if ( !options.unique || !self.has( arg ) ) { + list.push( arg ); + } + } else if ( arg && arg.length && type !== "string" ) { + // Inspect recursively + add( arg ); + } + }); + })( arguments ); + // Do we need to add the callbacks to the + // current firing batch? + if ( firing ) { + firingLength = list.length; + // With memory, if we're not firing then + // we should call right away + } else if ( memory ) { + firingStart = start; + fire( memory ); + } + } + return this; + }, + // Remove a callback from the list + remove: function() { + if ( list ) { + jQuery.each( arguments, function( _, arg ) { + var index; + while ( ( index = jQuery.inArray( arg, list, index ) ) > -1 ) { + list.splice( index, 1 ); + // Handle firing indexes + if ( firing ) { + if ( index <= firingLength ) { + firingLength--; + } + if ( index <= firingIndex ) { + firingIndex--; + } + } + } + }); + } + return this; + }, + // Check if a given callback is in the list. + // If no argument is given, return whether or not list has callbacks attached. + has: function( fn ) { + return fn ? jQuery.inArray( fn, list ) > -1 : !!( list && list.length ); + }, + // Remove all callbacks from the list + empty: function() { + list = []; + firingLength = 0; + return this; + }, + // Have the list do nothing anymore + disable: function() { + list = stack = memory = undefined; + return this; + }, + // Is it disabled? + disabled: function() { + return !list; + }, + // Lock the list in its current state + lock: function() { + stack = undefined; + if ( !memory ) { + self.disable(); + } + return this; + }, + // Is it locked? + locked: function() { + return !stack; + }, + // Call all callbacks with the given context and arguments + fireWith: function( context, args ) { + if ( list && ( !fired || stack ) ) { + args = args || []; + args = [ context, args.slice ? args.slice() : args ]; + if ( firing ) { + stack.push( args ); + } else { + fire( args ); + } + } + return this; + }, + // Call all the callbacks with the given arguments + fire: function() { + self.fireWith( this, arguments ); + return this; + }, + // To know if the callbacks have already been called at least once + fired: function() { + return !!fired; + } + }; + + return self; +}; + + +jQuery.extend({ + + Deferred: function( func ) { + var tuples = [ + // action, add listener, listener list, final state + [ "resolve", "done", jQuery.Callbacks("once memory"), "resolved" ], + [ "reject", "fail", jQuery.Callbacks("once memory"), "rejected" ], + [ "notify", "progress", jQuery.Callbacks("memory") ] + ], + state = "pending", + promise = { + state: function() { + return state; + }, + always: function() { + deferred.done( arguments ).fail( arguments ); + return this; + }, + then: function( /* fnDone, fnFail, fnProgress */ ) { + var fns = arguments; + return jQuery.Deferred(function( newDefer ) { + jQuery.each( tuples, function( i, tuple ) { + var fn = jQuery.isFunction( fns[ i ] ) && fns[ i ]; + // deferred[ done | fail | progress ] for forwarding actions to newDefer + deferred[ tuple[1] ](function() { + var returned = fn && fn.apply( this, arguments ); + if ( returned && jQuery.isFunction( returned.promise ) ) { + returned.promise() + .done( newDefer.resolve ) + .fail( newDefer.reject ) + .progress( newDefer.notify ); + } else { + newDefer[ tuple[ 0 ] + "With" ]( this === promise ? newDefer.promise() : this, fn ? [ returned ] : arguments ); + } + }); + }); + fns = null; + }).promise(); + }, + // Get a promise for this deferred + // If obj is provided, the promise aspect is added to the object + promise: function( obj ) { + return obj != null ? jQuery.extend( obj, promise ) : promise; + } + }, + deferred = {}; + + // Keep pipe for back-compat + promise.pipe = promise.then; + + // Add list-specific methods + jQuery.each( tuples, function( i, tuple ) { + var list = tuple[ 2 ], + stateString = tuple[ 3 ]; + + // promise[ done | fail | progress ] = list.add + promise[ tuple[1] ] = list.add; + + // Handle state + if ( stateString ) { + list.add(function() { + // state = [ resolved | rejected ] + state = stateString; + + // [ reject_list | resolve_list ].disable; progress_list.lock + }, tuples[ i ^ 1 ][ 2 ].disable, tuples[ 2 ][ 2 ].lock ); + } + + // deferred[ resolve | reject | notify ] + deferred[ tuple[0] ] = function() { + deferred[ tuple[0] + "With" ]( this === deferred ? promise : this, arguments ); + return this; + }; + deferred[ tuple[0] + "With" ] = list.fireWith; + }); + + // Make the deferred a promise + promise.promise( deferred ); + + // Call given func if any + if ( func ) { + func.call( deferred, deferred ); + } + + // All done! + return deferred; + }, + + // Deferred helper + when: function( subordinate /* , ..., subordinateN */ ) { + var i = 0, + resolveValues = slice.call( arguments ), + length = resolveValues.length, + + // the count of uncompleted subordinates + remaining = length !== 1 || ( subordinate && jQuery.isFunction( subordinate.promise ) ) ? length : 0, + + // the master Deferred. If resolveValues consist of only a single Deferred, just use that. + deferred = remaining === 1 ? subordinate : jQuery.Deferred(), + + // Update function for both resolve and progress values + updateFunc = function( i, contexts, values ) { + return function( value ) { + contexts[ i ] = this; + values[ i ] = arguments.length > 1 ? slice.call( arguments ) : value; + if ( values === progressValues ) { + deferred.notifyWith( contexts, values ); + } else if ( !( --remaining ) ) { + deferred.resolveWith( contexts, values ); + } + }; + }, + + progressValues, progressContexts, resolveContexts; + + // add listeners to Deferred subordinates; treat others as resolved + if ( length > 1 ) { + progressValues = new Array( length ); + progressContexts = new Array( length ); + resolveContexts = new Array( length ); + for ( ; i < length; i++ ) { + if ( resolveValues[ i ] && jQuery.isFunction( resolveValues[ i ].promise ) ) { + resolveValues[ i ].promise() + .done( updateFunc( i, resolveContexts, resolveValues ) ) + .fail( deferred.reject ) + .progress( updateFunc( i, progressContexts, progressValues ) ); + } else { + --remaining; + } + } + } + + // if we're not waiting on anything, resolve the master + if ( !remaining ) { + deferred.resolveWith( resolveContexts, resolveValues ); + } + + return deferred.promise(); + } +}); + + +// The deferred used on DOM ready +var readyList; + +jQuery.fn.ready = function( fn ) { + // Add the callback + jQuery.ready.promise().done( fn ); + + return this; +}; + +jQuery.extend({ + // Is the DOM ready to be used? Set to true once it occurs. + isReady: false, + + // A counter to track how many items to wait for before + // the ready event fires. See #6781 + readyWait: 1, + + // Hold (or release) the ready event + holdReady: function( hold ) { + if ( hold ) { + jQuery.readyWait++; + } else { + jQuery.ready( true ); + } + }, + + // Handle when the DOM is ready + ready: function( wait ) { + + // Abort if there are pending holds or we're already ready + if ( wait === true ? --jQuery.readyWait : jQuery.isReady ) { + return; + } + + // Remember that the DOM is ready + jQuery.isReady = true; + + // If a normal DOM Ready event fired, decrement, and wait if need be + if ( wait !== true && --jQuery.readyWait > 0 ) { + return; + } + + // If there are functions bound, to execute + readyList.resolveWith( document, [ jQuery ] ); + + // Trigger any bound ready events + if ( jQuery.fn.trigger ) { + jQuery( document ).trigger("ready").off("ready"); + } + } +}); + +/** + * The ready event handler and self cleanup method + */ +function completed() { + document.removeEventListener( "DOMContentLoaded", completed, false ); + window.removeEventListener( "load", completed, false ); + jQuery.ready(); +} + +jQuery.ready.promise = function( obj ) { + if ( !readyList ) { + + readyList = jQuery.Deferred(); + + // Catch cases where $(document).ready() is called after the browser event has already occurred. + // we once tried to use readyState "interactive" here, but it caused issues like the one + // discovered by ChrisS here: http://bugs.jquery.com/ticket/12282#comment:15 + if ( document.readyState === "complete" ) { + // Handle it asynchronously to allow scripts the opportunity to delay ready + setTimeout( jQuery.ready ); + + } else { + + // Use the handy event callback + document.addEventListener( "DOMContentLoaded", completed, false ); + + // A fallback to window.onload, that will always work + window.addEventListener( "load", completed, false ); + } + } + return readyList.promise( obj ); +}; + +// Kick off the DOM ready check even if the user does not +jQuery.ready.promise(); + + + + +// Multifunctional method to get and set values of a collection +// The value/s can optionally be executed if it's a function +var access = jQuery.access = function( elems, fn, key, value, chainable, emptyGet, raw ) { + var i = 0, + len = elems.length, + bulk = key == null; + + // Sets many values + if ( jQuery.type( key ) === "object" ) { + chainable = true; + for ( i in key ) { + jQuery.access( elems, fn, i, key[i], true, emptyGet, raw ); + } + + // Sets one value + } else if ( value !== undefined ) { + chainable = true; + + if ( !jQuery.isFunction( value ) ) { + raw = true; + } + + if ( bulk ) { + // Bulk operations run against the entire set + if ( raw ) { + fn.call( elems, value ); + fn = null; + + // ...except when executing function values + } else { + bulk = fn; + fn = function( elem, key, value ) { + return bulk.call( jQuery( elem ), value ); + }; + } + } + + if ( fn ) { + for ( ; i < len; i++ ) { + fn( elems[i], key, raw ? value : value.call( elems[i], i, fn( elems[i], key ) ) ); + } + } + } + + return chainable ? + elems : + + // Gets + bulk ? + fn.call( elems ) : + len ? fn( elems[0], key ) : emptyGet; +}; + + +/** + * Determines whether an object can have data + */ +jQuery.acceptData = function( owner ) { + // Accepts only: + // - Node + // - Node.ELEMENT_NODE + // - Node.DOCUMENT_NODE + // - Object + // - Any + /* jshint -W018 */ + return owner.nodeType === 1 || owner.nodeType === 9 || !( +owner.nodeType ); +}; + + +function Data() { + // Support: Android < 4, + // Old WebKit does not have Object.preventExtensions/freeze method, + // return new empty object instead with no [[set]] accessor + Object.defineProperty( this.cache = {}, 0, { + get: function() { + return {}; + } + }); + + this.expando = jQuery.expando + Math.random(); +} + +Data.uid = 1; +Data.accepts = jQuery.acceptData; + +Data.prototype = { + key: function( owner ) { + // We can accept data for non-element nodes in modern browsers, + // but we should not, see #8335. + // Always return the key for a frozen object. + if ( !Data.accepts( owner ) ) { + return 0; + } + + var descriptor = {}, + // Check if the owner object already has a cache key + unlock = owner[ this.expando ]; + + // If not, create one + if ( !unlock ) { + unlock = Data.uid++; + + // Secure it in a non-enumerable, non-writable property + try { + descriptor[ this.expando ] = { value: unlock }; + Object.defineProperties( owner, descriptor ); + + // Support: Android < 4 + // Fallback to a less secure definition + } catch ( e ) { + descriptor[ this.expando ] = unlock; + jQuery.extend( owner, descriptor ); + } + } + + // Ensure the cache object + if ( !this.cache[ unlock ] ) { + this.cache[ unlock ] = {}; + } + + return unlock; + }, + set: function( owner, data, value ) { + var prop, + // There may be an unlock assigned to this node, + // if there is no entry for this "owner", create one inline + // and set the unlock as though an owner entry had always existed + unlock = this.key( owner ), + cache = this.cache[ unlock ]; + + // Handle: [ owner, key, value ] args + if ( typeof data === "string" ) { + cache[ data ] = value; + + // Handle: [ owner, { properties } ] args + } else { + // Fresh assignments by object are shallow copied + if ( jQuery.isEmptyObject( cache ) ) { + jQuery.extend( this.cache[ unlock ], data ); + // Otherwise, copy the properties one-by-one to the cache object + } else { + for ( prop in data ) { + cache[ prop ] = data[ prop ]; + } + } + } + return cache; + }, + get: function( owner, key ) { + // Either a valid cache is found, or will be created. + // New caches will be created and the unlock returned, + // allowing direct access to the newly created + // empty data object. A valid owner object must be provided. + var cache = this.cache[ this.key( owner ) ]; + + return key === undefined ? + cache : cache[ key ]; + }, + access: function( owner, key, value ) { + var stored; + // In cases where either: + // + // 1. No key was specified + // 2. A string key was specified, but no value provided + // + // Take the "read" path and allow the get method to determine + // which value to return, respectively either: + // + // 1. The entire cache object + // 2. The data stored at the key + // + if ( key === undefined || + ((key && typeof key === "string") && value === undefined) ) { + + stored = this.get( owner, key ); + + return stored !== undefined ? + stored : this.get( owner, jQuery.camelCase(key) ); + } + + // [*]When the key is not a string, or both a key and value + // are specified, set or extend (existing objects) with either: + // + // 1. An object of properties + // 2. A key and value + // + this.set( owner, key, value ); + + // Since the "set" path can have two possible entry points + // return the expected data based on which path was taken[*] + return value !== undefined ? value : key; + }, + remove: function( owner, key ) { + var i, name, camel, + unlock = this.key( owner ), + cache = this.cache[ unlock ]; + + if ( key === undefined ) { + this.cache[ unlock ] = {}; + + } else { + // Support array or space separated string of keys + if ( jQuery.isArray( key ) ) { + // If "name" is an array of keys... + // When data is initially created, via ("key", "val") signature, + // keys will be converted to camelCase. + // Since there is no way to tell _how_ a key was added, remove + // both plain key and camelCase key. #12786 + // This will only penalize the array argument path. + name = key.concat( key.map( jQuery.camelCase ) ); + } else { + camel = jQuery.camelCase( key ); + // Try the string as a key before any manipulation + if ( key in cache ) { + name = [ key, camel ]; + } else { + // If a key with the spaces exists, use it. + // Otherwise, create an array by matching non-whitespace + name = camel; + name = name in cache ? + [ name ] : ( name.match( rnotwhite ) || [] ); + } + } + + i = name.length; + while ( i-- ) { + delete cache[ name[ i ] ]; + } + } + }, + hasData: function( owner ) { + return !jQuery.isEmptyObject( + this.cache[ owner[ this.expando ] ] || {} + ); + }, + discard: function( owner ) { + if ( owner[ this.expando ] ) { + delete this.cache[ owner[ this.expando ] ]; + } + } +}; +var data_priv = new Data(); + +var data_user = new Data(); + + + +/* + Implementation Summary + + 1. Enforce API surface and semantic compatibility with 1.9.x branch + 2. Improve the module's maintainability by reducing the storage + paths to a single mechanism. + 3. Use the same single mechanism to support "private" and "user" data. + 4. _Never_ expose "private" data to user code (TODO: Drop _data, _removeData) + 5. Avoid exposing implementation details on user objects (eg. expando properties) + 6. Provide a clear path for implementation upgrade to WeakMap in 2014 +*/ +var rbrace = /^(?:\{[\w\W]*\}|\[[\w\W]*\])$/, + rmultiDash = /([A-Z])/g; + +function dataAttr( elem, key, data ) { + var name; + + // If nothing was found internally, try to fetch any + // data from the HTML5 data-* attribute + if ( data === undefined && elem.nodeType === 1 ) { + name = "data-" + key.replace( rmultiDash, "-$1" ).toLowerCase(); + data = elem.getAttribute( name ); + + if ( typeof data === "string" ) { + try { + data = data === "true" ? true : + data === "false" ? false : + data === "null" ? null : + // Only convert to a number if it doesn't change the string + +data + "" === data ? +data : + rbrace.test( data ) ? jQuery.parseJSON( data ) : + data; + } catch( e ) {} + + // Make sure we set the data so it isn't changed later + data_user.set( elem, key, data ); + } else { + data = undefined; + } + } + return data; +} + +jQuery.extend({ + hasData: function( elem ) { + return data_user.hasData( elem ) || data_priv.hasData( elem ); + }, + + data: function( elem, name, data ) { + return data_user.access( elem, name, data ); + }, + + removeData: function( elem, name ) { + data_user.remove( elem, name ); + }, + + // TODO: Now that all calls to _data and _removeData have been replaced + // with direct calls to data_priv methods, these can be deprecated. + _data: function( elem, name, data ) { + return data_priv.access( elem, name, data ); + }, + + _removeData: function( elem, name ) { + data_priv.remove( elem, name ); + } +}); + +jQuery.fn.extend({ + data: function( key, value ) { + var i, name, data, + elem = this[ 0 ], + attrs = elem && elem.attributes; + + // Gets all values + if ( key === undefined ) { + if ( this.length ) { + data = data_user.get( elem ); + + if ( elem.nodeType === 1 && !data_priv.get( elem, "hasDataAttrs" ) ) { + i = attrs.length; + while ( i-- ) { + name = attrs[ i ].name; + + if ( name.indexOf( "data-" ) === 0 ) { + name = jQuery.camelCase( name.slice(5) ); + dataAttr( elem, name, data[ name ] ); + } + } + data_priv.set( elem, "hasDataAttrs", true ); + } + } + + return data; + } + + // Sets multiple values + if ( typeof key === "object" ) { + return this.each(function() { + data_user.set( this, key ); + }); + } + + return access( this, function( value ) { + var data, + camelKey = jQuery.camelCase( key ); + + // The calling jQuery object (element matches) is not empty + // (and therefore has an element appears at this[ 0 ]) and the + // `value` parameter was not undefined. An empty jQuery object + // will result in `undefined` for elem = this[ 0 ] which will + // throw an exception if an attempt to read a data cache is made. + if ( elem && value === undefined ) { + // Attempt to get data from the cache + // with the key as-is + data = data_user.get( elem, key ); + if ( data !== undefined ) { + return data; + } + + // Attempt to get data from the cache + // with the key camelized + data = data_user.get( elem, camelKey ); + if ( data !== undefined ) { + return data; + } + + // Attempt to "discover" the data in + // HTML5 custom data-* attrs + data = dataAttr( elem, camelKey, undefined ); + if ( data !== undefined ) { + return data; + } + + // We tried really hard, but the data doesn't exist. + return; + } + + // Set the data... + this.each(function() { + // First, attempt to store a copy or reference of any + // data that might've been store with a camelCased key. + var data = data_user.get( this, camelKey ); + + // For HTML5 data-* attribute interop, we have to + // store property names with dashes in a camelCase form. + // This might not apply to all properties...* + data_user.set( this, camelKey, value ); + + // *... In the case of properties that might _actually_ + // have dashes, we need to also store a copy of that + // unchanged property. + if ( key.indexOf("-") !== -1 && data !== undefined ) { + data_user.set( this, key, value ); + } + }); + }, null, value, arguments.length > 1, null, true ); + }, + + removeData: function( key ) { + return this.each(function() { + data_user.remove( this, key ); + }); + } +}); + + +jQuery.extend({ + queue: function( elem, type, data ) { + var queue; + + if ( elem ) { + type = ( type || "fx" ) + "queue"; + queue = data_priv.get( elem, type ); + + // Speed up dequeue by getting out quickly if this is just a lookup + if ( data ) { + if ( !queue || jQuery.isArray( data ) ) { + queue = data_priv.access( elem, type, jQuery.makeArray(data) ); + } else { + queue.push( data ); + } + } + return queue || []; + } + }, + + dequeue: function( elem, type ) { + type = type || "fx"; + + var queue = jQuery.queue( elem, type ), + startLength = queue.length, + fn = queue.shift(), + hooks = jQuery._queueHooks( elem, type ), + next = function() { + jQuery.dequeue( elem, type ); + }; + + // If the fx queue is dequeued, always remove the progress sentinel + if ( fn === "inprogress" ) { + fn = queue.shift(); + startLength--; + } + + if ( fn ) { + + // Add a progress sentinel to prevent the fx queue from being + // automatically dequeued + if ( type === "fx" ) { + queue.unshift( "inprogress" ); + } + + // clear up the last queue stop function + delete hooks.stop; + fn.call( elem, next, hooks ); + } + + if ( !startLength && hooks ) { + hooks.empty.fire(); + } + }, + + // not intended for public consumption - generates a queueHooks object, or returns the current one + _queueHooks: function( elem, type ) { + var key = type + "queueHooks"; + return data_priv.get( elem, key ) || data_priv.access( elem, key, { + empty: jQuery.Callbacks("once memory").add(function() { + data_priv.remove( elem, [ type + "queue", key ] ); + }) + }); + } +}); + +jQuery.fn.extend({ + queue: function( type, data ) { + var setter = 2; + + if ( typeof type !== "string" ) { + data = type; + type = "fx"; + setter--; + } + + if ( arguments.length < setter ) { + return jQuery.queue( this[0], type ); + } + + return data === undefined ? + this : + this.each(function() { + var queue = jQuery.queue( this, type, data ); + + // ensure a hooks for this queue + jQuery._queueHooks( this, type ); + + if ( type === "fx" && queue[0] !== "inprogress" ) { + jQuery.dequeue( this, type ); + } + }); + }, + dequeue: function( type ) { + return this.each(function() { + jQuery.dequeue( this, type ); + }); + }, + clearQueue: function( type ) { + return this.queue( type || "fx", [] ); + }, + // Get a promise resolved when queues of a certain type + // are emptied (fx is the type by default) + promise: function( type, obj ) { + var tmp, + count = 1, + defer = jQuery.Deferred(), + elements = this, + i = this.length, + resolve = function() { + if ( !( --count ) ) { + defer.resolveWith( elements, [ elements ] ); + } + }; + + if ( typeof type !== "string" ) { + obj = type; + type = undefined; + } + type = type || "fx"; + + while ( i-- ) { + tmp = data_priv.get( elements[ i ], type + "queueHooks" ); + if ( tmp && tmp.empty ) { + count++; + tmp.empty.add( resolve ); + } + } + resolve(); + return defer.promise( obj ); + } +}); +var pnum = (/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/).source; + +var cssExpand = [ "Top", "Right", "Bottom", "Left" ]; + +var isHidden = function( elem, el ) { + // isHidden might be called from jQuery#filter function; + // in that case, element will be second argument + elem = el || elem; + return jQuery.css( elem, "display" ) === "none" || !jQuery.contains( elem.ownerDocument, elem ); + }; + +var rcheckableType = (/^(?:checkbox|radio)$/i); + + + +(function() { + var fragment = document.createDocumentFragment(), + div = fragment.appendChild( document.createElement( "div" ) ); + + // #11217 - WebKit loses check when the name is after the checked attribute + div.innerHTML = ""; + + // Support: Safari 5.1, iOS 5.1, Android 4.x, Android 2.3 + // old WebKit doesn't clone checked state correctly in fragments + support.checkClone = div.cloneNode( true ).cloneNode( true ).lastChild.checked; + + // Make sure textarea (and checkbox) defaultValue is properly cloned + // Support: IE9-IE11+ + div.innerHTML = ""; + support.noCloneChecked = !!div.cloneNode( true ).lastChild.defaultValue; +})(); +var strundefined = typeof undefined; + + + +support.focusinBubbles = "onfocusin" in window; + + +var + rkeyEvent = /^key/, + rmouseEvent = /^(?:mouse|contextmenu)|click/, + rfocusMorph = /^(?:focusinfocus|focusoutblur)$/, + rtypenamespace = /^([^.]*)(?:\.(.+)|)$/; + +function returnTrue() { + return true; +} + +function returnFalse() { + return false; +} + +function safeActiveElement() { + try { + return document.activeElement; + } catch ( err ) { } +} + +/* + * Helper functions for managing events -- not part of the public interface. + * Props to Dean Edwards' addEvent library for many of the ideas. + */ +jQuery.event = { + + global: {}, + + add: function( elem, types, handler, data, selector ) { + + var handleObjIn, eventHandle, tmp, + events, t, handleObj, + special, handlers, type, namespaces, origType, + elemData = data_priv.get( elem ); + + // Don't attach events to noData or text/comment nodes (but allow plain objects) + if ( !elemData ) { + return; + } + + // Caller can pass in an object of custom data in lieu of the handler + if ( handler.handler ) { + handleObjIn = handler; + handler = handleObjIn.handler; + selector = handleObjIn.selector; + } + + // Make sure that the handler has a unique ID, used to find/remove it later + if ( !handler.guid ) { + handler.guid = jQuery.guid++; + } + + // Init the element's event structure and main handler, if this is the first + if ( !(events = elemData.events) ) { + events = elemData.events = {}; + } + if ( !(eventHandle = elemData.handle) ) { + eventHandle = elemData.handle = function( e ) { + // Discard the second event of a jQuery.event.trigger() and + // when an event is called after a page has unloaded + return typeof jQuery !== strundefined && jQuery.event.triggered !== e.type ? + jQuery.event.dispatch.apply( elem, arguments ) : undefined; + }; + } + + // Handle multiple events separated by a space + types = ( types || "" ).match( rnotwhite ) || [ "" ]; + t = types.length; + while ( t-- ) { + tmp = rtypenamespace.exec( types[t] ) || []; + type = origType = tmp[1]; + namespaces = ( tmp[2] || "" ).split( "." ).sort(); + + // There *must* be a type, no attaching namespace-only handlers + if ( !type ) { + continue; + } + + // If event changes its type, use the special event handlers for the changed type + special = jQuery.event.special[ type ] || {}; + + // If selector defined, determine special event api type, otherwise given type + type = ( selector ? special.delegateType : special.bindType ) || type; + + // Update special based on newly reset type + special = jQuery.event.special[ type ] || {}; + + // handleObj is passed to all event handlers + handleObj = jQuery.extend({ + type: type, + origType: origType, + data: data, + handler: handler, + guid: handler.guid, + selector: selector, + needsContext: selector && jQuery.expr.match.needsContext.test( selector ), + namespace: namespaces.join(".") + }, handleObjIn ); + + // Init the event handler queue if we're the first + if ( !(handlers = events[ type ]) ) { + handlers = events[ type ] = []; + handlers.delegateCount = 0; + + // Only use addEventListener if the special events handler returns false + if ( !special.setup || special.setup.call( elem, data, namespaces, eventHandle ) === false ) { + if ( elem.addEventListener ) { + elem.addEventListener( type, eventHandle, false ); + } + } + } + + if ( special.add ) { + special.add.call( elem, handleObj ); + + if ( !handleObj.handler.guid ) { + handleObj.handler.guid = handler.guid; + } + } + + // Add to the element's handler list, delegates in front + if ( selector ) { + handlers.splice( handlers.delegateCount++, 0, handleObj ); + } else { + handlers.push( handleObj ); + } + + // Keep track of which events have ever been used, for event optimization + jQuery.event.global[ type ] = true; + } + + }, + + // Detach an event or set of events from an element + remove: function( elem, types, handler, selector, mappedTypes ) { + + var j, origCount, tmp, + events, t, handleObj, + special, handlers, type, namespaces, origType, + elemData = data_priv.hasData( elem ) && data_priv.get( elem ); + + if ( !elemData || !(events = elemData.events) ) { + return; + } + + // Once for each type.namespace in types; type may be omitted + types = ( types || "" ).match( rnotwhite ) || [ "" ]; + t = types.length; + while ( t-- ) { + tmp = rtypenamespace.exec( types[t] ) || []; + type = origType = tmp[1]; + namespaces = ( tmp[2] || "" ).split( "." ).sort(); + + // Unbind all events (on this namespace, if provided) for the element + if ( !type ) { + for ( type in events ) { + jQuery.event.remove( elem, type + types[ t ], handler, selector, true ); + } + continue; + } + + special = jQuery.event.special[ type ] || {}; + type = ( selector ? special.delegateType : special.bindType ) || type; + handlers = events[ type ] || []; + tmp = tmp[2] && new RegExp( "(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)" ); + + // Remove matching events + origCount = j = handlers.length; + while ( j-- ) { + handleObj = handlers[ j ]; + + if ( ( mappedTypes || origType === handleObj.origType ) && + ( !handler || handler.guid === handleObj.guid ) && + ( !tmp || tmp.test( handleObj.namespace ) ) && + ( !selector || selector === handleObj.selector || selector === "**" && handleObj.selector ) ) { + handlers.splice( j, 1 ); + + if ( handleObj.selector ) { + handlers.delegateCount--; + } + if ( special.remove ) { + special.remove.call( elem, handleObj ); + } + } + } + + // Remove generic event handler if we removed something and no more handlers exist + // (avoids potential for endless recursion during removal of special event handlers) + if ( origCount && !handlers.length ) { + if ( !special.teardown || special.teardown.call( elem, namespaces, elemData.handle ) === false ) { + jQuery.removeEvent( elem, type, elemData.handle ); + } + + delete events[ type ]; + } + } + + // Remove the expando if it's no longer used + if ( jQuery.isEmptyObject( events ) ) { + delete elemData.handle; + data_priv.remove( elem, "events" ); + } + }, + + trigger: function( event, data, elem, onlyHandlers ) { + + var i, cur, tmp, bubbleType, ontype, handle, special, + eventPath = [ elem || document ], + type = hasOwn.call( event, "type" ) ? event.type : event, + namespaces = hasOwn.call( event, "namespace" ) ? event.namespace.split(".") : []; + + cur = tmp = elem = elem || document; + + // Don't do events on text and comment nodes + if ( elem.nodeType === 3 || elem.nodeType === 8 ) { + return; + } + + // focus/blur morphs to focusin/out; ensure we're not firing them right now + if ( rfocusMorph.test( type + jQuery.event.triggered ) ) { + return; + } + + if ( type.indexOf(".") >= 0 ) { + // Namespaced trigger; create a regexp to match event type in handle() + namespaces = type.split("."); + type = namespaces.shift(); + namespaces.sort(); + } + ontype = type.indexOf(":") < 0 && "on" + type; + + // Caller can pass in a jQuery.Event object, Object, or just an event type string + event = event[ jQuery.expando ] ? + event : + new jQuery.Event( type, typeof event === "object" && event ); + + // Trigger bitmask: & 1 for native handlers; & 2 for jQuery (always true) + event.isTrigger = onlyHandlers ? 2 : 3; + event.namespace = namespaces.join("."); + event.namespace_re = event.namespace ? + new RegExp( "(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)" ) : + null; + + // Clean up the event in case it is being reused + event.result = undefined; + if ( !event.target ) { + event.target = elem; + } + + // Clone any incoming data and prepend the event, creating the handler arg list + data = data == null ? + [ event ] : + jQuery.makeArray( data, [ event ] ); + + // Allow special events to draw outside the lines + special = jQuery.event.special[ type ] || {}; + if ( !onlyHandlers && special.trigger && special.trigger.apply( elem, data ) === false ) { + return; + } + + // Determine event propagation path in advance, per W3C events spec (#9951) + // Bubble up to document, then to window; watch for a global ownerDocument var (#9724) + if ( !onlyHandlers && !special.noBubble && !jQuery.isWindow( elem ) ) { + + bubbleType = special.delegateType || type; + if ( !rfocusMorph.test( bubbleType + type ) ) { + cur = cur.parentNode; + } + for ( ; cur; cur = cur.parentNode ) { + eventPath.push( cur ); + tmp = cur; + } + + // Only add window if we got to document (e.g., not plain obj or detached DOM) + if ( tmp === (elem.ownerDocument || document) ) { + eventPath.push( tmp.defaultView || tmp.parentWindow || window ); + } + } + + // Fire handlers on the event path + i = 0; + while ( (cur = eventPath[i++]) && !event.isPropagationStopped() ) { + + event.type = i > 1 ? + bubbleType : + special.bindType || type; + + // jQuery handler + handle = ( data_priv.get( cur, "events" ) || {} )[ event.type ] && data_priv.get( cur, "handle" ); + if ( handle ) { + handle.apply( cur, data ); + } + + // Native handler + handle = ontype && cur[ ontype ]; + if ( handle && handle.apply && jQuery.acceptData( cur ) ) { + event.result = handle.apply( cur, data ); + if ( event.result === false ) { + event.preventDefault(); + } + } + } + event.type = type; + + // If nobody prevented the default action, do it now + if ( !onlyHandlers && !event.isDefaultPrevented() ) { + + if ( (!special._default || special._default.apply( eventPath.pop(), data ) === false) && + jQuery.acceptData( elem ) ) { + + // Call a native DOM method on the target with the same name name as the event. + // Don't do default actions on window, that's where global variables be (#6170) + if ( ontype && jQuery.isFunction( elem[ type ] ) && !jQuery.isWindow( elem ) ) { + + // Don't re-trigger an onFOO event when we call its FOO() method + tmp = elem[ ontype ]; + + if ( tmp ) { + elem[ ontype ] = null; + } + + // Prevent re-triggering of the same event, since we already bubbled it above + jQuery.event.triggered = type; + elem[ type ](); + jQuery.event.triggered = undefined; + + if ( tmp ) { + elem[ ontype ] = tmp; + } + } + } + } + + return event.result; + }, + + dispatch: function( event ) { + + // Make a writable jQuery.Event from the native event object + event = jQuery.event.fix( event ); + + var i, j, ret, matched, handleObj, + handlerQueue = [], + args = slice.call( arguments ), + handlers = ( data_priv.get( this, "events" ) || {} )[ event.type ] || [], + special = jQuery.event.special[ event.type ] || {}; + + // Use the fix-ed jQuery.Event rather than the (read-only) native event + args[0] = event; + event.delegateTarget = this; + + // Call the preDispatch hook for the mapped type, and let it bail if desired + if ( special.preDispatch && special.preDispatch.call( this, event ) === false ) { + return; + } + + // Determine handlers + handlerQueue = jQuery.event.handlers.call( this, event, handlers ); + + // Run delegates first; they may want to stop propagation beneath us + i = 0; + while ( (matched = handlerQueue[ i++ ]) && !event.isPropagationStopped() ) { + event.currentTarget = matched.elem; + + j = 0; + while ( (handleObj = matched.handlers[ j++ ]) && !event.isImmediatePropagationStopped() ) { + + // Triggered event must either 1) have no namespace, or + // 2) have namespace(s) a subset or equal to those in the bound event (both can have no namespace). + if ( !event.namespace_re || event.namespace_re.test( handleObj.namespace ) ) { + + event.handleObj = handleObj; + event.data = handleObj.data; + + ret = ( (jQuery.event.special[ handleObj.origType ] || {}).handle || handleObj.handler ) + .apply( matched.elem, args ); + + if ( ret !== undefined ) { + if ( (event.result = ret) === false ) { + event.preventDefault(); + event.stopPropagation(); + } + } + } + } + } + + // Call the postDispatch hook for the mapped type + if ( special.postDispatch ) { + special.postDispatch.call( this, event ); + } + + return event.result; + }, + + handlers: function( event, handlers ) { + var i, matches, sel, handleObj, + handlerQueue = [], + delegateCount = handlers.delegateCount, + cur = event.target; + + // Find delegate handlers + // Black-hole SVG instance trees (#13180) + // Avoid non-left-click bubbling in Firefox (#3861) + if ( delegateCount && cur.nodeType && (!event.button || event.type !== "click") ) { + + for ( ; cur !== this; cur = cur.parentNode || this ) { + + // Don't process clicks on disabled elements (#6911, #8165, #11382, #11764) + if ( cur.disabled !== true || event.type !== "click" ) { + matches = []; + for ( i = 0; i < delegateCount; i++ ) { + handleObj = handlers[ i ]; + + // Don't conflict with Object.prototype properties (#13203) + sel = handleObj.selector + " "; + + if ( matches[ sel ] === undefined ) { + matches[ sel ] = handleObj.needsContext ? + jQuery( sel, this ).index( cur ) >= 0 : + jQuery.find( sel, this, null, [ cur ] ).length; + } + if ( matches[ sel ] ) { + matches.push( handleObj ); + } + } + if ( matches.length ) { + handlerQueue.push({ elem: cur, handlers: matches }); + } + } + } + } + + // Add the remaining (directly-bound) handlers + if ( delegateCount < handlers.length ) { + handlerQueue.push({ elem: this, handlers: handlers.slice( delegateCount ) }); + } + + return handlerQueue; + }, + + // Includes some event props shared by KeyEvent and MouseEvent + props: "altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "), + + fixHooks: {}, + + keyHooks: { + props: "char charCode key keyCode".split(" "), + filter: function( event, original ) { + + // Add which for key events + if ( event.which == null ) { + event.which = original.charCode != null ? original.charCode : original.keyCode; + } + + return event; + } + }, + + mouseHooks: { + props: "button buttons clientX clientY offsetX offsetY pageX pageY screenX screenY toElement".split(" "), + filter: function( event, original ) { + var eventDoc, doc, body, + button = original.button; + + // Calculate pageX/Y if missing and clientX/Y available + if ( event.pageX == null && original.clientX != null ) { + eventDoc = event.target.ownerDocument || document; + doc = eventDoc.documentElement; + body = eventDoc.body; + + event.pageX = original.clientX + ( doc && doc.scrollLeft || body && body.scrollLeft || 0 ) - ( doc && doc.clientLeft || body && body.clientLeft || 0 ); + event.pageY = original.clientY + ( doc && doc.scrollTop || body && body.scrollTop || 0 ) - ( doc && doc.clientTop || body && body.clientTop || 0 ); + } + + // Add which for click: 1 === left; 2 === middle; 3 === right + // Note: button is not normalized, so don't use it + if ( !event.which && button !== undefined ) { + event.which = ( button & 1 ? 1 : ( button & 2 ? 3 : ( button & 4 ? 2 : 0 ) ) ); + } + + return event; + } + }, + + fix: function( event ) { + if ( event[ jQuery.expando ] ) { + return event; + } + + // Create a writable copy of the event object and normalize some properties + var i, prop, copy, + type = event.type, + originalEvent = event, + fixHook = this.fixHooks[ type ]; + + if ( !fixHook ) { + this.fixHooks[ type ] = fixHook = + rmouseEvent.test( type ) ? this.mouseHooks : + rkeyEvent.test( type ) ? this.keyHooks : + {}; + } + copy = fixHook.props ? this.props.concat( fixHook.props ) : this.props; + + event = new jQuery.Event( originalEvent ); + + i = copy.length; + while ( i-- ) { + prop = copy[ i ]; + event[ prop ] = originalEvent[ prop ]; + } + + // Support: Cordova 2.5 (WebKit) (#13255) + // All events should have a target; Cordova deviceready doesn't + if ( !event.target ) { + event.target = document; + } + + // Support: Safari 6.0+, Chrome < 28 + // Target should not be a text node (#504, #13143) + if ( event.target.nodeType === 3 ) { + event.target = event.target.parentNode; + } + + return fixHook.filter ? fixHook.filter( event, originalEvent ) : event; + }, + + special: { + load: { + // Prevent triggered image.load events from bubbling to window.load + noBubble: true + }, + focus: { + // Fire native event if possible so blur/focus sequence is correct + trigger: function() { + if ( this !== safeActiveElement() && this.focus ) { + this.focus(); + return false; + } + }, + delegateType: "focusin" + }, + blur: { + trigger: function() { + if ( this === safeActiveElement() && this.blur ) { + this.blur(); + return false; + } + }, + delegateType: "focusout" + }, + click: { + // For checkbox, fire native event so checked state will be right + trigger: function() { + if ( this.type === "checkbox" && this.click && jQuery.nodeName( this, "input" ) ) { + this.click(); + return false; + } + }, + + // For cross-browser consistency, don't fire native .click() on links + _default: function( event ) { + return jQuery.nodeName( event.target, "a" ); + } + }, + + beforeunload: { + postDispatch: function( event ) { + + // Support: Firefox 20+ + // Firefox doesn't alert if the returnValue field is not set. + if ( event.result !== undefined ) { + event.originalEvent.returnValue = event.result; + } + } + } + }, + + simulate: function( type, elem, event, bubble ) { + // Piggyback on a donor event to simulate a different one. + // Fake originalEvent to avoid donor's stopPropagation, but if the + // simulated event prevents default then we do the same on the donor. + var e = jQuery.extend( + new jQuery.Event(), + event, + { + type: type, + isSimulated: true, + originalEvent: {} + } + ); + if ( bubble ) { + jQuery.event.trigger( e, null, elem ); + } else { + jQuery.event.dispatch.call( elem, e ); + } + if ( e.isDefaultPrevented() ) { + event.preventDefault(); + } + } +}; + +jQuery.removeEvent = function( elem, type, handle ) { + if ( elem.removeEventListener ) { + elem.removeEventListener( type, handle, false ); + } +}; + +jQuery.Event = function( src, props ) { + // Allow instantiation without the 'new' keyword + if ( !(this instanceof jQuery.Event) ) { + return new jQuery.Event( src, props ); + } + + // Event object + if ( src && src.type ) { + this.originalEvent = src; + this.type = src.type; + + // Events bubbling up the document may have been marked as prevented + // by a handler lower down the tree; reflect the correct value. + this.isDefaultPrevented = src.defaultPrevented || + // Support: Android < 4.0 + src.defaultPrevented === undefined && + src.getPreventDefault && src.getPreventDefault() ? + returnTrue : + returnFalse; + + // Event type + } else { + this.type = src; + } + + // Put explicitly provided properties onto the event object + if ( props ) { + jQuery.extend( this, props ); + } + + // Create a timestamp if incoming event doesn't have one + this.timeStamp = src && src.timeStamp || jQuery.now(); + + // Mark it as fixed + this[ jQuery.expando ] = true; +}; + +// jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding +// http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html +jQuery.Event.prototype = { + isDefaultPrevented: returnFalse, + isPropagationStopped: returnFalse, + isImmediatePropagationStopped: returnFalse, + + preventDefault: function() { + var e = this.originalEvent; + + this.isDefaultPrevented = returnTrue; + + if ( e && e.preventDefault ) { + e.preventDefault(); + } + }, + stopPropagation: function() { + var e = this.originalEvent; + + this.isPropagationStopped = returnTrue; + + if ( e && e.stopPropagation ) { + e.stopPropagation(); + } + }, + stopImmediatePropagation: function() { + this.isImmediatePropagationStopped = returnTrue; + this.stopPropagation(); + } +}; + +// Create mouseenter/leave events using mouseover/out and event-time checks +// Support: Chrome 15+ +jQuery.each({ + mouseenter: "mouseover", + mouseleave: "mouseout" +}, function( orig, fix ) { + jQuery.event.special[ orig ] = { + delegateType: fix, + bindType: fix, + + handle: function( event ) { + var ret, + target = this, + related = event.relatedTarget, + handleObj = event.handleObj; + + // For mousenter/leave call the handler if related is outside the target. + // NB: No relatedTarget if the mouse left/entered the browser window + if ( !related || (related !== target && !jQuery.contains( target, related )) ) { + event.type = handleObj.origType; + ret = handleObj.handler.apply( this, arguments ); + event.type = fix; + } + return ret; + } + }; +}); + +// Create "bubbling" focus and blur events +// Support: Firefox, Chrome, Safari +if ( !support.focusinBubbles ) { + jQuery.each({ focus: "focusin", blur: "focusout" }, function( orig, fix ) { + + // Attach a single capturing handler on the document while someone wants focusin/focusout + var handler = function( event ) { + jQuery.event.simulate( fix, event.target, jQuery.event.fix( event ), true ); + }; + + jQuery.event.special[ fix ] = { + setup: function() { + var doc = this.ownerDocument || this, + attaches = data_priv.access( doc, fix ); + + if ( !attaches ) { + doc.addEventListener( orig, handler, true ); + } + data_priv.access( doc, fix, ( attaches || 0 ) + 1 ); + }, + teardown: function() { + var doc = this.ownerDocument || this, + attaches = data_priv.access( doc, fix ) - 1; + + if ( !attaches ) { + doc.removeEventListener( orig, handler, true ); + data_priv.remove( doc, fix ); + + } else { + data_priv.access( doc, fix, attaches ); + } + } + }; + }); +} + +jQuery.fn.extend({ + + on: function( types, selector, data, fn, /*INTERNAL*/ one ) { + var origFn, type; + + // Types can be a map of types/handlers + if ( typeof types === "object" ) { + // ( types-Object, selector, data ) + if ( typeof selector !== "string" ) { + // ( types-Object, data ) + data = data || selector; + selector = undefined; + } + for ( type in types ) { + this.on( type, selector, data, types[ type ], one ); + } + return this; + } + + if ( data == null && fn == null ) { + // ( types, fn ) + fn = selector; + data = selector = undefined; + } else if ( fn == null ) { + if ( typeof selector === "string" ) { + // ( types, selector, fn ) + fn = data; + data = undefined; + } else { + // ( types, data, fn ) + fn = data; + data = selector; + selector = undefined; + } + } + if ( fn === false ) { + fn = returnFalse; + } else if ( !fn ) { + return this; + } + + if ( one === 1 ) { + origFn = fn; + fn = function( event ) { + // Can use an empty set, since event contains the info + jQuery().off( event ); + return origFn.apply( this, arguments ); + }; + // Use same guid so caller can remove using origFn + fn.guid = origFn.guid || ( origFn.guid = jQuery.guid++ ); + } + return this.each( function() { + jQuery.event.add( this, types, fn, data, selector ); + }); + }, + one: function( types, selector, data, fn ) { + return this.on( types, selector, data, fn, 1 ); + }, + off: function( types, selector, fn ) { + var handleObj, type; + if ( types && types.preventDefault && types.handleObj ) { + // ( event ) dispatched jQuery.Event + handleObj = types.handleObj; + jQuery( types.delegateTarget ).off( + handleObj.namespace ? handleObj.origType + "." + handleObj.namespace : handleObj.origType, + handleObj.selector, + handleObj.handler + ); + return this; + } + if ( typeof types === "object" ) { + // ( types-object [, selector] ) + for ( type in types ) { + this.off( type, selector, types[ type ] ); + } + return this; + } + if ( selector === false || typeof selector === "function" ) { + // ( types [, fn] ) + fn = selector; + selector = undefined; + } + if ( fn === false ) { + fn = returnFalse; + } + return this.each(function() { + jQuery.event.remove( this, types, fn, selector ); + }); + }, + + trigger: function( type, data ) { + return this.each(function() { + jQuery.event.trigger( type, data, this ); + }); + }, + triggerHandler: function( type, data ) { + var elem = this[0]; + if ( elem ) { + return jQuery.event.trigger( type, data, elem, true ); + } + } +}); + + +var + rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi, + rtagName = /<([\w:]+)/, + rhtml = /<|&#?\w+;/, + rnoInnerhtml = /<(?:script|style|link)/i, + // checked="checked" or checked + rchecked = /checked\s*(?:[^=]|=\s*.checked.)/i, + rscriptType = /^$|\/(?:java|ecma)script/i, + rscriptTypeMasked = /^true\/(.*)/, + rcleanScript = /^\s*\s*$/g, + + // We have to close these tags to support XHTML (#13200) + wrapMap = { + + // Support: IE 9 + option: [ 1, "" ], + + thead: [ 1, "", "
    " ], + col: [ 2, "", "
    " ], + tr: [ 2, "", "
    " ], + td: [ 3, "", "
    " ], + + _default: [ 0, "", "" ] + }; + +// Support: IE 9 +wrapMap.optgroup = wrapMap.option; + +wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead; +wrapMap.th = wrapMap.td; + +// Support: 1.x compatibility +// Manipulating tables requires a tbody +function manipulationTarget( elem, content ) { + return jQuery.nodeName( elem, "table" ) && + jQuery.nodeName( content.nodeType !== 11 ? content : content.firstChild, "tr" ) ? + + elem.getElementsByTagName("tbody")[0] || + elem.appendChild( elem.ownerDocument.createElement("tbody") ) : + elem; +} + +// Replace/restore the type attribute of script elements for safe DOM manipulation +function disableScript( elem ) { + elem.type = (elem.getAttribute("type") !== null) + "/" + elem.type; + return elem; +} +function restoreScript( elem ) { + var match = rscriptTypeMasked.exec( elem.type ); + + if ( match ) { + elem.type = match[ 1 ]; + } else { + elem.removeAttribute("type"); + } + + return elem; +} + +// Mark scripts as having already been evaluated +function setGlobalEval( elems, refElements ) { + var i = 0, + l = elems.length; + + for ( ; i < l; i++ ) { + data_priv.set( + elems[ i ], "globalEval", !refElements || data_priv.get( refElements[ i ], "globalEval" ) + ); + } +} + +function cloneCopyEvent( src, dest ) { + var i, l, type, pdataOld, pdataCur, udataOld, udataCur, events; + + if ( dest.nodeType !== 1 ) { + return; + } + + // 1. Copy private data: events, handlers, etc. + if ( data_priv.hasData( src ) ) { + pdataOld = data_priv.access( src ); + pdataCur = data_priv.set( dest, pdataOld ); + events = pdataOld.events; + + if ( events ) { + delete pdataCur.handle; + pdataCur.events = {}; + + for ( type in events ) { + for ( i = 0, l = events[ type ].length; i < l; i++ ) { + jQuery.event.add( dest, type, events[ type ][ i ] ); + } + } + } + } + + // 2. Copy user data + if ( data_user.hasData( src ) ) { + udataOld = data_user.access( src ); + udataCur = jQuery.extend( {}, udataOld ); + + data_user.set( dest, udataCur ); + } +} + +function getAll( context, tag ) { + var ret = context.getElementsByTagName ? context.getElementsByTagName( tag || "*" ) : + context.querySelectorAll ? context.querySelectorAll( tag || "*" ) : + []; + + return tag === undefined || tag && jQuery.nodeName( context, tag ) ? + jQuery.merge( [ context ], ret ) : + ret; +} + +// Support: IE >= 9 +function fixInput( src, dest ) { + var nodeName = dest.nodeName.toLowerCase(); + + // Fails to persist the checked state of a cloned checkbox or radio button. + if ( nodeName === "input" && rcheckableType.test( src.type ) ) { + dest.checked = src.checked; + + // Fails to return the selected option to the default selected state when cloning options + } else if ( nodeName === "input" || nodeName === "textarea" ) { + dest.defaultValue = src.defaultValue; + } +} + +jQuery.extend({ + clone: function( elem, dataAndEvents, deepDataAndEvents ) { + var i, l, srcElements, destElements, + clone = elem.cloneNode( true ), + inPage = jQuery.contains( elem.ownerDocument, elem ); + + // Support: IE >= 9 + // Fix Cloning issues + if ( !support.noCloneChecked && ( elem.nodeType === 1 || elem.nodeType === 11 ) && + !jQuery.isXMLDoc( elem ) ) { + + // We eschew Sizzle here for performance reasons: http://jsperf.com/getall-vs-sizzle/2 + destElements = getAll( clone ); + srcElements = getAll( elem ); + + for ( i = 0, l = srcElements.length; i < l; i++ ) { + fixInput( srcElements[ i ], destElements[ i ] ); + } + } + + // Copy the events from the original to the clone + if ( dataAndEvents ) { + if ( deepDataAndEvents ) { + srcElements = srcElements || getAll( elem ); + destElements = destElements || getAll( clone ); + + for ( i = 0, l = srcElements.length; i < l; i++ ) { + cloneCopyEvent( srcElements[ i ], destElements[ i ] ); + } + } else { + cloneCopyEvent( elem, clone ); + } + } + + // Preserve script evaluation history + destElements = getAll( clone, "script" ); + if ( destElements.length > 0 ) { + setGlobalEval( destElements, !inPage && getAll( elem, "script" ) ); + } + + // Return the cloned set + return clone; + }, + + buildFragment: function( elems, context, scripts, selection ) { + var elem, tmp, tag, wrap, contains, j, + fragment = context.createDocumentFragment(), + nodes = [], + i = 0, + l = elems.length; + + for ( ; i < l; i++ ) { + elem = elems[ i ]; + + if ( elem || elem === 0 ) { + + // Add nodes directly + if ( jQuery.type( elem ) === "object" ) { + // Support: QtWebKit + // jQuery.merge because push.apply(_, arraylike) throws + jQuery.merge( nodes, elem.nodeType ? [ elem ] : elem ); + + // Convert non-html into a text node + } else if ( !rhtml.test( elem ) ) { + nodes.push( context.createTextNode( elem ) ); + + // Convert html into DOM nodes + } else { + tmp = tmp || fragment.appendChild( context.createElement("div") ); + + // Deserialize a standard representation + tag = ( rtagName.exec( elem ) || [ "", "" ] )[ 1 ].toLowerCase(); + wrap = wrapMap[ tag ] || wrapMap._default; + tmp.innerHTML = wrap[ 1 ] + elem.replace( rxhtmlTag, "<$1>" ) + wrap[ 2 ]; + + // Descend through wrappers to the right content + j = wrap[ 0 ]; + while ( j-- ) { + tmp = tmp.lastChild; + } + + // Support: QtWebKit + // jQuery.merge because push.apply(_, arraylike) throws + jQuery.merge( nodes, tmp.childNodes ); + + // Remember the top-level container + tmp = fragment.firstChild; + + // Fixes #12346 + // Support: Webkit, IE + tmp.textContent = ""; + } + } + } + + // Remove wrapper from fragment + fragment.textContent = ""; + + i = 0; + while ( (elem = nodes[ i++ ]) ) { + + // #4087 - If origin and destination elements are the same, and this is + // that element, do not do anything + if ( selection && jQuery.inArray( elem, selection ) !== -1 ) { + continue; + } + + contains = jQuery.contains( elem.ownerDocument, elem ); + + // Append to fragment + tmp = getAll( fragment.appendChild( elem ), "script" ); + + // Preserve script evaluation history + if ( contains ) { + setGlobalEval( tmp ); + } + + // Capture executables + if ( scripts ) { + j = 0; + while ( (elem = tmp[ j++ ]) ) { + if ( rscriptType.test( elem.type || "" ) ) { + scripts.push( elem ); + } + } + } + } + + return fragment; + }, + + cleanData: function( elems ) { + var data, elem, events, type, key, j, + special = jQuery.event.special, + i = 0; + + for ( ; (elem = elems[ i ]) !== undefined; i++ ) { + if ( jQuery.acceptData( elem ) ) { + key = elem[ data_priv.expando ]; + + if ( key && (data = data_priv.cache[ key ]) ) { + events = Object.keys( data.events || {} ); + if ( events.length ) { + for ( j = 0; (type = events[j]) !== undefined; j++ ) { + if ( special[ type ] ) { + jQuery.event.remove( elem, type ); + + // This is a shortcut to avoid jQuery.event.remove's overhead + } else { + jQuery.removeEvent( elem, type, data.handle ); + } + } + } + if ( data_priv.cache[ key ] ) { + // Discard any remaining `private` data + delete data_priv.cache[ key ]; + } + } + } + // Discard any remaining `user` data + delete data_user.cache[ elem[ data_user.expando ] ]; + } + } +}); + +jQuery.fn.extend({ + text: function( value ) { + return access( this, function( value ) { + return value === undefined ? + jQuery.text( this ) : + this.empty().each(function() { + if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) { + this.textContent = value; + } + }); + }, null, value, arguments.length ); + }, + + append: function() { + return this.domManip( arguments, function( elem ) { + if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) { + var target = manipulationTarget( this, elem ); + target.appendChild( elem ); + } + }); + }, + + prepend: function() { + return this.domManip( arguments, function( elem ) { + if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) { + var target = manipulationTarget( this, elem ); + target.insertBefore( elem, target.firstChild ); + } + }); + }, + + before: function() { + return this.domManip( arguments, function( elem ) { + if ( this.parentNode ) { + this.parentNode.insertBefore( elem, this ); + } + }); + }, + + after: function() { + return this.domManip( arguments, function( elem ) { + if ( this.parentNode ) { + this.parentNode.insertBefore( elem, this.nextSibling ); + } + }); + }, + + remove: function( selector, keepData /* Internal Use Only */ ) { + var elem, + elems = selector ? jQuery.filter( selector, this ) : this, + i = 0; + + for ( ; (elem = elems[i]) != null; i++ ) { + if ( !keepData && elem.nodeType === 1 ) { + jQuery.cleanData( getAll( elem ) ); + } + + if ( elem.parentNode ) { + if ( keepData && jQuery.contains( elem.ownerDocument, elem ) ) { + setGlobalEval( getAll( elem, "script" ) ); + } + elem.parentNode.removeChild( elem ); + } + } + + return this; + }, + + empty: function() { + var elem, + i = 0; + + for ( ; (elem = this[i]) != null; i++ ) { + if ( elem.nodeType === 1 ) { + + // Prevent memory leaks + jQuery.cleanData( getAll( elem, false ) ); + + // Remove any remaining nodes + elem.textContent = ""; + } + } + + return this; + }, + + clone: function( dataAndEvents, deepDataAndEvents ) { + dataAndEvents = dataAndEvents == null ? false : dataAndEvents; + deepDataAndEvents = deepDataAndEvents == null ? dataAndEvents : deepDataAndEvents; + + return this.map(function() { + return jQuery.clone( this, dataAndEvents, deepDataAndEvents ); + }); + }, + + html: function( value ) { + return access( this, function( value ) { + var elem = this[ 0 ] || {}, + i = 0, + l = this.length; + + if ( value === undefined && elem.nodeType === 1 ) { + return elem.innerHTML; + } + + // See if we can take a shortcut and just use innerHTML + if ( typeof value === "string" && !rnoInnerhtml.test( value ) && + !wrapMap[ ( rtagName.exec( value ) || [ "", "" ] )[ 1 ].toLowerCase() ] ) { + + value = value.replace( rxhtmlTag, "<$1>" ); + + try { + for ( ; i < l; i++ ) { + elem = this[ i ] || {}; + + // Remove element nodes and prevent memory leaks + if ( elem.nodeType === 1 ) { + jQuery.cleanData( getAll( elem, false ) ); + elem.innerHTML = value; + } + } + + elem = 0; + + // If using innerHTML throws an exception, use the fallback method + } catch( e ) {} + } + + if ( elem ) { + this.empty().append( value ); + } + }, null, value, arguments.length ); + }, + + replaceWith: function() { + var arg = arguments[ 0 ]; + + // Make the changes, replacing each context element with the new content + this.domManip( arguments, function( elem ) { + arg = this.parentNode; + + jQuery.cleanData( getAll( this ) ); + + if ( arg ) { + arg.replaceChild( elem, this ); + } + }); + + // Force removal if there was no new content (e.g., from empty arguments) + return arg && (arg.length || arg.nodeType) ? this : this.remove(); + }, + + detach: function( selector ) { + return this.remove( selector, true ); + }, + + domManip: function( args, callback ) { + + // Flatten any nested arrays + args = concat.apply( [], args ); + + var fragment, first, scripts, hasScripts, node, doc, + i = 0, + l = this.length, + set = this, + iNoClone = l - 1, + value = args[ 0 ], + isFunction = jQuery.isFunction( value ); + + // We can't cloneNode fragments that contain checked, in WebKit + if ( isFunction || + ( l > 1 && typeof value === "string" && + !support.checkClone && rchecked.test( value ) ) ) { + return this.each(function( index ) { + var self = set.eq( index ); + if ( isFunction ) { + args[ 0 ] = value.call( this, index, self.html() ); + } + self.domManip( args, callback ); + }); + } + + if ( l ) { + fragment = jQuery.buildFragment( args, this[ 0 ].ownerDocument, false, this ); + first = fragment.firstChild; + + if ( fragment.childNodes.length === 1 ) { + fragment = first; + } + + if ( first ) { + scripts = jQuery.map( getAll( fragment, "script" ), disableScript ); + hasScripts = scripts.length; + + // Use the original fragment for the last item instead of the first because it can end up + // being emptied incorrectly in certain situations (#8070). + for ( ; i < l; i++ ) { + node = fragment; + + if ( i !== iNoClone ) { + node = jQuery.clone( node, true, true ); + + // Keep references to cloned scripts for later restoration + if ( hasScripts ) { + // Support: QtWebKit + // jQuery.merge because push.apply(_, arraylike) throws + jQuery.merge( scripts, getAll( node, "script" ) ); + } + } + + callback.call( this[ i ], node, i ); + } + + if ( hasScripts ) { + doc = scripts[ scripts.length - 1 ].ownerDocument; + + // Reenable scripts + jQuery.map( scripts, restoreScript ); + + // Evaluate executable scripts on first document insertion + for ( i = 0; i < hasScripts; i++ ) { + node = scripts[ i ]; + if ( rscriptType.test( node.type || "" ) && + !data_priv.access( node, "globalEval" ) && jQuery.contains( doc, node ) ) { + + if ( node.src ) { + // Optional AJAX dependency, but won't run scripts if not present + if ( jQuery._evalUrl ) { + jQuery._evalUrl( node.src ); + } + } else { + jQuery.globalEval( node.textContent.replace( rcleanScript, "" ) ); + } + } + } + } + } + } + + return this; + } +}); + +jQuery.each({ + appendTo: "append", + prependTo: "prepend", + insertBefore: "before", + insertAfter: "after", + replaceAll: "replaceWith" +}, function( name, original ) { + jQuery.fn[ name ] = function( selector ) { + var elems, + ret = [], + insert = jQuery( selector ), + last = insert.length - 1, + i = 0; + + for ( ; i <= last; i++ ) { + elems = i === last ? this : this.clone( true ); + jQuery( insert[ i ] )[ original ]( elems ); + + // Support: QtWebKit + // .get() because push.apply(_, arraylike) throws + push.apply( ret, elems.get() ); + } + + return this.pushStack( ret ); + }; +}); + + +var iframe, + elemdisplay = {}; + +/** + * Retrieve the actual display of a element + * @param {String} name nodeName of the element + * @param {Object} doc Document object + */ +// Called only from within defaultDisplay +function actualDisplay( name, doc ) { + var elem = jQuery( doc.createElement( name ) ).appendTo( doc.body ), + + // getDefaultComputedStyle might be reliably used only on attached element + display = window.getDefaultComputedStyle ? + + // Use of this method is a temporary fix (more like optmization) until something better comes along, + // since it was removed from specification and supported only in FF + window.getDefaultComputedStyle( elem[ 0 ] ).display : jQuery.css( elem[ 0 ], "display" ); + + // We don't have any data stored on the element, + // so use "detach" method as fast way to get rid of the element + elem.detach(); + + return display; +} + +/** + * Try to determine the default display value of an element + * @param {String} nodeName + */ +function defaultDisplay( nodeName ) { + var doc = document, + display = elemdisplay[ nodeName ]; + + if ( !display ) { + display = actualDisplay( nodeName, doc ); + + // If the simple way fails, read from inside an iframe + if ( display === "none" || !display ) { + + // Use the already-created iframe if possible + iframe = (iframe || jQuery( "");h.appendTo(a.contentContainer);r=c.outerHeight(!0);s=c.outerWidth(!0);A();h.attr("src",a.loadUrl);k(a.loadCallback);break;case "image":A();b("").load(function(){k(a.loadCallback);G(b(this))}).attr("src",a.loadUrl).hide().appendTo(a.contentContainer);break;default:A(),b('
    ').load(a.loadUrl,a.loadData,function(){k(a.loadCallback);G(b(this))}).hide().appendTo(a.contentContainer)}}function A(){a.modal&&b('
    ').css({backgroundColor:a.modalColor,position:"fixed",top:0,right:0,bottom:0,left:0,opacity:0,zIndex:a.zIndex+t}).appendTo(a.appendTo).fadeTo(a.speed,a.opacity);D();c.data("bPopup",a).data("id",e).css({left:"slideIn"==a.transition||"slideBack"==a.transition?"slideBack"==a.transition?g.scrollLeft()+u:-1*(v+s):l(!(!a.follow[0]&&m||f)),position:a.positionStyle||"absolute",top:"slideDown"==a.transition||"slideUp"==a.transition?"slideUp"==a.transition?g.scrollTop()+w:x+-1*r:n(!(!a.follow[1]&&p||f)),"z-index":a.zIndex+t+1}).each(function(){a.appending&&b(this).appendTo(a.appendTo)});H(!0)}function q(){a.modal&&b(".b-modal."+c.data("id")).fadeTo(a.speed,0,function(){b(this).remove()});a.scrollBar||b("html").css("overflow","auto");b(".b-modal."+e).unbind("click");g.unbind("keydown."+e);d.unbind("."+e).data("bPopup",0=c.height()&&(d.height=c.height());b>=c.width()&&(d.width=c.width());r=c.outerHeight(!0);s=c.outerWidth(!0);D();a.contentContainer.css({height:"auto",width:"auto"});d.left=l(!(!a.follow[0]&&m||f));d.top=n(!(!a.follow[1]&&p||f));c.animate(d,250,function(){h.show();B=E()})}function L(){d.data("bPopup",t);c.delegate(".bClose, ."+a.closeClass,"click."+e,q);a.modalClose&&b(".b-modal."+e).css("cursor","pointer").bind("click",q);M||!a.follow[0]&&!a.follow[1]||d.bind("scroll."+e,function(){B&&c.dequeue().animate({left:a.follow[0]?l(!f):"auto",top:a.follow[1]?n(!f):"auto"},a.followSpeed,a.followEasing)}).bind("resize."+e,function(){w=y.innerHeight||d.height();u=y.innerWidth||d.width();if(B=E())clearTimeout(I),I=setTimeout(function(){D();c.dequeue().each(function(){f?b(this).css({left:v,top:x}):b(this).animate({left:a.follow[0]?l(!0):"auto",top:a.follow[1]?n(!0):"auto"},a.followSpeed,a.followEasing)})},50)});a.escClose&&g.bind("keydown."+e,function(a){27==a.which&&q()})}function H(b){function d(e){c.css({display:"block",opacity:1}).animate(e,a.speed,a.easing,function(){J(b)})}switch(b?a.transition:a.transitionClose||a.transition){case "slideIn":d({left:b?l(!(!a.follow[0]&&m||f)):g.scrollLeft()-(s||c.outerWidth(!0))-C});break;case "slideBack":d({left:b?l(!(!a.follow[0]&&m||f)):g.scrollLeft()+u+C});break;case "slideDown":d({top:b?n(!(!a.follow[1]&&p||f)):g.scrollTop()-(r||c.outerHeight(!0))-C});break;case "slideUp":d({top:b?n(!(!a.follow[1]&&p||f)):g.scrollTop()+w+C});break;default:c.stop().fadeTo(a.speed,b?1:0,function(){J(b)})}}function J(b){b?(L(),k(F),a.autoClose&&setTimeout(q,a.autoClose)):(c.hide(),k(a.onClose),a.loadUrl&&(a.contentContainer.empty(),c.css({height:"auto",width:"auto"})))}function l(a){return a?v+g.scrollLeft():v}function n(a){return a?x+g.scrollTop():x}function k(a){b.isFunction(a)&&a.call(c)}function D(){x=p?a.position[1]:Math.max(0,(w-c.outerHeight(!0))/2-a.amsl);v=m?a.position[0]:(u-c.outerWidth(!0))/2;B=E()}function E(){return w>c.outerHeight(!0)&&u>c.outerWidth(!0)}b.isFunction(z)&&(F=z,z=null);var a=b.extend({},b.fn.bPopup.defaults,z);a.scrollBar||b("html").css("overflow","hidden");var c=this,g=b(document),y=window,d=b(y),w=y.innerHeight||d.height(),u=y.innerWidth||d.width(),M=/OS 6(_\d)+/i.test(navigator.userAgent),C=200,t=0,e,B,p,m,f,x,v,r,s,I;c.close=function(){a=this.data("bPopup");e="__b-popup"+d.data("bPopup")+"__";q()};return c.each(function(){b(this).data("bPopup")||(k(a.onOpen),t=(d.data("bPopup")||0)+1,e="__b-popup"+t+"__",p="auto"!==a.position[1],m="auto"!==a.position[0],f="fixed"===a.positionStyle,r=c.outerHeight(!0),s=c.outerWidth(!0),a.loadUrl?K():A())})};b.fn.bPopup.defaults={amsl:50,appending:!0,appendTo:"body",autoClose:!1,closeClass:"b-close",content:"ajax",contentContainer:!1,easing:"swing",escClose:!0,follow:[!0,!0],followEasing:"swing",followSpeed:500,iframeAttr:'scrolling="no" frameborder="0"',loadCallback:!1,loadData:!1,loadUrl:!1,modal:!0,modalClose:!0,modalColor:"#000",onClose:!1,onOpen:!1,opacity:0.7,position:["auto","auto"],positionStyle:"absolute",scrollBar:!0,speed:250,transition:"fadeIn",transitionClose:!1,zIndex:9997}})(jQuery); \ No newline at end of file diff --git a/tutor/app/assets/javascripts/tracks.js b/tutor/app/assets/javascripts/tracks.js new file mode 100644 index 00000000..5fe1949c --- /dev/null +++ b/tutor/app/assets/javascripts/tracks.js @@ -0,0 +1,15 @@ +// Semicolon (;) to ensure closing of earlier scripting +// Encapsulation +// $ is assigned to jQuery +; +(function ($) { + // DOM Ready + $(function () { + // Binding a click event + // From jQuery v.1.7.0 use .on() instead of .bind() + $('#my-button1').bind('click', function (e) { + e.preventDefault(); + $('#element_to_pop_up').bPopup(); + }); + }); +})(jQuery); diff --git a/tutor/app/assets/stylesheets/tracks.css b/tutor/app/assets/stylesheets/tracks.css new file mode 100644 index 00000000..cd66111d --- /dev/null +++ b/tutor/app/assets/stylesheets/tracks.css @@ -0,0 +1,9 @@ +#element_to_pop_up { + background-color:#fff; + border-radius:10px; + color:#000; + display:none; + padding:10px; + min-width:100px; + min-height: 100px; + } \ No newline at end of file From 3bb7ce941def04ad6683b3b617b5515ee051d010 Mon Sep 17 00:00:00 2001 From: AmirGeorge Date: Mon, 21 Apr 2014 14:17:44 +0200 Subject: [PATCH 172/938] removed unnecessary facebook.yml config --- tutor/config/facebook.yml | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 tutor/config/facebook.yml diff --git a/tutor/config/facebook.yml b/tutor/config/facebook.yml deleted file mode 100644 index df9e144a..00000000 --- a/tutor/config/facebook.yml +++ /dev/null @@ -1,11 +0,0 @@ -development: &defaults - client_id: 623954164351291 - client_secret: fe348fcc48cc4a50c26d877505454704 - scope: user_about_me,friends_about_me,user_activities,friends_activities,user_birthday,friends_birthday,user_checkins,friends_checkins,user_education_history,friends_education_history,user_events,friends_events,user_groups,friends_groups,user_hometown,friends_hometown,user_interests,friends_interests,user_likes,friends_likes,user_location,friends_location,user_notes,friends_notes,user_online_presence,friends_online_presence,user_photo_video_tags,friends_photo_video_tags,user_photos,friends_photos,user_questions,friends_questions,user_relationships,friends_relationships,user_relationship_details,friends_relationship_details,user_religion_politics,friends_religion_politics,user_status,friends_status,user_videos,friends_videos,user_website,friends_website,user_work_history,friends_work_history,email,read_friendlists,read_insights,read_mailbox,read_requests,read_stream,xmpp_login,ads_management,create_event,manage_friendlists,manage_notifications,offline_access,publish_checkins,publish_stream,rsvp_event,publish_actions,manage_pages,user_subscriptions #,friend_subscriptions - canvas_url: http://apps.facebook.com/fb-graph-sample-dev - -test: - <<: *defaults - -production: - <<: *defaults \ No newline at end of file From 1e5f73f98a6ba8f9479d24a1f9632f2132fde64a Mon Sep 17 00:00:00 2001 From: AmirGeorge Date: Mon, 21 Apr 2014 14:19:42 +0200 Subject: [PATCH 173/938] removed fb_graph gem --- tutor/Gemfile | 5 ----- 1 file changed, 5 deletions(-) diff --git a/tutor/Gemfile b/tutor/Gemfile index 7743b1d0..7382b0e9 100644 --- a/tutor/Gemfile +++ b/tutor/Gemfile @@ -51,8 +51,3 @@ gem 'foreman' # Use composite primary keys in models gem 'composite_primary_keys', '~> 6.0.1' - - - - -gem 'fb_graph' \ No newline at end of file From cb78166dc25ac56c9950e56978d2781fd796fca0 Mon Sep 17 00:00:00 2001 From: Mussab ElDash Date: Mon, 21 Apr 2014 14:25:17 +0200 Subject: [PATCH 174/938] Update debugger.rb --- tutor/app/models/debugger.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tutor/app/models/debugger.rb b/tutor/app/models/debugger.rb index 51f4b3d8..1407df11 100644 --- a/tutor/app/models/debugger.rb +++ b/tutor/app/models/debugger.rb @@ -86,7 +86,7 @@ def start(file_path, input) num = get_line locals = get_variables hash = {:line => num, :locals => locals} - $All << hash + $all << hash debug rescue => e p e.message From 0ac9764ee87280ab71a09253902fd61e265a34fe Mon Sep 17 00:00:00 2001 From: Ahmed ELAssuty Date: Mon, 21 Apr 2014 14:25:34 +0200 Subject: [PATCH 175/938] Issue #221 fix documentation --- tutor/app/models/course.rb | 2 +- tutor/app/views/layouts/application.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tutor/app/models/course.rb b/tutor/app/models/course.rb index 34faf7fe..75479857 100644 --- a/tutor/app/models/course.rb +++ b/tutor/app/models/course.rb @@ -33,7 +33,7 @@ def can_edit(user) end # [Simple Search - Story 1.22] - # search for users + # search for courses # Parameters: keyword # Returns: A hash with search results according to the keyword # Author: Ahmed Elassuty diff --git a/tutor/app/views/layouts/application.html.erb b/tutor/app/views/layouts/application.html.erb index 27cd9a3b..9920c619 100644 --- a/tutor/app/views/layouts/application.html.erb +++ b/tutor/app/views/layouts/application.html.erb @@ -8,7 +8,7 @@ CoolSoft - Java Tutor <%= stylesheet_link_tag "application", "bootstrap", :media => "all"%> - <%= javascript_include_tag "application","bootstrap","jquery"%> + <%= javascript_include_tag "application","bootstrap", "jquery"%> <%= csrf_meta_tags%> From 2465b9aebb2236f091abb8137964c53f9acd2aa8 Mon Sep 17 00:00:00 2001 From: metawaa Date: Mon, 21 Apr 2014 14:29:39 +0200 Subject: [PATCH 176/938] Adding documentation --- tutor/app/controllers/courses_controller.rb | 7 +++- tutor/app/views/courses/show.html.erb | 46 ++++++++++----------- 2 files changed, 29 insertions(+), 24 deletions(-) diff --git a/tutor/app/controllers/courses_controller.rb b/tutor/app/controllers/courses_controller.rb index 8459c814..00d89eac 100644 --- a/tutor/app/controllers/courses_controller.rb +++ b/tutor/app/controllers/courses_controller.rb @@ -135,7 +135,12 @@ def edit @course = Course.find_by_id(params[:id]) @discussionBoard = @course.discussion_board end - + # [View a course - story 1.21] + #Description: This action is resposible for the view of a specific course. + #Parameters: + # id: Course id + # Returns: The view of the requested course + # Author: Mohamed Metawaa def show @course = Course.find_by_id(params[:id]) if @course diff --git a/tutor/app/views/courses/show.html.erb b/tutor/app/views/courses/show.html.erb index e77d5236..a21e50f3 100644 --- a/tutor/app/views/courses/show.html.erb +++ b/tutor/app/views/courses/show.html.erb @@ -24,27 +24,27 @@
    - <% @topics.each do |t| %> -
    -
    - - <%= link_to t.title , t , style: 'color:#003366;'%> - <%= t.tracks.count %> -
    -
    -
      - <% t.tracks.each do |p|%> - <% color = "label label-default" %> -
    • - <%= link_to p.title , p , class: color %> -
      • - <% end %> -
    -
    -
    - <% end %> -
    + <% @topics.each do |t| %> +
    +
    + + <%= link_to t.title , t , style: 'color:#003366;'%> + <%= t.tracks.count %> +
    +
    +
      + <% t.tracks.each do |tt|%> + <% color = "label label-default" %> +
    • + <%= link_to tt.title , tt , class: color %> +
      • + <% end %> +
    +
    +
    + <% end %> + \ No newline at end of file From a88a4bb4aea2234d1eab0e29cd4922c883daea68 Mon Sep 17 00:00:00 2001 From: AbdullRahman ElHusseini Date: Mon, 21 Apr 2014 14:32:36 +0200 Subject: [PATCH 177/938] Issue #208 linking with track & failure demos 2 --- tutor/app/controllers/problems_controller.rb | 7 +++++-- .../views/problems/_failure_options.html.erb | 7 +++---- tutor/app/views/problems/edit.html.erb | 4 ++-- tutor/app/views/tracks/show.html.erb | 4 ++-- tutor/config/routes.rb | 7 ++++++- tutor/db/development.sqlite3 | Bin 208896 -> 208896 bytes 6 files changed, 18 insertions(+), 11 deletions(-) diff --git a/tutor/app/controllers/problems_controller.rb b/tutor/app/controllers/problems_controller.rb index 7a82be3b..41bf6630 100644 --- a/tutor/app/controllers/problems_controller.rb +++ b/tutor/app/controllers/problems_controller.rb @@ -32,6 +32,7 @@ def create p.owner_id = current_teaching_assistant.id p.owner_type = "teaching assistant" end + p.incomplete = true p.track_id = params[:id] if p.save redirect_to :action => "edit", :id => p.id @@ -52,6 +53,7 @@ def edit @problem = Problem.find_by_id(params[:id]) @test_cases = @problem.test_cases @answers = @problem.model_answers + @track = Track.find_by_id(@problem.track_id) else render ('public/404') end @@ -83,7 +85,7 @@ def update end def done - @problem = Problem.find_by_id(params[:id]) + @problem = Problem.find_by_id(params[:problem_id]) if @problem.test_cases.empty? @failure = true flash.keep[:notice] = "Test cases are empty #{@failure}" @@ -93,12 +95,13 @@ def done flash.keep[:notice] = "Answers are empty" redirect_to :back else + @problem.incomplete = false redirect_to :action => "show", :id => @problem.id end end def destroy_problem - @problem = Problem.find_by_id(params[:id]) + @problem = Problem.find_by_id(params[:problem_id]) @problem.test_cases.destroy @problem.model_answers.destroy @problem.destroy diff --git a/tutor/app/views/problems/_failure_options.html.erb b/tutor/app/views/problems/_failure_options.html.erb index 0af8b5d4..28ae175a 100644 --- a/tutor/app/views/problems/_failure_options.html.erb +++ b/tutor/app/views/problems/_failure_options.html.erb @@ -1,4 +1,3 @@ -<%= button_to "Abort and Delete Problem", action: "destroy_problem" , id: @problem.id %> -<%= button_to "Save as Incomplete", action: "done" , id: @problem.id %> - - \ No newline at end of file + +<%= button_to 'Abort and Delete Problem', problem_destroy_problem_path(:problem_id => @problem.id), method: :get, :confirm => 'Are you sure?' %> +<%= button_to 'Save as Incomplete', problem_path(:id => @problem.id), method: :get %> \ No newline at end of file diff --git a/tutor/app/views/problems/edit.html.erb b/tutor/app/views/problems/edit.html.erb index 009bfcec..552efe0b 100644 --- a/tutor/app/views/problems/edit.html.erb +++ b/tutor/app/views/problems/edit.html.erb @@ -21,9 +21,9 @@ and a paragraph to view the problem description of the instance variable @proble <% end %> <%= render partial: "test_cases/index" %> <%= render partial: "model_answers/new" %> - - +<%= button_to 'Done', problem_done_path(:problem_id => @problem.id), method: :get %> <%= render partial: "problems/failure_options" %> + <% if flash[:notice] %>
    <%= flash[:notice] %>
    diff --git a/tutor/app/views/tracks/show.html.erb b/tutor/app/views/tracks/show.html.erb index 1239b292..9ff4b63d 100644 --- a/tutor/app/views/tracks/show.html.erb +++ b/tutor/app/views/tracks/show.html.erb @@ -31,7 +31,7 @@ <%= link_to p.title , p , style: 'color:#003366;' , class: color %> - +
    <%= p.description %> @@ -41,6 +41,6 @@ <% end %>
    -<% if @can_edit %> +<% if true %> <% end %> \ No newline at end of file diff --git a/tutor/config/routes.rb b/tutor/config/routes.rb index e9d7079c..834e6dbc 100644 --- a/tutor/config/routes.rb +++ b/tutor/config/routes.rb @@ -27,7 +27,7 @@ resources :model_answers resources :problems_by_tas resources :solutions - resources :problems + resources :topics # Example resource route with options: @@ -54,6 +54,11 @@ resources :model_answers do post "model_answers/new" end + + resources :problems do + get 'done' + get 'destroy_problem' + end # Example resource route with sub-resources: # resources :products do # resources :comments, :sales diff --git a/tutor/db/development.sqlite3 b/tutor/db/development.sqlite3 index a268d354fc1fbca450d22f088990194c49f49eb9..c624d4befd16aa15c9f007dc878af6bcf0b5146d 100644 GIT binary patch delta 4273 zcmZu!TWlN072O%?VLiyDpHlqL!>;15-XW~?pL`t;Y5*b-a zQF-%|0BM1wY&vy;!cO3#?MLiZZp5HK8zVtK(iXK_py*HR#`$PkG>L*VAE})*y(BG? z=5nQ7kbCCNoSA#?xtAB;FTD7E;Y+)>;Uz&3DBK6(MsPoPxk@R9w?{uH&xWs9{2ZPF z74M6miyOauW?9?{Ukjt}imcu6++`K4x&K;ygp?7bhR8LVE)ms`iK)m$Ju0h56&tcv zS0th>H;Oy6<)oP*feFzSyV)iZZdxVD@k}xeS(gp__)R2yb(I`WEY2iDBTUmXjgKKW zzFw_aP0nvfI+fu+Z9J(VhD3GK)YS0U*9TI^s|IB>BmX!OUVC&rh2bW(&mZM)5<~eF z+AbcA^CvYjkqDJ#U9*i(Am7CNRS_NL=S7tNkQdm=Fq;Z|?RJ|8zbqm>)d0>^qjq92 zRUBD&qyIP)1}c$sP1EG`lO;8PfQxj)~*6ea($bX`$ZGT(9OC4f)#@ z-$<`#fHg^HJ(E(G5zw^8K(pDl)YE#V%WI<@n^aSYonHds*Gkaw)r9AD3EV>Ubbhf= zeTdXe`9_1G1>b@+Iy+sVcq@opai(jsZ*ZB&^ny0+t?%|Po?lewLft2gR)3&x#oyoV z9h{Y#XZ^w6Ha6FMwzp|&W;tN(L%W31Xm;@PrKmiWgsKoqGlZ)y#SxN;gnz27r=`Vj zj-Os?od|WBr#$s)Psq2}I@s@D?jN6*MuO~Q!}!8Ve<)}!kfjOMJJ*^I%R9t%LHs0= zUxvP@uDT;^6W$SocaV;5;%$y^cviQ&tdI?+E{NF?9 zFWAcAzkL#Y2V1$k^(piRY;EC1=g^zj%Hy}sp&wx@Km41VA3C133c_z?Kls5g$|;)= zgb5VRs?CaIpUWxD`Cab4Ennp4<$qOp#JT926|;d=eb#e_tis63FnR)(bVjav(a$lq zT)blpE#+BaZqbva$m$PwqvCJ@+QI)jhUT&5=950yw6&F2`O#HuZHxTbk9NZZ+an*1 zqn+?!M+668-`Lv8x1C3yVQW_;dlFT_i=v1!g-*eTV!k|$?qlmQ9-Kkn$JXvh-Ylxx z6fa0JD#@~J8tL9mLHO`xRGG*bSphZD4XWD0JAv?DfI)2{{S`^qnXK962n^zg)A?&5 z%Q+x82VC#DR$Rr=zZ+ZKjZQxBI%3s{nTVuORb_TTAXK8n0F@C>2v5U-5Aot_h@~o! z$-vUCKtz>fMr6|*&gOTop~Jf7u|!u|L$R^4Vd{FuS>gy-KOLPSeuekAyZ8&YQ2X(OW*L&H=`u~% ztXTEYsRE$WC4jpx2_kh~a=q&sbBW;W=bil09dztO!r9;%LJUUi2LP(5Q>sys3uBu^ z1VMzay>Ob{eC#f&Nye)xDJEegeM`WHNwTV%%;4|dMYX90gla^wX9UqDlR$k@IQ=^^ zlkTRF5pbo~Pgp^hbP`~sjj0CE}1gQlr+O+gf(R636Dj$ z>hYZM%}p)a0~snD92PS(WZ5RtkoCwU{DBJ>B;(DLOs3g$D;5(mgv%n{^KjF#w@j6p zntnP6k5$}I^yfIjZ<|IRRBAXJ67JFmejo)@9{h>(;Gt3P70oi28iefVU zaS8rzssZf7)Y7SeKOh!ljVUVsNhwazKusbF0~xf38kHb)h+(Xk;eVARJ;tEpGj-bv zu)73Ow-^kK`DTJCW!XF5A87QoPfyIWwi_PBnC!UVX_KbL>)Sfmd~m9%#bcb2XC;aC zG=@gz=LUncqh;DEL%W52aF(LLCu(s;k_1Gfu0vOt#u`X$A|wNePQBiLsw>z$Gk291F@J>g|G8XR$;)WP0sKcM0 zNU~s24c9aE%n76}=uJ6==Kjg)u4NkN?(U%rO}(eb%nN$Rceb^s>Fi*Ab;IeAKyX2C z>1MQTX=tRoO_`aV8|k#Rqhet@u!vnA4_{fuMX4k}+;v-Fi1{OqkVi=@OV9W_+efDx z+x&wkm6eWOt=qp8>TMcp3r^R!_jLH6UFm3Bn46rQn4=>@lhUZs+7Lg54+Z!+@nMul z#C;Lpk{+fI6ifwDP=U5M%^?tXRMJ(=(0Sf<{CF}>6-k52%j{tXGsO}9)OCC))qui0 zHg%3I9Y-S9uH%51w2+~}1#QV7qK2fXrov2K{}xtL4K!*n!!9sTc8CIbtMXUV3@9^o znxQ5$NM{AYbNwdfVj!XG8mJ}IT)Q62o5(SgE1m|tz zsgkOKMFug5rmA9SCcpOy9!)hc3`R2*ZwP2=sD{C3H}E4XKy#pw3~pyosi{F!{^kbW zm%0Mvi_9`qNG4I0X_TygimOYL?F)1bkm{K>y@_;VeqD6z%}|4&!Gmf>GKgCO;jfF1 z$6FH)0?mU4FGKwUgE-=hM!y?=OW(}=7b$Z)t`ufLD_;i%-~@8Ovld}q?sn8-d@=eC z<2Zz45Q;-64xt$I@;45I%iJYVq%H>3#@-+M-f))U6chnX;>GNR?0@9EkoRJKRsQ|L zN@t~Om+PMZrCrZy)}cs!nS((;yeG0!?#O`;dn49<$CuEB@8jRDbSz@4gnw4)xZ<)( zbBicNFIEPh($ delta 5223 zcmaJ_YfK#16`nI=u)*vOc|x5SuM<0oU3+%!+{et&WX&3EFxUoc9)>(@SQZw-!@$B~ zCoLvYrTj>hq+9hil_JMd+N!Ezr*^}pjjEvLSE@9QDpmQDS1U!St2R#BDr%D`?pbek z7nmuCS=f8-IrqEgp7Wh^=gbEcXFjNSYSWGItfD9spS$n@d|rBbmsO3UyZ^Ga1iz~K zXZWd5{R{mw{nKC0p3-mVo5F$e>}b^_e%#uBvGPyhZ<-F)llR1`2*lv^U zwmg!HbyYf)UaD>_F^g)p!A-|;O|M#Bl5UzO%jZ+qwix%DpOd7YpC>yDi`#}}GnWXz z`PU_vuFcoZFSqZSgb>#=pL4@;ZQCO0fopdzpKm)ZHGQ^i8#zh(;>!7gI!t)+qkSfb z<+{IuoAliU{I1~=i`hQ@$xDu_@|+Gk<%kaDMOKd5Dy_`Bl3uS;C+QrD6-HE{QEbnkHNP<{K+Xfk}DKGo23y2VYM zG^XZQb9Am}WP~?&Mq^>S>ELN9W{xI0A7){vYs}v$cj#(Ie7#&&BG1>ree(s+3B$s3 zM2su(VW<`)b))fEa%L(%WyB`Nwpo4Kh`EhV*Y6+dYdoCl?KftpyM}wop@G)c#zw2F zA=;EknUj-K(b?0YJ4OcD4$j3Ayu0mi{laFrRoRlw4LPy}wiZEf!^Kk&t5ILimz;$7 zfuL?*=aKkWQ(~mE;q*vHN7I4&$+4Mkda^a#oJfg!HtB}@dnU%>PF(EkVF$!qbVy`# zQ_~j}{o_n|2>uh^bw#;RxvVIcVK2O))@YBHZY}-q`p-8!TeiQvyZo;kU#Vyc+#L8r zFrllun!X`)F7sL&bd*4stnPxhq5Ef_b^*Y#^!mVa+QMBu>4z$Qsy!C$%|v^k65#&y z+vQKHZ4bx~d*P4pp#1gy@B}=R{>6shtKzu4`9XLYPRKVOgdam+`nRP&QXlD0zgqIe z4^Kd8D5WSVIJfTLy4Ok)r8`RBTz_T5wQ_x< z{9J{2x*2A)g*yi2D+BO649UJYEI~rvIf&neGp`TACV-L5heL1+z{8m@6QBc(%D@Qx z6UH*|Fzf;t&xA)|Kfr`cjlt(|QcjP<4`4D=HUYbeti%Yil1p4KYZN5%#97#0$Q~S~ z4o4F31Y1EOUqppH`RK%9i<^QHKZTqm5crK!8aSrtXZ1+nSn!?T>0tGx8$t~MdF%zS z!v#yGL8)V#-o)jm!H{blf^qQ>`m|S8p9i}@EzC4*LXb&45I8Z2WjTbMD3R}-hn<3J zo;j$^9osg&>4n;+X;NXycW}8v89)Ul7?uc+Da6TbCMXz((usIq{4kt(B1M%sYmS@|QmY7*fso@A454I?& z%=Q(_MRMRhs4XU(WpHK_zu;vCB{p|m`TBdXXSo8iD92*zvkiiN;zH8*!985aE6YGL zJe$<3_l;<=qi~!ds8F^Xz-?mC;aN^i^pD2JLZl-xJRM36kB)}=6N2fjA z)zjQhdM3wOhTG$VNtTQ^wZ@Lo{iEZ(JlWcCw6`%aTc7G_n`w{560GBp7#9m6*raSm zU+RiX>`}KZ2f>)lEblh4|H(;+4+wTN+-5X%Vj$H|ntKOr5!-*Vy|w8m>Fh`yB*t)b z_N39=H9kCY*bpMQ&zU~b)mfkIJXHN%MZcXLoSypZUa zv#DKws(&CJJsRsi(AeGF(lWDeGTIiMvdp0)VKO+|dPsEa?@k$XU!&96gJpW*Ca6|! zLKN43qEUHzUacyE5Qd8(<&(MgO<{Q5Hw0@{D@fD5MaUFH8yUbJf8> z6|OBDS$09arx>SLg$Z*h^8_|F4>^f^;DUO0QNhesK@4B7LSB+Ne?cAA3mV7@++xJ> zQVZTjFm~`hAosqivgHa?*tm#i2~@y-0864gw@Sex6luUu0eMi^VsS~8`f!1Ekq9aF z6<(sjM9)d?h4l)Ql|`ef$0*LhUK^AC|4SC%QWt9q8^Y=)a529PF@xE{5>)>AV>MP( zpa!;D)bgPlW?%s$HkA`s)fFq?UC6J~!}@9C9YApT@>O+naRtk8uy#9M>O=)0s44j3 zCu(?0v5_O$ASOO{Pz;ouq+OL4bnSLORwZ~*Bv~A*=@XT668VCz-P2MyAYus0{n!u{ za*_ZBf1qMX(U%t8=_{ za))^@u$*GhX3J=#Vr_knNrHFa)%!wyO0hSZXOWF-8=!(ae#e0Iz^0g(k@B_mE#h#$ zzT7fgLF{>#M#}OA29q9~jAMssF?`$M*@0!)SomEQ*|3&A#v{Q#$V&$tgWeMJgu0RS zYa75m3PaHk0HfHF@JQ*}`uIY_!kd8425@~W!cL@QZ37J1#^;>`?!a_xVUx(ZyuM!y zVJnzj--oR*G3HG)Y)7=b0ly<)c+&W?#@7IngX>rkHLvdvz(nrzd0U08MgpT7Z*CFD z8}I{wt)^|GtGzBH2E&fd<=2x<*`q*8{Z7fFC09$ID*Jx9Rer5vN8p}db?}O^=jrHX z?J@qHj0kBqz*J^pt5ymyok`uHeW`9puCMymW>~0_pKjNxWO}>S2{ZC<+qLIlHuJ Date: Mon, 21 Apr 2014 14:46:27 +0200 Subject: [PATCH 178/938] fixing
    <% next_problems_to_solve.each do |key , value| %> - - - - + + + + <% end %>
    Your Next Problems
    <%= link_to value.title, controller: "problems", action: "show", id: value.id %> - <%= key %> -
    + <%= link_to value.title, controller: "problems", action: "show", id: value.id %> + + <%= key %> +
    <% end %> From 864d626178e58ace12306ed1ac8e94c03d2f383c Mon Sep 17 00:00:00 2001 From: MussabElDash Date: Mon, 21 Apr 2014 15:11:17 +0200 Subject: [PATCH 179/938] #250 done testing the debugger --- tutor/.gitignore | 4 ++ .../assets/javascripts/solutions.js.coffee | 30 +++++++++++++ tutor/app/controllers/debug_controller.rb | 24 ++++++++++ tutor/app/helpers/debug_helper.rb | 2 + tutor/app/models/debugger.rb | 45 ++++++++++++++++--- tutor/app/views/solutions/_new.html.erb | 5 ++- tutor/config/routes.rb | 1 + .../test/controllers/debug_controller_test.rb | 7 +++ tutor/test/helpers/debug_helper_test.rb | 4 ++ 9 files changed, 115 insertions(+), 7 deletions(-) create mode 100644 tutor/app/assets/javascripts/solutions.js.coffee create mode 100644 tutor/app/controllers/debug_controller.rb create mode 100644 tutor/app/helpers/debug_helper.rb create mode 100644 tutor/test/controllers/debug_controller_test.rb create mode 100644 tutor/test/helpers/debug_helper_test.rb diff --git a/tutor/.gitignore b/tutor/.gitignore index 4ea75899..e4e59d11 100644 --- a/tutor/.gitignore +++ b/tutor/.gitignore @@ -37,3 +37,7 @@ Gemfile.lock, .ruby-version, .ruby-gemset # Ignoring generated model diagram models.svg + +# Ignoring Java files and class files +*.java +*.class \ No newline at end of file diff --git a/tutor/app/assets/javascripts/solutions.js.coffee b/tutor/app/assets/javascripts/solutions.js.coffee new file mode 100644 index 00000000..05154714 --- /dev/null +++ b/tutor/app/assets/javascripts/solutions.js.coffee @@ -0,0 +1,30 @@ +# The list of variables +Variables = null +# The number of the current line to be executed +LineNumber = 0 + +# [Debugger: Debug - Story 3.6] +# Sends the code to the server and changes the Variables to the data recieved +# Parameters: +# problem_id: The id of the problem being solved +# Returns: None +# Author: Mussab ElDash +@start_debug = (problem_id) -> + input = document.getElementById('solution_code').value + test = document.getElementById('testcases').value + alert input + alert test + $.ajax + type: "POST" + url: '/debug/' + problem_id + data: {id : problem_id , code : input , case : test} + datatype: 'json' + success: (data) -> + Variables = data + $.each data, (ia, da) -> + alert da["line"] + "=>" + da["locals"] + "da[locals] is Empty for now" + document.getElementById('next').disabled = false + document.getElementById('previous').disabled = true + # toggleDebug + return + return \ No newline at end of file diff --git a/tutor/app/controllers/debug_controller.rb b/tutor/app/controllers/debug_controller.rb new file mode 100644 index 00000000..a691b3dd --- /dev/null +++ b/tutor/app/controllers/debug_controller.rb @@ -0,0 +1,24 @@ +class DebugController < ApplicationController + + # [Debugger: Debug - Story 3.6] + # Send the recieved code to be debugged + # and return the result to the user as an json object + # Parameters: + # id: The id of the problem being solved + # code: The code to be debugged + # case: Test case to be debugged against + # Returns: Json object with the result of the debugging + # Author: Mussab ElDash + def start + if lecturer_signed_in? || teaching_assistant_signed_in? + render json: {} + end + id = current_student.id + pid = params[:id] + input = params[:code] + cases = params[:case] + result = Debugger.debug(id, pid, input, cases) + p result + render json: result + end +end diff --git a/tutor/app/helpers/debug_helper.rb b/tutor/app/helpers/debug_helper.rb new file mode 100644 index 00000000..51e8d113 --- /dev/null +++ b/tutor/app/helpers/debug_helper.rb @@ -0,0 +1,2 @@ +module DebugHelper +end diff --git a/tutor/app/models/debugger.rb b/tutor/app/models/debugger.rb index 1407df11..5484b4d8 100644 --- a/tutor/app/models/debugger.rb +++ b/tutor/app/models/debugger.rb @@ -84,8 +84,8 @@ def start(file_path, input) bufferUntilReady input "run" num = get_line - locals = get_variables - hash = {:line => num, :locals => locals} + # locals = get_variables + hash = {:line => num, :locals => []} $all << hash debug rescue => e @@ -105,8 +105,8 @@ def debug begin input "step" num = get_line - locals = get_variables - hash = {:line => num, :locals => locals} + # locals = get_variables + hash = {:line => num, :locals => []} $all << hash counter += 1 rescue => e @@ -128,7 +128,42 @@ def get_line last_line = list_of_lines[-2] /\d+/=~ last_line regex_capture = $& - return regex_capture.to_i + if regex_capture + return regex_capture.to_i + else + raise 'Exited' + end + end + + # [Debugger: Debug - Story 3.6] + # Create a java file and start debugging + # Parameters: + # Student_id: The id of the current signed in student + # problem_id: The id of the problem being solved + # code: The code to be debugged + # input: The arguments to be debugged against + # Returns: The result of the debugging + # Author: Mussab ElDash + def self.debug(student_id, problem_id, code, input) + code = change_class_name(student_id, problem_id, code) + file_name = 'st' + student_id.to_s + 'pr' + problem_id.to_s + File.open("#{file_name}.java", 'w') { |file| file.write(code) } + # return {done: "Done"} + debugger = Debugger.new + return debugger.start(file_name, input) + end + + # [Debugger: Debug - Story 3.6] + # Renames the class name to be compiled and debugged correctly + # Parameters: + # Student_id: The id of the current signed in student + # problem_id: The id of the problem being solved + # code: The code to be debugged + # Returns: The modified code + # Author: Mussab ElDash + def self.change_class_name(student_id, problem_id, code) + name = 'st' + student_id.to_s + 'pr' + problem_id.to_s + return code.sub(code[0..code.index('{')], 'public class ' + name + ' {') end end diff --git a/tutor/app/views/solutions/_new.html.erb b/tutor/app/views/solutions/_new.html.erb index e999d5b6..5d12d577 100644 --- a/tutor/app/views/solutions/_new.html.erb +++ b/tutor/app/views/solutions/_new.html.erb @@ -18,7 +18,8 @@ <%= button_tag 'Compile', id:'compile' %> <%= button_tag 'Test', id: 'test' %> - <%= button_tag 'Debug', id: 'debug' %> + <%= button_tag 'Debug', id: 'debug', type: 'button', + onclick: "start_debug(#{params[:id]})" %> <%= button_tag 'Previous Step', id: 'previous', disabled: true %> <%= button_tag 'Next Step', id: 'next', disabled: true %> @@ -32,7 +33,7 @@

    -

    +

    Output:

    Output response diff --git a/tutor/config/routes.rb b/tutor/config/routes.rb index e9d7079c..a701b591 100644 --- a/tutor/config/routes.rb +++ b/tutor/config/routes.rb @@ -12,6 +12,7 @@ # get 'products/index' post 'courses/new' => 'courses#new' get 'courses/sign_up' + post 'debug/:id' => 'debug#start' # You can have the root of your site routed with "root" diff --git a/tutor/test/controllers/debug_controller_test.rb b/tutor/test/controllers/debug_controller_test.rb new file mode 100644 index 00000000..0cf2ddd3 --- /dev/null +++ b/tutor/test/controllers/debug_controller_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class DebugControllerTest < ActionController::TestCase + # test "the truth" do + # assert true + # end +end diff --git a/tutor/test/helpers/debug_helper_test.rb b/tutor/test/helpers/debug_helper_test.rb new file mode 100644 index 00000000..29c59e1e --- /dev/null +++ b/tutor/test/helpers/debug_helper_test.rb @@ -0,0 +1,4 @@ +require 'test_helper' + +class DebugHelperTest < ActionView::TestCase +end From c5c2fb223c648e79ba4a1bd481145ed4075b0975 Mon Sep 17 00:00:00 2001 From: Mussab ElDash Date: Mon, 21 Apr 2014 15:15:27 +0200 Subject: [PATCH 180/938] Update debugger.rb --- tutor/app/models/debugger.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tutor/app/models/debugger.rb b/tutor/app/models/debugger.rb index 5484b4d8..0f75dda4 100644 --- a/tutor/app/models/debugger.rb +++ b/tutor/app/models/debugger.rb @@ -15,7 +15,7 @@ class Debugger < ActiveRecord::Base # regex : The input regex to be encountered to return # Returns: A String of the buffer # Author: Rami Khalil - def bufferUntil regex + def buffer_until regex buffer = "" until !$wait_thread.alive? or regex.any? { |expression| buffer =~ expression } do begin @@ -33,7 +33,7 @@ def bufferUntil regex # Parameters: None # Returns: A String of the buffer # Author: Rami Khalil - def bufferUntilReady + def buffer_until_ready (bufferUntil [/> $/m]) + "\n" end @@ -43,7 +43,7 @@ def bufferUntilReady # Parameters: None # Returns: A String of the buffer # Author: Rami Khalil - def bufferUntilComplete + def buffer_until_complete (bufferUntil [/\[\d\] $/m]) + "\n" end @@ -79,9 +79,9 @@ def start(file_path, input) $all = [] begin $input, $output, $error, $wait_thread = Open3.popen3("jdb",file_path, input.strip) - bufferUntilReady + buffer_until_ready input "stop in #{file_path}.main" - bufferUntilReady + buffer_until_ready input "run" num = get_line # locals = get_variables @@ -123,7 +123,7 @@ def debug # Returns: The number of the line to be executed # Author: Mussab ElDash def get_line - out_stream = bufferUntilComplete + out_stream = buffer_until_complete list_of_lines = out_stream.split(/\n+/) last_line = list_of_lines[-2] /\d+/=~ last_line From 2ee5b8e148216f2f269acd51658c916c5d3a3bb3 Mon Sep 17 00:00:00 2001 From: Mussab ElDash Date: Mon, 21 Apr 2014 15:18:26 +0200 Subject: [PATCH 181/938] Update debugger.rb --- tutor/app/models/debugger.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tutor/app/models/debugger.rb b/tutor/app/models/debugger.rb index 0f75dda4..14959c4b 100644 --- a/tutor/app/models/debugger.rb +++ b/tutor/app/models/debugger.rb @@ -34,7 +34,7 @@ def buffer_until regex # Returns: A String of the buffer # Author: Rami Khalil def buffer_until_ready - (bufferUntil [/> $/m]) + "\n" + (buffer_until [/> $/m]) + "\n" end # [Debugger: Debug - Story 3.6] @@ -44,7 +44,7 @@ def buffer_until_ready # Returns: A String of the buffer # Author: Rami Khalil def buffer_until_complete - (bufferUntil [/\[\d\] $/m]) + "\n" + (buffer_until [/\[\d\] $/m]) + "\n" end # [Debugger: Debug - Story 3.6] From e98072198fc58a599d30d6be4dc49f2f5e25ab41 Mon Sep 17 00:00:00 2001 From: Mohab Date: Mon, 21 Apr 2014 15:35:24 +0200 Subject: [PATCH 182/938] adding popup div --- tutor/app/views/tracks/show.html.erb | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/tutor/app/views/tracks/show.html.erb b/tutor/app/views/tracks/show.html.erb index 25a67437..bbe5182d 100644 --- a/tutor/app/views/tracks/show.html.erb +++ b/tutor/app/views/tracks/show.html.erb @@ -31,7 +31,9 @@ <%= link_to p.title , p , style: 'color:#003366;' , class: color %> - <%= p.success_attempts %> + +

    Click me!
    +
    <%= p.description %> @@ -39,6 +41,18 @@
    <% end %>
    +
    +
    +
      +
    • kdj ie Lorem ipsum dolor sit amet
      • +
    • consectetur adipisicing elit, sed do eiusmod
      • +
    • labore et dolore magna aliqua. Ut enim ad minim veniam
      • +
    • quis nostrud exercitation ullamco laboris nisi
      • +
    • ut aliquip ex ea commodo consequat. Duis aute irure dolor in
      • +
    • cillum dolore eu fugiat nulla pariatur. Excepteur
      • +
    +
    +
    <% if @can_edit %> <%= link_to "New" , '/problems/new', class: "label label-default" %> From b9405b8efb360296ac5fec4562e5cf4264711e1c Mon Sep 17 00:00:00 2001 From: AmirGeorge Date: Mon, 21 Apr 2014 15:37:27 +0200 Subject: [PATCH 183/938] removed fbgraph code in facebook controller --- tutor/app/controllers/facebook_controller.rb | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tutor/app/controllers/facebook_controller.rb b/tutor/app/controllers/facebook_controller.rb index 7ebff02f..42ed5cbd 100644 --- a/tutor/app/controllers/facebook_controller.rb +++ b/tutor/app/controllers/facebook_controller.rb @@ -1,10 +1,4 @@ class FacebookController < ApplicationController - def index - me = FbGraph::Student.me(ACCESS_TOKEN) - me.feed!( - :message => 'Updating via FbGraph', - ) - end def show render ('index') end From bada1f98dfb1eab7076dbdebd996c3a8ad0ee0ba Mon Sep 17 00:00:00 2001 From: Mohab Date: Mon, 21 Apr 2014 15:46:48 +0200 Subject: [PATCH 184/938] Fixing indentation in profile_controller_test --- tutor/test/controllers/profile_controller_test.rb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tutor/test/controllers/profile_controller_test.rb b/tutor/test/controllers/profile_controller_test.rb index 81441f04..242bcc3f 100644 --- a/tutor/test/controllers/profile_controller_test.rb +++ b/tutor/test/controllers/profile_controller_test.rb @@ -1,7 +1,9 @@ require 'test_helper' class ProfileControllerTest < ActionController::TestCase - # test "the truth" do - # assert true - # end + + # test "the truth" do + # assert true + # end + end From df65a6a6efa7db77b3501126475e41bc7d382e29 Mon Sep 17 00:00:00 2001 From: AmirGeorge Date: Mon, 21 Apr 2014 16:10:18 +0200 Subject: [PATCH 185/938] added documentation and fixed indentation for facebook.rb --- tutor/app/controllers/facebook_controller.rb | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/tutor/app/controllers/facebook_controller.rb b/tutor/app/controllers/facebook_controller.rb index 42ed5cbd..ca939594 100644 --- a/tutor/app/controllers/facebook_controller.rb +++ b/tutor/app/controllers/facebook_controller.rb @@ -1,5 +1,10 @@ class FacebookController < ApplicationController - def show - render ('index') - end +# [Post to Facebook - Story 5.1] +# renders the view that prompts user to post to facebook +# Parameters: None +# Returns: None +# Author: Amir George + def show + render ('index') + end end \ No newline at end of file From 5c87d11509295cb735ae878ff046df19cd80f595 Mon Sep 17 00:00:00 2001 From: AmirGeorge Date: Mon, 21 Apr 2014 16:11:49 +0200 Subject: [PATCH 186/938] added documentation and fixed indentation for facebook/index.html.erb --- tutor/app/views/facebook/index.html.erb | 73 +++++++++++++------------ 1 file changed, 39 insertions(+), 34 deletions(-) diff --git a/tutor/app/views/facebook/index.html.erb b/tutor/app/views/facebook/index.html.erb index b0746580..eeeae308 100644 --- a/tutor/app/views/facebook/index.html.erb +++ b/tutor/app/views/facebook/index.html.erb @@ -1,38 +1,43 @@ + + + + +
    \ No newline at end of file From 753f442cadae0f3fcfa7aa7beb2777cddfa1de02 Mon Sep 17 00:00:00 2001 From: Ahmed Moataz Date: Mon, 21 Apr 2014 16:16:53 +0200 Subject: [PATCH 187/938] Fixing parsing bug --- tutor/app/models/compiler.rb | 6 +++++- tutor/app/views/solutions/_new.html.erb | 2 +- tutor/db/development.sqlite3 | Bin 204800 -> 212992 bytes tutor/st1pr3so53.class | Bin 0 -> 373 bytes tutor/st1pr3so53.java | 5 +++++ tutor/st1pr3so54.java | 4 ++++ tutor/st1pr3so55.java | 14 ++++++++++++++ tutor/st1pr3so57.java | 5 +++++ tutor/st1pr3so58.java | 5 +++++ tutor/st1pr3so59.java | 5 +++++ tutor/st1pr3so61.java | 5 +++++ tutor/st1pr3so62.java | 5 +++++ tutor/st1pr3so63.java | 5 +++++ tutor/st1pr3so69.java | 5 +++++ tutor/st1pr3so76.class | Bin 0 -> 373 bytes tutor/st1pr3so76.java | 5 +++++ tutor/st1pr3so77.java | 5 +++++ tutor/st1pr3so78.java | 1 + tutor/st1pr3so79.java | 1 + tutor/st1pr3so80.java | 5 +++++ tutor/st1pr3so81.java | 4 ++++ tutor/st1pr3so82.java | 4 ++++ tutor/st1pr3so84.class | Bin 0 -> 373 bytes tutor/st1pr3so84.java | 5 +++++ tutor/st1pr3so85.java | 1 + tutor/st1pr3so86.java | 1 + tutor/st1pr3so87.class | Bin 0 -> 373 bytes tutor/st1pr3so87.java | 5 +++++ tutor/st1pr3so88.java | 1 + tutor/st1pr3so89.java | 6 ++++++ tutor/st1pr3so90.java | 7 +++++++ tutor/st1pr3so91.class | Bin 0 -> 373 bytes tutor/st1pr3so91.java | 5 +++++ tutor/st1pr3so92.class | Bin 0 -> 373 bytes tutor/st1pr3so92.java | 5 +++++ tutor/st1pr3so93.class | Bin 0 -> 373 bytes tutor/st1pr3so93.java | 5 +++++ tutor/st1pr3so94.class | Bin 0 -> 373 bytes tutor/st1pr3so94.java | 5 +++++ tutor/st1pr3so95.class | Bin 0 -> 373 bytes tutor/st1pr3so95.java | 5 +++++ tutor/st1pr3so96.java | 4 ++++ tutor/st1pr3so97.java | 4 ++++ 43 files changed, 148 insertions(+), 2 deletions(-) create mode 100644 tutor/st1pr3so53.class create mode 100644 tutor/st1pr3so53.java create mode 100644 tutor/st1pr3so54.java create mode 100644 tutor/st1pr3so55.java create mode 100644 tutor/st1pr3so57.java create mode 100644 tutor/st1pr3so58.java create mode 100644 tutor/st1pr3so59.java create mode 100644 tutor/st1pr3so61.java create mode 100644 tutor/st1pr3so62.java create mode 100644 tutor/st1pr3so63.java create mode 100644 tutor/st1pr3so69.java create mode 100644 tutor/st1pr3so76.class create mode 100644 tutor/st1pr3so76.java create mode 100644 tutor/st1pr3so77.java create mode 100644 tutor/st1pr3so78.java create mode 100644 tutor/st1pr3so79.java create mode 100644 tutor/st1pr3so80.java create mode 100644 tutor/st1pr3so81.java create mode 100644 tutor/st1pr3so82.java create mode 100644 tutor/st1pr3so84.class create mode 100644 tutor/st1pr3so84.java create mode 100644 tutor/st1pr3so85.java create mode 100644 tutor/st1pr3so86.java create mode 100644 tutor/st1pr3so87.class create mode 100644 tutor/st1pr3so87.java create mode 100644 tutor/st1pr3so88.java create mode 100644 tutor/st1pr3so89.java create mode 100644 tutor/st1pr3so90.java create mode 100644 tutor/st1pr3so91.class create mode 100644 tutor/st1pr3so91.java create mode 100644 tutor/st1pr3so92.class create mode 100644 tutor/st1pr3so92.java create mode 100644 tutor/st1pr3so93.class create mode 100644 tutor/st1pr3so93.java create mode 100644 tutor/st1pr3so94.class create mode 100644 tutor/st1pr3so94.java create mode 100644 tutor/st1pr3so95.class create mode 100644 tutor/st1pr3so95.java create mode 100644 tutor/st1pr3so96.java create mode 100644 tutor/st1pr3so97.java diff --git a/tutor/app/models/compiler.rb b/tutor/app/models/compiler.rb index 9d95c8ce..9e499092 100644 --- a/tutor/app/models/compiler.rb +++ b/tutor/app/models/compiler.rb @@ -37,7 +37,11 @@ def self.compile_test # Author: Ahmed Moataz def self.change_class_name(student_id, problem_id, solution_id, code) name = 'st' + student_id.to_s + 'pr' + problem_id.to_s + 'so' + solution_id.to_s - return code.sub(code[0..code.index('{')], 'public class ' + name + ' {') + if code.include? 'public' && 'class' && '{' + return code.sub(code[0..code.index('{')], 'public class ' + name + ' {') + else + return code + end end # Author: Ahmed Moataz diff --git a/tutor/app/views/solutions/_new.html.erb b/tutor/app/views/solutions/_new.html.erb index 300cb6fd..e182d7d7 100644 --- a/tutor/app/views/solutions/_new.html.erb +++ b/tutor/app/views/solutions/_new.html.erb @@ -5,7 +5,7 @@ Time spent: 0:00 - +<%= @solution_id.to_s %> <%= form_for :solution, :url => { :controller => "solutions", :action => "create" }, :html => {:method => :post} do |f| %> diff --git a/tutor/db/development.sqlite3 b/tutor/db/development.sqlite3 index 451d016bf0898e48211d59333e64d181ef9f91b9..987b841e631df788c31d4cc279b357f6b84cdd24 100644 GIT binary patch delta 3940 zcma)sfkS%%|aYCCVs zw5TM`*j>u45jBjZw)ANwe?6Zc%@_S&2G#y51#^SfR^g@V`8~M)-}Ty`tX7PCH{4Qu z$rR$6)J4d!xouG=YKg3fZVRHetKr#a*FGsP&FAOK{*T+!-eI`hV{t0nEjAnzBV@;@ z5k=@GP>1Sw@nCy;+MnI2w(d)^uxTJd9WLbwScu$E5rYg^bAD>KI+uvU`=^YDBpYd0of|{ah1UPfE5j7b6#$;I|2$NBx!+(Q_79!%{S}+I+dN zwwBfWhka?+|7*9}K0OBds!@@nzMf);1lEpipb6a@U42z1i)&;!eE+ACy`Kjm@%`7jiGYrxTf@nsk2sTiBlNNMuT9> z#__uW<@BaBHnUX_Ye@u!7GQCN<0Zx1P!YLf;9GP|Lg_adlMrI&63f6Gias9vh$8f9 z;Kf^MBK4pTaf5TjaFP`&LO=R4ESS@#!H8*@@n#fJgg*5$EaGCAhnR8}w=1Fu{m9F( zFmz$Vgy^Gq{3D9cC!4Sm{ixo~DJMM6iYQ|fTiH;NvVjI8D(FJC106eBpt5r4y?Rk}@`sTwa- zM9(4M4W~MST`uGuDpGlj)EIR5XXrS`a=&;=dn&I~1X!cC!s~^^#wfSkFTth=T;UfaKz&w)j24aQw;=FKy8~L zsR_x7&_9AB;v?j|lpF8_1R2tpQUv=zq!wgFY`Xv~+^B{Zn_GBC<Q2IhK(W(KC_rqjJ_ncNwfrmwMOlA6BD9!R{iXA;_e!-_`3B@RRMa1dY^U_|h*Wi9m$p*KF66WrV8xgf-;tc&~AGAq=h z$SP)rX_Jd;E|fI*hjjIeYza}?>Wf!3X`8Fbls%S0)`X++Q@RjqkyN5ClbKesE~j>f zP$jEI|Fj9=tXZkNxRYjS-1(jxs|YSUp6O`9pxg0~Es9*@7!Lo?90&XwcpQC331{N$ toxXuKwjFTvElJqnI{F?!A0eYYb}eJXXMBzLkI?-kBWt#VN=gi#j%kZ$v&YC@FO&Dpb=)Yaw1ls#5LX~MzyAzg|Wk(5Fg$-FU27t?l! zFa@hd|Fj9=yjq)F-YB~??tD+JRRk9v&vZ0l(CxU(mNIW}2#0@Yj{|-UJdQr2gfnsW uj^9A9Z9CxTw*#v`eT0nq*lrmsKH+P{e}wKYAz=r*?O@E&!QcxZjYG%) literal 0 HcmV?d00001 diff --git a/tutor/st1pr3so76.java b/tutor/st1pr3so76.java new file mode 100644 index 00000000..be48f94c --- /dev/null +++ b/tutor/st1pr3so76.java @@ -0,0 +1,5 @@ +public class st1pr3so76 { + public static void main(String [] args) { + + } +} \ No newline at end of file diff --git a/tutor/st1pr3so77.java b/tutor/st1pr3so77.java new file mode 100644 index 00000000..8f0f3b03 --- /dev/null +++ b/tutor/st1pr3so77.java @@ -0,0 +1,5 @@ +public class st1pr3so77 { + public static void main(String [] args) { + s + } +} \ No newline at end of file diff --git a/tutor/st1pr3so78.java b/tutor/st1pr3so78.java new file mode 100644 index 00000000..2f259b79 --- /dev/null +++ b/tutor/st1pr3so78.java @@ -0,0 +1 @@ +s \ No newline at end of file diff --git a/tutor/st1pr3so79.java b/tutor/st1pr3so79.java new file mode 100644 index 00000000..30d74d25 --- /dev/null +++ b/tutor/st1pr3so79.java @@ -0,0 +1 @@ +test \ No newline at end of file diff --git a/tutor/st1pr3so80.java b/tutor/st1pr3so80.java new file mode 100644 index 00000000..f104c6da --- /dev/null +++ b/tutor/st1pr3so80.java @@ -0,0 +1,5 @@ +public class CoolSoft + public static void main(String [] args) + + } +} \ No newline at end of file diff --git a/tutor/st1pr3so81.java b/tutor/st1pr3so81.java new file mode 100644 index 00000000..731c05a0 --- /dev/null +++ b/tutor/st1pr3so81.java @@ -0,0 +1,4 @@ +public class CoolSoft + public static void main(String [] args) + + diff --git a/tutor/st1pr3so82.java b/tutor/st1pr3so82.java new file mode 100644 index 00000000..7ae732b3 --- /dev/null +++ b/tutor/st1pr3so82.java @@ -0,0 +1,4 @@ +public class ahmed + public static void main(String [] args) + + diff --git a/tutor/st1pr3so84.class b/tutor/st1pr3so84.class new file mode 100644 index 0000000000000000000000000000000000000000..d990f60bc37e1f68d423cf91c49b6f17ed23dc31 GIT binary patch literal 373 zcmZusO-sW-5Pg&8!^UW8E8e|T1%uXu(Beh#6!cK(#nUD(aZ9?9P3r&hBzW)#_@j!m zQHY=mJ2UUiyf?d_oA(a@=hzR?!(M=4fDyr;DXp3-LT`MuAh_4nqa?(s((-n_%A~m$ zS;@>Wt#VN=gi#j%kZ$v&YC@FO&Dpb=)Yaw1ls#5LX~MzyAzg|Wk(5Fg$-FU27t?l! zFa@hd|Fj9=yjq)F-YB~??tD+JRRk9v&vZ0l(CxU(mNIW}2#0@Yj{|-UJdQr2gfnsW uj^9A9Z9CxTw*#v`eT0nq*lrmsKH+P{e}wKYAz=r*?O@E&!QcxXDnrEp literal 0 HcmV?d00001 diff --git a/tutor/st1pr3so84.java b/tutor/st1pr3so84.java new file mode 100644 index 00000000..43a81164 --- /dev/null +++ b/tutor/st1pr3so84.java @@ -0,0 +1,5 @@ +public class st1pr3so84 { + public static void main(String [] args) { + + } +} \ No newline at end of file diff --git a/tutor/st1pr3so85.java b/tutor/st1pr3so85.java new file mode 100644 index 00000000..0e3e4975 --- /dev/null +++ b/tutor/st1pr3so85.java @@ -0,0 +1 @@ +jhk'eratjs \ No newline at end of file diff --git a/tutor/st1pr3so86.java b/tutor/st1pr3so86.java new file mode 100644 index 00000000..e531f9d3 --- /dev/null +++ b/tutor/st1pr3so86.java @@ -0,0 +1 @@ +teyitkrdyf \ No newline at end of file diff --git a/tutor/st1pr3so87.class b/tutor/st1pr3so87.class new file mode 100644 index 0000000000000000000000000000000000000000..727a829e986dee9eba033cf9b22ca9c2e730b0b8 GIT binary patch literal 373 zcmZusO-sW-5Pg&8!^UW8E8e|T1%vjW(Beh#6!cK(#nUD(aZ9?9P3r&hBzW)#_@j!m zQHY=mJ2UUiyf?d_oA(a@=hzR?!(M=4fDyr;DXp3-LT`MuAh_4nqa?(s((-n_%A~m$ zS;@>Wt#VN=gi#j%kZ$v&YC@FO&Dpb=)Yaw1ls#5LX~MzyAzg|Wk(5Fg$-FU27t?l! zFa@hd|Fj9=yjq)F-YB~??tD+JRRk9v&vZ0l(CxU(mNIW}2#0@Yj{|-UJdQr2gfnsW uj^9A9Z9CxTw*#v`eT0nq*lrmsKH+P{e}wKYAz=r*?O@E&!QcxeTtm(P literal 0 HcmV?d00001 diff --git a/tutor/st1pr3so87.java b/tutor/st1pr3so87.java new file mode 100644 index 00000000..b1587150 --- /dev/null +++ b/tutor/st1pr3so87.java @@ -0,0 +1,5 @@ +public class st1pr3so87 { + public static void main(String [] args) { + + } +} \ No newline at end of file diff --git a/tutor/st1pr3so88.java b/tutor/st1pr3so88.java new file mode 100644 index 00000000..c59d9b63 --- /dev/null +++ b/tutor/st1pr3so88.java @@ -0,0 +1 @@ +d \ No newline at end of file diff --git a/tutor/st1pr3so89.java b/tutor/st1pr3so89.java new file mode 100644 index 00000000..d265f2d5 --- /dev/null +++ b/tutor/st1pr3so89.java @@ -0,0 +1,6 @@ +public + class CoolSoft { + public static void main(String [] args) { + + } +} \ No newline at end of file diff --git a/tutor/st1pr3so90.java b/tutor/st1pr3so90.java new file mode 100644 index 00000000..f5c71b21 --- /dev/null +++ b/tutor/st1pr3so90.java @@ -0,0 +1,7 @@ +public +class +CoolSoft { + public static void main(String [] args) { + + } +} \ No newline at end of file diff --git a/tutor/st1pr3so91.class b/tutor/st1pr3so91.class new file mode 100644 index 0000000000000000000000000000000000000000..1d8a2173bd67fac56b3064eb925cc99b81046784 GIT binary patch literal 373 zcmZusO-sW-5Pg&8!^UW8E8e|T1w-vgDqaLnK@XK)JZ<6-_`31r9^>a1dY^U_|h*RHe){p*KER5Zs&kNfP2zRq}4V%A|e} zS;@>Wt#eT>gjN>+kgj=F4IxS!GkMX|roNoa*kdJBMK~Hirc1FANhzu#nH#ODV%F{u zx?t7lpEeatj=l%bN64s;-IlT9Grm^*N9g_%685m)4#pfE47M3zL%#q3 literal 0 HcmV?d00001 diff --git a/tutor/st1pr3so91.java b/tutor/st1pr3so91.java new file mode 100644 index 00000000..00efded6 --- /dev/null +++ b/tutor/st1pr3so91.java @@ -0,0 +1,5 @@ +public class st1pr3so91 { + public static void main(String [] args) { + + } +} \ No newline at end of file diff --git a/tutor/st1pr3so92.class b/tutor/st1pr3so92.class new file mode 100644 index 0000000000000000000000000000000000000000..005db07c97ce514765d655d063355c9945c3f96e GIT binary patch literal 373 zcmZusO-sW-5Pg&8!^UW8E8e|T1%vHLDqaLnK@XK)JZ<6-_`31cxDdI0!HdFe3O@s#5JWp*KER5Zs&kNfP2zRq}4V%A|e} zS;@>Wt#eT>gjNRskZ${|8bXvd?Zu0pHudFX#vUu7D#FqDF!^$-LF7DrR-_`3B@RRMa1dY^U_|h*Wi9m$p*KF66WrV8xgf-;tc&~AGAq=h z$SP)rX_Jd;E|fI*hjjIeYza}?>Wf!3X`8Fbls%S0)`X++Q@RjqkyN5ClbKesE~j>f zP$jEI|Fj9=tXZkNxRYjS-1(jxs|YSUp6O`9pxg0~Es9*@7!Lo?90&XwcpQC331{N$ toxXuKwjFTvElJqnI{F?!A0eYYb}eJXXMBzLkI?-kB&l&lls3r2_F0b{;1+? z6e8%t&dhr=@6GP#=KTY}Irc;Juoqw$U_|g|N~`9I&>J5u2<~RRbM|Z|b#-|$Wsj9mns6|FNSES8B&Ep<lS9Y= literal 0 HcmV?d00001 diff --git a/tutor/st1pr3so94.java b/tutor/st1pr3so94.java new file mode 100644 index 00000000..888454f2 --- /dev/null +++ b/tutor/st1pr3so94.java @@ -0,0 +1,5 @@ +public class st1pr3so94 { + public static void main(String [] args) { + + } +} \ No newline at end of file diff --git a/tutor/st1pr3so95.class b/tutor/st1pr3so95.class new file mode 100644 index 0000000000000000000000000000000000000000..03a2f9514a9975b3b01d4582bea815dfd4f90815 GIT binary patch literal 373 zcmZusO-sW-5Pg&8!^UW8E8e|T1%nn3(&9z%6!cK(#nUD(aZ9?9P3r&hBzW)#_@j!m zQHY=mJ2UUiyf?d_oA(a@=hzR?!(M=4fDyr;DXp3-LT`MuAh_4nqa?(s((-n_%A~m$ zS;@>Wt#VN=gi#j%kZ$v&YC@FO&Dpb=)Yaw1ls#5LX~MzyAzg|Wk(5Fg$-FU27t?l! zFa@hd|Fj9=yjq)F-YB~??tD+JRRk9v&vZ0l(CxU(mNIW}2#0@Yj{|-UJdQr2gfnsW uj^9A9Z9CxTw*#v`eT0nq*lrmsKH+P{e}wKYAz=r*?O@E&!Qcxb`9sS9 literal 0 HcmV?d00001 diff --git a/tutor/st1pr3so95.java b/tutor/st1pr3so95.java new file mode 100644 index 00000000..32be5af5 --- /dev/null +++ b/tutor/st1pr3so95.java @@ -0,0 +1,5 @@ +public class st1pr3so95 { + public static void main(String [] args) { + + } +} \ No newline at end of file diff --git a/tutor/st1pr3so96.java b/tutor/st1pr3so96.java new file mode 100644 index 00000000..cf4b226c --- /dev/null +++ b/tutor/st1pr3so96.java @@ -0,0 +1,4 @@ +public class st1pr3so96 { + + } +} \ No newline at end of file diff --git a/tutor/st1pr3so97.java b/tutor/st1pr3so97.java new file mode 100644 index 00000000..6beb6c78 --- /dev/null +++ b/tutor/st1pr3so97.java @@ -0,0 +1,4 @@ +public class Ahmed + public static void main(String [] args) + + From 96f20b43fba0a2bd6bfa2b59ab421b4e9b80c803 Mon Sep 17 00:00:00 2001 From: Ahmed Moataz Date: Mon, 21 Apr 2014 16:19:26 +0200 Subject: [PATCH 188/938] Removing development.sqlite3 --- tutor/db/development.sqlite3 | Bin 212992 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 tutor/db/development.sqlite3 diff --git a/tutor/db/development.sqlite3 b/tutor/db/development.sqlite3 deleted file mode 100644 index 987b841e631df788c31d4cc279b357f6b84cdd24..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 212992 zcmeI5e{39Ae%NPrNv?Lu-H|NYYgyK5Oj}27Y_8_#{-Ez1uP92UL{gMQ+Lm;_z2WYV z9BF@PW>yk?=cGgV0^}|UnxIAgXn|{yUW*jH^w58DK$13T(G)=u+#d~^G(mc8+9JgP zO>@chE{IdK-#4>6JHM6|X__a?-?6pao$t)|ec$K3_kHjCX6DVcD+`*bvg>WVshF%t z9j0iSdW~f%iY`$UCBeV`)`c%4{U7j`_Iw}m6?9Dh$*ED0#+VeBp`)j4*4>D=5~?BuZ1CfUnN?4*10Bzt<&RyUdZ z@^eonvL{c{UrCtCT0?aYalahxCA3mGyD%5fq17iL<(0V$b645rtMiMMtJm2}bJy9* z>dNK$B{*?$ZfS*Gx(xqT7ZzS-CtFHWon-GSdTmqDPYbe~gPryE+9X?7OclN>8z9$O zrn;f(@Ux@0*R_UP)ta^-aN>pvsPsv8t=(>@N{gscH*_^31+}B-W>amMp~P#t3MtpC z3W$gerq(2ObUWlnXtx8+mjU+N-1*At!U{Vz<;|(us_9!DqN1Z1#=W)s?pLrfL{= zMpbDU_kcgKXCP|d zYYo|FZgs--c1YnxRnDCC#U~QkGiT@rr)*Mn&8T%96W7{`UN=HJj`#_NmcS(D4p}I9~YJG}8Z+CSAnz;|wu5zC}V!JWxT_^YIT6Y6nh*9rY^?YtUJmW`^ZDmAFR8&z-q z5Cy#9GzjXPRbUd?SuhQf1>e7e#vMc%KiD0P^qbXh6<$vhZD;7noHd_GWbaJV+q9>% z?5Av)-8#4{yU%p?L1v*j)~h`U{0ttOjwJ5%rom%LUp!2&zi9fF_%lxYhhw5s2&r@; zJ3UQX7kq`#KR1~AL^SUH;r^sTm_T3TLEGPDj6Vch z_uw5>`{}yp`11@|>`NTJnQ_}MT94 zz}M<}<(!O6oFuvHjxBPmRfE1M)CF&;imwARVDMm={!Xpi((Zyk)lBFZz2g|jZe2BM zy4EqFJDg9KG!fL2K=1hm84DU2p49JlR@GEGi@^m-xEP22cnPM#O=gbB75u@{Xnx#RO(HwWjLQ>ezTmNdon1p zWq<&m-MOE1yaZ4Snr2E>R}L%q|5fw>y^IqD-55S}Kv zeHqToS=pp_jM1x^ZWYyy5uYCDg6-O=8+(Gho4i_y7zB@JXzPsawxO*;KC4D;6XKO> zQ`^uL(m0LKj(E>t|3G8d>5lsiDIvMDT>~`#+#T9+wnrT7A80|$k8DTfKEDIOboL^A zJpGw8eA3LHQSd)*NB{{S0VIF~kN^@u0!RP}AOR$R1dzaELEtbQ%LyDWaS~tRMZPGM zQjjl<{~wFO#Y`XpB!C2v01`j~NB{{S0VIF~kN^_s5jYahCH?WgbN&CfDdx8k5)wcH zNB{{S0VIF~kN^@u0!RP}AOR%sXcH*WBUGhABKv7hn&!(aU!39O8NQU4%LQ4MhD*}S z|D=v)em&0o1@jxsA2R=*`A5tzGJlKdGMmijm@CYyOrFVR{%_`gXZ~B}_cFi!Xj4Gz zkN^@u0!RP}AOR$R1dsp{KmthM@g(r{(Kt_=x>CDcg{975?J|4CCL@-9B7TxK+KsOL z+`f`J5Gw>S*OA&{#4R7Yl4oSOuDNpIM@GwjbeW7@vI}5D+lCRB!C2v01`j~NB{{S0VIF~kN^@u0v~e%pNprc<4i0`$(71%yQ>?j zC?@{%%BE(p@W1n{J!@|2sv32-e5p_>7mLFsH)1{Qd|$gDgtgymM{AJ8f;?Pu18(%U zEq8VEd`Ne@6>Ya%Du`mFZd*d){}}UsDCT|mzzqo?0VIF~kN^@u0!RP}AOR$R1dsp{ zczg(q#Nu=k{>78Y6yz$#e4oVs-+z2Eh&e$5NB{{S0VIF~kN^@u0!RP}AOR$R1ja__ zBpr*5j3kpua{ZrX-iP=fxgY@~fCP{L58K|L$vXdEDo0}&_r7@q>Yc(R+7qGgtlT{E|-g(WXJ!R zKc<+kF|WcO+>ihgKmter2_OL^fCP{L5^0#t)VujBV%N)P~^m7I2JGF9Z5Cz@Cm?FKyc~+)W{{CkDNMiBvtz1 z6W}8gfbhQ}984Gi- zOX}K^~*84?UNhPX5c(&yRm<{JRsslzuh+ z2bup!{u`=qCqehAME0{MY3sPws;l?yk81DsiaT^7d*%#n9WfPn2*apts!gTZ)HZa* zgf$n8(2m&b)w#;b9J^9EyD-O2hUAm%>B+mQP8MvKWbZ0^ZBx-t3$mPJmoBfcOREbD zIV%wZb0Ez#wk6$1z=W1|r>j;;W*#YHb}ou|uP9cR=C7>IvGYsk=H6l_yMw&=PM>5i zFMU9H<(5arvM;?vUw7)lorY!t6cy04YO3M?IqIti0paPE(o|oDGjnij%jN8`WAuA* zTc@cjwcCdCdB&$<(%DI>k5-?A%&g2^n7hg@U!7m9T)oa-n!C2~ALmCFb;zCox{64-g+NB;w%M+$jjGZz?hRoS#WGUUZn$kH&Ll{6dZ5|dlzLNZ z8P4aJpN+F~Pc$MSfKSubH7G|X4{PmqLseR&nzh%Q@`mrq2GAQ+Ab7BCU4v59nzjHa zyWS8E-cZ3A>yzw2)ow^wESJchIz?|g4XXylQB~`j+13s3_k^E{SF|TKyE5_9d?K66 z(c1~Tu;4bn4xypyx^1NQ*P)=9Ug1Y?XjVvMPeT9ruGdfk(l$dkMk3AAjgQ>2?Tnbn z9zRY$FnX4Cbptx-w*4m=w94MQCz~RxJgF=pXRxIzP-h2q+)$gUVUl`0*auyZJp>@0 zH&E&8V7;z&$k<|%HP!njG=yE%sf^@|S1x&h^anGf$ZQCM9jQo213AIvoaFWN-rl8u zA8MpLXD!Q#Z1)Vko%D>YLRM7UEz;*e;ei(LnswIz_#HZWyl1n&V|Rvap@Vl+?R5H~ zbNrcxBJk!hXQc{>?DRBkUGOnB%x+zUj;XJ$|9c{ua9`|Ct6xjJfO|&{;X7YUWbaJV z+jIoqei~s01D!#0(+>gnVf6aZ_RsL=7RU|^nao**QX)G$OIyCyTs2jtwyCu?stT-g z1|kpR2vH^)cf^r?TcXH^Pa0AP&y>MIg5fvqLRhKHI?b%lHmt{BA~CyX`sqcS?>8Pm zhL0h(=B(_D*LT;|weALt^bGgQVLvZ-KS^NMBh6j8sxQ7`yQ&AL>}FJV7qY9ak(KO> z(2gSkOM@ru$>Qj-u~IX&yJT4E4nNp)bLT6o3oGo@`V{fWeP`wM>$}PQ_S9z**=&}6 zZ`#g1)Nj+UKc4XC(%!eHoI$^1*yE~xHv;+DXzS4D3`SIB4DQW=(Oqk5_G*Go2;lFx zel%lR^89~>{vC?`osrFv?~J}THaGU&L!-&#si(#dO^m0%lKC?8Z05Dh|6pQY`cxu& z;spI=r|;`6n_%?+-gz;RedPpgWj&6v@0N&zguq^F^mm+!Y@SXR(?7;NsTVr-{68ry zTNgCG$)^+9n=o*C)01YuFEPmZx@xFqwF92*UR#I3bNja1au0ZF2P52rhG_w#e(Kp5 zY#=}53^4n4lfT!ghY@ab4Wis3`7^YQR#mgdcb+)~*C@`Lm0DNVNfP~Y0&@io#TY6Jo~m_1nem+- zl;^sy4xI$l?Y3%{h+8S2eAvd>D@ZcCeE~AC(Ho&H^q!tG`sW!@CLD__ z24)9W>f2wsu+s?tWB`P-Zra`|cywGCH9e=b$UJBR+>kf2GP*Um zCS<^1$yA#i6O0(l|E)uy0S|sh%7!o}fm*epH8uZL8FIPk;P6}bUr&(hUk|428mOy~ zaTw{s^&4_2H1L!47e+w3r}`P~WqM&v0E3&J|MH7(u(^xIXFV|wbM-IL*4y^@!PZ{w zN0x3{4v6P_IrmRb`cHAj4S^F06i*((UwHBczud!}Jmsv~MQ8T=M6WzL4NZk|u>VX3 z`8#{}G^-QvTExQyaDRlZp2Yvu;hiquqYMck0VIF~kN^@u0!RP}AOR$R1dsp{__z}w z&;R%0|7Sk#c|rS;01`j~NB{{S0VIF~kN^@u0!RP}Ac1HCc>O<`3+_b%NB{{S0VIF~ zkN^@u0!RP}AOR%sI1wQ6f1Ei?G2djq0Do{p0!RP}AOR$R1dsp{Kmter2_OL^@QEO> z6hB1qkkd+K(Ow{E*f@u&;)LQ3l63kvsj+mGV*Ua1TDqF~PUa^vCq5AcjhRFONB{{S0VIF~kN^@u z0!RP}>@R^Tgp*fj5>8&*f)|xE^X;yg@93~vVWV|=>e`hBc1?k;K9!pmW0CP2C-Gcl zd?^(+gIS@ArdG=>KAxUijHgrzB=~M))(Tt(=Ky`vdmXUA36a!IsslP%EhRp zrEB!C2v01`j~NB{{S0VIF~kN^^R6bX>{edv=?z@zmP8% zc%F~ACf}Ewjr(*&TwRAFj!c2m*oY)=?@*Sa7{G9M8+7W1+w2_^E>!1~D_ z@8f__xR;P@Cj@ETRrM`aRgA5EGT{iam>1*%JpMjhqK-m#oK$?-8J0sch-NB{{S0VIF~kN^@u z0!RP}AOR%s_!3BwtU2rcvyX2sF=t2s2_OL^fCP{L5-*tf<;N3V|j)(9V$V_%OQqko$ED{6x%*kQ9W z>^NoR;4zS7vQp`E*BV-ltu++GU}xLy#GA9qpAg(+kl=5P! zC`fJ*IR<$pR{B$5&=eHuFhY9fi#uj5-WKE>^T`#Vjrfk=0hoRe7?*T z3h-P~?`;bpPcyhBTd zh8!%5!i-qTb7fhQTnE;($0M;a$H1Ng@hn_{G~_b8H6_%LJraw11`KLOHJrV>x`!!v zyHGoUG8Ja{GWZ_ySle)k#bqBUleu!9my3KU=n{k(S7JT&G?-l6U&^;{)z>%fsl9$> zH2{pCk)^!MN!(yfo?dnINUW)+z^O z>A^G{en#N(yjTL0LI$}KD|7U~4B}=430z%~F9uzmM`C53I2ePVYbnpjTwa3bc42hr z=?DE1D|6%k4TA0$Ml6NF2$a-z+aOnBWey*hK_$`~2xYD)1qpd1R)#q+gLvYN;4xlt z@F;JOkVkSelcMH!_6BS^#lHKTztkmpMgk`&Nrhl;y^`g0iaHae+~7O>5x+(eY8VLz zq+;1u~nymq6{R<$z5sWxxC21pxNiaY>lpD`OvO3a^QmC3How4*REta zu?vmG84ftYx^q&ngguhwvE6AD^KuymU~Z7>RB;hB_9d4_Q`D(m++wPR$v*FF6M@2% z$SEagEo50c=Y4uTWgf}RSc;m3b?uTggo(ZPBra~ThFWX4>a5XjbWN?@%8f=oy)S}C zA9Q(qndOTl9OR1mf>?k-&~-XRRr(RuK>50+gVh7wee1jmM5s#9@6js=<$^3i?3=96 zP|ue~2;Yb(F4QIq5U0*aP^(IEQS|vVzvO0|SWO3!n421`0x_^U9=Uje2=77U+`@w# zfuZ6}_z+%!51vgkEES*lAvN*C%$L%C0K0HQ0!RP}AOR$R1dsp{Kmter2|Qi|tk2WW z`EyjMykL=wp%8bTJn4@BVcuWl^01Hh%=_~!FTfnlj9ko_5#bm@w)WnA2RQt=AWq-&k2G$-21p=Jl(Krf^-k zb+uF2a-%rGmx3U2zMx)&>r^DLg?VyVCLY#!%X9D_?|!kKk3UD9@Mf`6nX)rT)~=(j zncceDGTlIY5b7541)%^JtJJ$2Dhp^F|Tk_f{i?TeJb_+}RC>s}6 zFV$}uTX)~MUZ3Om`qr)H(hYT?zINlCwet1S9pR!_Q}XTemD1Ac9c3lIaY=vU60rI& z1lVBfR}{F8{V)~9vCXMMvRr@}qLjp(u2_OL^fCP{L5|nOQ?%fn`G}J}zPXTCCjLUwGXvqo z|9?R-f5ZHc`3vgBM=)1t5)wcHNB{{S0VIF~kN^@u0!RP}AOR$>YXT#2ijI?ySUgT8 z$@+h3N~Ge~Ms6hTCBA#;tK;uXJUj8HnIp{M*fxC|L>H-Z)Ze52fckCv8Tdv~+wz-< ztSr;-rA-B1PkC3-HS)I#PiPpX4o~ZwM$|rT_Uc?^WsY5`oL!h>C!-FTWKU0O^+|Sq zX=U!h+*Nk@>ilBm>UH+g+;z6Hx^j7b33M#ZEv>Lim*L;)!otfQMJ=VNPO_l41}{ZC zEy!{Xq~=y9ytCP^tBtDCGVZB*l_Ur@s~f5g$G7jbhU|;fRMS<(RO?m6oMh|p&D5GI zXz6yy5C87m_LFZUvd50m@5OCyfU0(z0E5pnem2g|J<%{Vvk}g4U0Yw*YTbsp<<09| zO}%G8v2|Nu{Q!a4?r61x!(uJ1Cb9-kZ;xuNx_aOKsM-Xo9lgDwtA+tj{20}CtJ=Ho z2yBDGt5^Gmh7Zp7c&;wZUs;`l`gCsYEp~DbswdgYOHheOA^EH!Wizm5l2o)lwcPf| zr9}4RN&3N?b~*Q-&@tREFZfH_-M^;-uR&d&WKH$H2}U&3)`q$1EljeKM%VD}Ayw4- z+mj7XB>?o~)w6+Wu$$`sQ_n6WvL{Z^Ka+4UIQNVhz2uA+0}y)RJu!%E`Stdi(kvbhExdPx2ZZKGAyS^=l#8pV0DQtRqENuqyFz=y-)G(%;vw3YSvynf3dp3W|i{*F^Sc(eX7?n#cv>hC7a$tm2N^{J&q_By0_ zZAh8{{B{}j^?dpvO^DJFwkYzb+?N}d6IoHDzw(n#|EMapO=u!jsAn3uF&I{u;a#Ww zZY1J}N7AEg=t{k74-wY&b~99Y2I8PIaYi8n*Hl+Kif%Tc9*2|+X(CZ$6LbNN+c-!U zV4YY_WUq*{HS1}Q5%t$?*%7kb4$U&+a934tSQBneUVm}%N+R0^`+o9+?Tc#A5$XTf z?#+$TyrcDzC*-!Lt|qe2KTp4Rtmj+6x7QSd^vnHkF9khGU$7?!qP05RaFc9z&8Xcw z#3Rw;u#YfGvA%T8j#3_6b4Zb4tzi#tjh6$2Y|)fJH4qyqLvL{3k zSgSB38|1jx6$i5Hh8>zCKJ&USe9_Ttj{b8ofJ-`d=|GS_V7=L$lxw0?)bW*vp==fkXuT;!k# z3;2qW3o$qn-fvZBQ(rMIi&yToUT>~w!kKoV)-<{W_4>x<#W%O48`sShb^Z0ToijpX zwS8y(>^tY)6bt13{}}V96!U%fzzqo?0VIF~kN^@u0!RP}AOR$R1dsp{_&5`oh@XI! z0h~#U*m(RzvOjm=#Q#6EpZ|vpp8hyz5^YBUNB{{S0VIF~kN^@u0!RP}AOR$R1bhTW z+~@z9U!mfeU!^j?%6yI?lL5FP0VIF~kN^@u0!RP}AOR$R1dsp{cytI{p;J_LilQm1 zQn}B5mgP3pMx)KX+149%mXC$+_)q`2rUeTNhwIFTWkL^(XuK1)qMwt3OH!Cx}8Z;vxTHzQC1=GWRy^s89CH z=Y8t=4^+>~#d73agIp>~#e%*5AM+l?{A>8Y4GACtB!C2v01`j~NB{{S0VIF~kN^_+ z$OwEUmY@zL=}IMX{y{91B)%9mb>K)oLnkOY3DW~Z&K8A2K|L;@G`^@)0 zvJ9ePB!C2v01`j~NB{{S0VIF~kN^@u0!ZM%35<;-X*w1g8A&FS>CAtnMl!!ZWqyJA z7Sm=vec;Amf=B=fAOR$R1dsp{Kmter2_OL^@ChZb2#@w3Pg2R`3Ap23S8BIeenG97 zU0v0qE`r0&^ISRdA$(bu3S|K(&K-w!0>~rtjyh>1QcqbPvOIuLmM@HeO|-MzKwn9G zcUs^!e36qbz#;>FMPfYiy1h{5crJ1!02%HDD2nG{Z2?eZuLR&&Bt+{eiKRls+Xahx zxd4)~{ro?ZpqOtkH{cI$NB{{S0VIF~kN^@u0!RP}AOR$R1RiGsS74CTDB=;Pf?9*IFCw&9_-a-!O9au}L`o-E`{R zr9Lo$WBKw7&&}|1z9hnIj+^hW#LApJD1*52j8MvprJ^9YMdTRdm00Odfk9LBp`nEK z3~130h@>j!i$b|va+kFj*wdF-$rE7D$*2^1MulA$37 z%c3wNmhxO#mL%6(_U!RUtjsa6=RiCQS0D|!3=_GbhU}48+%sTMGpgb2-PJuz!P|w} z36!ZY!zkusSp=V93zz7%u`!i+1io_ZQgF77Yo+qdfL8~4;+ zzp@%Y$gQb^x&B7zGGEW?gLD037XJjrf36fOu zwNt;u${aaBgP{9`5lf-utL?TyuEfe5J}`qyq&I-eVnr!P$Rn{b%z+ui6K_;52_pRC zcxjrGrb!(FLLSM@Op2P@*&DFw6#MRTeif2DBY_i?q(U&aUdeJgMV*OKZtxxch+m@! zHLL)gmsBkKdUt^5kt|Q_N~2WD%RDDS@8Sah8ePfxar;80J*vIExuJCG8;QWtC31AB z!~w?PlI7GcEQ3r5`9e_^2TPwhMI(A7%gJ470hFWX4>a5XjbWN?@%8f=|?1shj zi-RtYFSC4+go7Ncr3X*Dm*nekYeA(SVfDt?pnP4^!RmqTzTI90B2*>Oh2WJGgmOU^ zA^c5NXlRSeaI3(Xej465H`FEz5U0*aPz9ZRBL(i|wfDjDt=_QcvP(qZSzZLz zq?46-h&2ZeD%&bF%Xy(tk_U@4xW>8?ODKa$?fs<`HK=@@yhY<>_8xhS z#`7fLv}1}pVU93?z{#@L8TL84l1rr&^+L~N+bwJ=+Im+V4=97af-8Xchu3oq+JLRh zE3vK@A>w|8MBMvVPsr5XeHPvxQjd(RMaVxnM292pvoG<^ulx3&bPCRK|L<|4e$kgV z0j3gWI4)l-7s2`ToeC*kzr@NEpmeA9w{#to7J~*s3*hq*4RW684aXpl#A0MH$c_y5 z4|b2yQrIGxt%F5SOJ!f11Vr{co+GhdkiepA1kwIYAA$q5*MU`7QazpR`JS0Ix41Y~ zfF4AIQBoepVv=u8F(9!Hi(uvS{#t1mJ(HG0CPCdQl#4}(@&=V|gyOm&RJ)AMaE+SkCSwp6piZJ%|)*XNb*0>Uj zc^Ry+M=wEZ_C9)nUd8TpF9$3F2Mrb#N+npg$yZp=!d!`!ehDo4FtvH;WtKo~CUGt_ z_o6JzgTBqV0OOHZnI8jt4rG!E41zEcIuf}Un7a2$EGD=AMb>xGfg*$GLxiDCK@ef6 z?JF{`#LApLFhs=}Xx6+ez&pl52DuW8nfhQvAJpiFwX+~1n8}x6{42^N`X5Z9z-2s- z#7ch}Ec!6DI{NBi_?iQxDhPQ&E|r6m&t8d@KJ|h2Kr7zM#mrzUv*&?CsU(uyzI}W= z5^MZLu;-)qiX>hYV3v~igu>3WsaIlUUI1$jrp?PUqLddQbSMr+kB$@aNUZV6gTcei zh#Z;7l7wJkc_h~O^9N-ORAqQ~LFm#COo_M>692Q*FH=l2^M{#A`k$uNG&}M86KBVN zW&Bv`Kcs#>`Tvs5Lw|H=KJlxG7svi&?C+0FjQ+&PUydm8Z^s|Ri*WtFMt_@r1r&VL zo5kGh*Q$>=D3R6vTtfgr}p0e_lNtwKnZ5Z zVCVr?@?f$Fs#o6=*fx13){*NGHtpA)7RzCq$XG~%8RbC-*SE=)y!KX#V&Fj)61mrd z8epsd*FE5_7r4&g&y`1FF>fAN*>fFaUL4V8T%Y|aGJQ(pix;&DLs{>uPHg8X#ip0aDCZ_ZJ%@3+`R*A0il zoeS{)g<#P`S6R$MBwU93e*DGdkyztbz?6PP@|of~kiA%QF>DR#CwU%jUI3gIyj49E? zkyy<9!CAzU>yk25?7`)qUa5H`7W4YSSp+kI1Q+4yV9z~KP@nx0>xnraV_#i&M|b-*j;i0O zUkPLli~@fH11Y$}!Jjp+#5!^gjG88w7x&*N(LcPialnuht`HKf&rBTH=hQGdnB`!6m_(x z=+;JKaFMl_Cd?$mO<^#>Q+6NL4ohZVBTAg{23QlJ1O{+|05f}GC9cGJ^2dR*xMT0U z>scAN-)*yhx%65P5Ko3M5=_p(6?@MR28!P!v7UYv%(8F9+rKKgUI(*oH(=;PMh~lD z!$i2G&%?F;V9D__uEaY0Sukv$d+njuabb=c=8ecJ`+Nflo0TiE4u8frY2TX)6ydv3 zSGy&c!Y;s+aiI8M!niLX@&DMw-y!k;?`P)H-%Ou`AGjd_B!C2v01`j~NB{{S0VIF~ z4v2ttNP#dZa)REu$!9N9;=u`exCxVohxs7r_J{v4+3As3nJ<7T{(CdsYkamb>C`T) zA@Mo6UO=K+|Gk-zEIdV4$cu0}#Xl|Omsn3!!65&%lxt9bmOh=@^+Z6=DF1AWoit36 zi1tl}-XPL1v6#<;Q3o>{4HvHg6Wo9R56TBD@<^* Date: Mon, 21 Apr 2014 16:27:14 +0200 Subject: [PATCH 189/938] Fixing implementation --- tutor/app/views/courses/show.html.erb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tutor/app/views/courses/show.html.erb b/tutor/app/views/courses/show.html.erb index a21e50f3..e2d252ba 100644 --- a/tutor/app/views/courses/show.html.erb +++ b/tutor/app/views/courses/show.html.erb @@ -3,24 +3,24 @@

    Code: - <%=@course.code%> -

    + <%= @course.code%> +

    Year: <%= @course.year%> -

    +

    Semester: <%= @course.semester%> -

    +

    Description: <%= @course.description%> -

    +

    - <%= link_to "View Discussion Board", {:controller => 'discussion_boards', :action => 'show', :id => @course.id }, class: "btn btn-success", method: :get, style: "text-decoration:none" %> + <%= link_to "View Discussion Board", { :controller => 'discussion_boards', :action => 'show', :id => @course.id }, class: "btn btn-success", method: :get, style: "text-decoration:none" %>
    @@ -36,10 +36,10 @@
      <% t.tracks.each do |tt|%> - <% color = "label label-default" %> + <% color = "label label-default" %>
    • - <%= link_to tt.title , tt , class: color %> + <%= link_to tt.title , tt , class: color %>
      • <% end %>
    From 0f878f2a5c0cbdef44b5e7fa6d27f658155a9846 Mon Sep 17 00:00:00 2001 From: Khaled Date: Mon, 21 Apr 2014 16:31:04 +0200 Subject: [PATCH 190/938] Issue #193 Added method for getting variables --- tutor/app/models/debugger.rb | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/tutor/app/models/debugger.rb b/tutor/app/models/debugger.rb index 4c048a77..0501feba 100644 --- a/tutor/app/models/debugger.rb +++ b/tutor/app/models/debugger.rb @@ -1,3 +1,4 @@ +require "open3" class Debugger < ActiveRecord::Base #Validations @@ -8,4 +9,27 @@ class Debugger < ActiveRecord::Base #Methods -end + def get_variables + method_arguments = [] + local_variables = [] + instance_variables = [] + flag = 0 + input "locals" + output_buffer = bufferUntilComplete + output_buffer.each_line do |line| + if line == "Method arguments:" + flag = 1 + next + else + flag = 2 + next + end + variable_value = get_value line + if flag == 1 + method_arguments << variable_value + else + local_variables << variable_value + end + end + +end \ No newline at end of file From 448d944eb35b970f1122916a1c278eff7b342d27 Mon Sep 17 00:00:00 2001 From: metawaa Date: Mon, 21 Apr 2014 16:31:12 +0200 Subject: [PATCH 191/938] Fixing implementation 2 --- tutor/app/views/courses/show.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tutor/app/views/courses/show.html.erb b/tutor/app/views/courses/show.html.erb index e2d252ba..baf5afb5 100644 --- a/tutor/app/views/courses/show.html.erb +++ b/tutor/app/views/courses/show.html.erb @@ -2,11 +2,11 @@

    - Code: + Code: <%= @course.code%>

    - Year: + Year: <%= @course.year%>

    From 541d808308b330d40dc35f45c766c868eb7d0923 Mon Sep 17 00:00:00 2001 From: Ahmed Atef Date: Mon, 21 Apr 2014 16:31:36 +0200 Subject: [PATCH 192/938] Added update method and show method and edit method in Posts controller --- tutor/app/controllers/posts_controller.rb | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/tutor/app/controllers/posts_controller.rb b/tutor/app/controllers/posts_controller.rb index 42cc7ef6..234d28ea 100644 --- a/tutor/app/controllers/posts_controller.rb +++ b/tutor/app/controllers/posts_controller.rb @@ -13,6 +13,15 @@ def new @new_post = Post.new end + def show + @post = Post.find(params[:id]) + @replies = @post.replies.order("created_at desc") + end + + def edit + @post = Post.find(params[:id]) + end + # [Add Post - Story 1.13] # Description: This action takes the passed parameters from # the add post form, creates a new Post record @@ -49,6 +58,19 @@ def create end end + def update + @post = Post.find(params[:id]) + if @post.update_attributes(post_params) + flash[:notice] = "Post successfully updated" + redirect_to(:action => 'show' ,:id => @post.id) + else + if @new_post.errors.any? + flash[:notice] = @new_post.errors.full_messages.first + end + render :action => 'edit' + end + end + # [Add Post - story 1.13] # private method. Controls the post form parameters that can be accessed. # Parameters: From 4ddc0dd51cf8aa30f77f99dd92e559a7c6225204 Mon Sep 17 00:00:00 2001 From: Khaled Date: Mon, 21 Apr 2014 16:32:41 +0200 Subject: [PATCH 193/938] Issue #193 Followed conventions --- tutor/app/models/debugger.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tutor/app/models/debugger.rb b/tutor/app/models/debugger.rb index 0501feba..2f52c438 100644 --- a/tutor/app/models/debugger.rb +++ b/tutor/app/models/debugger.rb @@ -15,7 +15,7 @@ def get_variables instance_variables = [] flag = 0 input "locals" - output_buffer = bufferUntilComplete + output_buffer = buffer_until_complete output_buffer.each_line do |line| if line == "Method arguments:" flag = 1 From 100bddec1edb0662723c23cf48620ec8326a821f Mon Sep 17 00:00:00 2001 From: Ahmed Atef Date: Mon, 21 Apr 2014 16:35:01 +0200 Subject: [PATCH 194/938] changed the view of the discussion board to have title as a link to the post --- tutor/app/views/discussion_boards/show.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tutor/app/views/discussion_boards/show.html.erb b/tutor/app/views/discussion_boards/show.html.erb index d3a5f9e0..5a63b80e 100644 --- a/tutor/app/views/discussion_boards/show.html.erb +++ b/tutor/app/views/discussion_boards/show.html.erb @@ -5,8 +5,8 @@ <% unless @posts.blank? %> <% @posts.each do |post| %>

    -

    <%= post.owner.name %>

    - <%= post.content %>
    + <%= link_to post.title, :controller => 'posts', :action => 'show', :id => post.id, + :method => :get, class: "btn btn-success" %> <%= post.views_count %>

    From 4989230b4a5ef9e31212ee2420204c6ed2906dca Mon Sep 17 00:00:00 2001 From: Ahmed Atef Date: Mon, 21 Apr 2014 16:36:11 +0200 Subject: [PATCH 195/938] added edit html page in the views of the Post and added a show view for the post --- tutor/app/views/posts/create.html.erb | 0 tutor/app/views/posts/edit.html.erb | 27 ++++++++++++++++++++++++++ tutor/app/views/posts/show.html.erb | 28 +++++++++++++++++++++++++++ 3 files changed, 55 insertions(+) create mode 100644 tutor/app/views/posts/create.html.erb create mode 100644 tutor/app/views/posts/edit.html.erb create mode 100644 tutor/app/views/posts/show.html.erb diff --git a/tutor/app/views/posts/create.html.erb b/tutor/app/views/posts/create.html.erb new file mode 100644 index 00000000..e69de29b diff --git a/tutor/app/views/posts/edit.html.erb b/tutor/app/views/posts/edit.html.erb new file mode 100644 index 00000000..5f646fbe --- /dev/null +++ b/tutor/app/views/posts/edit.html.erb @@ -0,0 +1,27 @@ + + +
    +

    Edit Post

    +
    + <% if flash[:notice] -%> +
    <%= flash[:notice] %>
    + <% end %> +


    + <%= form_for :post, url: {action: "update", :id => @post.id} do |f| %> +

    + <%= f.label "Title" %>
    + <%= f.text_field :title, autofocus: true, class:"form-control", style: "width:300px", placeholder: "Title"%> +

    +

    + <%= f.label :content %>
    + <%= f.text_area :content, class:"form-control", style: "margin-left:auto; + margin-right:auto;height:200px;width:500px;resize:none", placeholder: "Enter your post"%> + <%= f.hidden_field :discussion_board_id, value: params[:discussion_board_id] %> +

    +

    + <%= f.submit "Update Post", class: "btn btn-success"%> +

    + <% end %> +
    \ No newline at end of file diff --git a/tutor/app/views/posts/show.html.erb b/tutor/app/views/posts/show.html.erb new file mode 100644 index 00000000..0f46c1c5 --- /dev/null +++ b/tutor/app/views/posts/show.html.erb @@ -0,0 +1,28 @@ +
    + <% if current_lecturer %> + <% @userID = current_lecturer.id %> + <% end %> + <% if current_student %> + <% @userID = current_student.id %> + <% end %> + <%if current_teaching_assistant %> + <% @userID = current_teaching_assistant.id %> + <%end%> +
    +

    <%=@post.title%>

    + <% unless @replies.blank? %> + <% @replies.each do |reply| %> +
    + <%= reply.content %>
    +
    +
    + <% end %> + <% else %> + No Replies in this post yet . + <% end %> +
    + <% if @post.owner_id == @userID %> + <%= button_to "Edit Post", {:action => 'edit', :controller => 'posts'}, { + class: 'btn btn-primary',:id => @post.id} %> +<% end %> +
    \ No newline at end of file From 29264d6e1db7751a2900b71b62552df8ad4c44ca Mon Sep 17 00:00:00 2001 From: Ahmed Atef Date: Mon, 21 Apr 2014 16:38:43 +0200 Subject: [PATCH 196/938] modified the view of the discussion board --- tutor/app/views/discussion_boards/show.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tutor/app/views/discussion_boards/show.html.erb b/tutor/app/views/discussion_boards/show.html.erb index d3a5f9e0..5a63b80e 100644 --- a/tutor/app/views/discussion_boards/show.html.erb +++ b/tutor/app/views/discussion_boards/show.html.erb @@ -5,8 +5,8 @@ <% unless @posts.blank? %> <% @posts.each do |post| %>
    -

    <%= post.owner.name %>

    - <%= post.content %>
    + <%= link_to post.title, :controller => 'posts', :action => 'show', :id => post.id, + :method => :get, class: "btn btn-success" %> <%= post.views_count %>

    From 8fe5dafbb44a7797366a5c7d5d55ee0450dfcff7 Mon Sep 17 00:00:00 2001 From: Ahmed Atef Date: Mon, 21 Apr 2014 16:42:12 +0200 Subject: [PATCH 197/938] added create file in the view of the post --- tutor/app/views/posts/create.html.erb | 0 tutor/db/development.sqlite3 | Bin 208896 -> 208896 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 tutor/app/views/posts/create.html.erb diff --git a/tutor/app/views/posts/create.html.erb b/tutor/app/views/posts/create.html.erb new file mode 100644 index 00000000..e69de29b diff --git a/tutor/db/development.sqlite3 b/tutor/db/development.sqlite3 index 9dfcccb83f25a2e3d024825d9da799f72d80bf42..c75953487d4bed62d714c616ca08bb03d6ae7d5d 100644 GIT binary patch delta 263 zcmZp8z|-)6XM!}N&qNt#MxTud`TmT|%@_Q)U+`x%DPUvd*Ja?>-OhD@QJKHKF@Twe z!IGh|kb{#`*3q#fu_)CjwM4-!FinUa{NkPFn3n_rY@oLHiem;w|B8dw74fr6p2l`#VYL!u^wA_pg@tfQl2UZO&AUSe`~u|iUQl9Rua0thQA=AI=Hoz)lYG!F^4zwUalR=(?0cb%8E*o%IU~Xk%sb^?n SVPJ@E0g_DH1;%9;m=XXK9YMJO From d901c5d0cbdbe38f871ee3ead5f4879118d898ad Mon Sep 17 00:00:00 2001 From: Ahmed Atef Date: Mon, 21 Apr 2014 16:52:23 +0200 Subject: [PATCH 198/938] modified post controller to add show and added show view --- tutor/app/controllers/posts_controller.rb | 12 ++++++++++++ tutor/app/views/posts/show.html.erb | 0 tutor/db/development.sqlite3 | Bin 208896 -> 208896 bytes 3 files changed, 12 insertions(+) create mode 100644 tutor/app/views/posts/show.html.erb diff --git a/tutor/app/controllers/posts_controller.rb b/tutor/app/controllers/posts_controller.rb index 42cc7ef6..89250b92 100644 --- a/tutor/app/controllers/posts_controller.rb +++ b/tutor/app/controllers/posts_controller.rb @@ -13,6 +13,18 @@ def new @new_post = Post.new end + # [Add Post - Story 1.13] + # Description: Displays the post that the user chose + # Parameters: + # @post: The current post the user is in. + # @posts = The list of replies of @post + # Returns: The view of the post + # Author: Ahmed Atef + def show + @post = Post.find(params[:id]) + @replies = @post.replies.order("created_at desc") + end + # [Add Post - Story 1.13] # Description: This action takes the passed parameters from # the add post form, creates a new Post record diff --git a/tutor/app/views/posts/show.html.erb b/tutor/app/views/posts/show.html.erb new file mode 100644 index 00000000..e69de29b diff --git a/tutor/db/development.sqlite3 b/tutor/db/development.sqlite3 index c75953487d4bed62d714c616ca08bb03d6ae7d5d..a92923190baf31b9c3e10340f56b5e2332ac8862 100644 GIT binary patch delta 276 zcmZp8z|-)6XM!}N-$WT_M!$^-`TmS7%@_Q)U+`x%Dd1q@3u55c5ux60@)YK|oE+f5Muoj>d#rfHZMKKE5NvTDN3K>BA zQY#aAxs3HHf#NxdNebzSl_`mNIjPAdrA4VlMh1o^x&|h?MurN8CRQevR>nqpCYI(F ZCdSxgObty;jZNEi&oge<+tC?bAZu}kC#E5 z0SFu&1M-VYOeQndin5wo7+6?S$9CtC5R|i=k1O5p0rY zi9%+vLRo52r9wtxQHnxIzCw0tYJoy#o Date: Mon, 21 Apr 2014 16:53:58 +0200 Subject: [PATCH 199/938] Issue #221 ajax feature --- tutor/app/controllers/utilities_controller.rb | 8 +---- .../views/layouts/_signed_in_header.html.erb | 7 +++- .../views/utilities/_simple_search.html.erb | 32 +++++++++++++++++ .../views/utilities/simple_search.html.erb | 35 ++----------------- .../app/views/utilities/simple_search.js.erb | 2 ++ 5 files changed, 44 insertions(+), 40 deletions(-) create mode 100644 tutor/app/views/utilities/_simple_search.html.erb create mode 100644 tutor/app/views/utilities/simple_search.js.erb diff --git a/tutor/app/controllers/utilities_controller.rb b/tutor/app/controllers/utilities_controller.rb index 07ac6fdc..6b8fab96 100644 --- a/tutor/app/controllers/utilities_controller.rb +++ b/tutor/app/controllers/utilities_controller.rb @@ -7,17 +7,11 @@ class UtilitiesController < ApplicationController # Author: Ahmed Elassuty def simple_search @lecturers = Lecturer.search(params[:search]) - puts @lecturers.present? @students = Student.search(params[:search]) - puts "______________________________________" - puts @students.inspect @teaching_assisstants = TeachingAssistant.search(params[:search]) - puts @teaching_assisstants.present? - puts ">>>>>>>>>>>>>>>>>>>>>>>>>>" @courses = Course.search(params[:search]) - puts @courses.inspect - puts "_______________________________" respond_to do |format| + format.js #render 'simple_search.js.erb' format.html end end diff --git a/tutor/app/views/layouts/_signed_in_header.html.erb b/tutor/app/views/layouts/_signed_in_header.html.erb index a7403c11..0700ef83 100644 --- a/tutor/app/views/layouts/_signed_in_header.html.erb +++ b/tutor/app/views/layouts/_signed_in_header.html.erb @@ -4,7 +4,12 @@ # Author: Ahmed Elassuty -->
    - <%= form_tag utilities_simple_search_path , :method => 'get', class: "navbar-form navbar-left" do %> + + <%- remote = params[:controller].include?"utilities"%> + <%- puts params[:controller] %> + <%- puts remote %> + <%- puts ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>" %> + <%= form_tag utilities_simple_search_path , :method => 'get', remote: remote , class: "navbar-form navbar-left" do %>

    <%= text_field_tag :search, params[:search], class: "form-control", size: "30", placeholder: "Search for Users and Courses" %>

    diff --git a/tutor/app/views/utilities/_simple_search.html.erb b/tutor/app/views/utilities/_simple_search.html.erb new file mode 100644 index 00000000..4cebdc63 --- /dev/null +++ b/tutor/app/views/utilities/_simple_search.html.erb @@ -0,0 +1,32 @@ +
    +
    +
    + <% unless @lecturers.present? or @teaching_assisstants.present? or @courses.present? or @students.present?%> +
    +

    No Result match

    +
    + <% else %> + <% if @lecturers.present?%> +
    + <%= render "result_form" , objects: @lecturers %> +
    + <%end%> + <% if @students.present?%> +
    + <%= render "result_form" , objects: @students %> +
    + <%end%> + <% if @teaching_assisstants.present? %> +
    + <%= render "result_form" , objects: @teaching_assisstants %> +
    + <%end%> + <% if @courses.present? %> +
    + <%= render "result_form" , objects: @courses %> +
    + <%end%> + <% end %> +
    +
    +
    \ No newline at end of file diff --git a/tutor/app/views/utilities/simple_search.html.erb b/tutor/app/views/utilities/simple_search.html.erb index 78e9afc9..154afffb 100644 --- a/tutor/app/views/utilities/simple_search.html.erb +++ b/tutor/app/views/utilities/simple_search.html.erb @@ -1,35 +1,6 @@ -
    +

    Search Results :

    -
    -
    - <% unless @lecturers.present? or @teaching_assisstants.present? or @courses.present? or @students.present?%> -
    -

    No Result match

    -
    - <% else %> - <% if @lecturers.present?%> -
    - <%= render "result_form" , objects: @lecturers %> -
    - <%end%> - <% if @students.present?%> -
    - <%= render "result_form" , objects: @students %> -
    - <%end%> - <% if @teaching_assisstants.present? %> -
    - <%= render "result_form" , objects: @teaching_assisstants %> -
    - <%end%> - <% if @courses.present? %> -
    - <%= render "result_form" , objects: @courses %> -
    - <%end%> - <% end %> -
    -
    -
    \ No newline at end of file + <%= render 'simple_search'%> +
    \ No newline at end of file diff --git a/tutor/app/views/utilities/simple_search.js.erb b/tutor/app/views/utilities/simple_search.js.erb new file mode 100644 index 00000000..c6189956 --- /dev/null +++ b/tutor/app/views/utilities/simple_search.js.erb @@ -0,0 +1,2 @@ +$("#result_body").remove(); +$("#search_result").append("<%=escape_javascript( render partial: 'simple_search')%>"); \ No newline at end of file From 02a8ea55539aa362447fc41a24d8a87ac09610df Mon Sep 17 00:00:00 2001 From: Ahmed Atef Date: Mon, 21 Apr 2014 16:55:51 +0200 Subject: [PATCH 200/938] added a show post html view showing the post --- tutor/app/views/posts/show.html.erb | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/tutor/app/views/posts/show.html.erb b/tutor/app/views/posts/show.html.erb index e69de29b..ab9a3ff0 100644 --- a/tutor/app/views/posts/show.html.erb +++ b/tutor/app/views/posts/show.html.erb @@ -0,0 +1,15 @@ +
    +
    +

    <%=@post.title%>

    + <% unless @replies.blank? %> + <% @replies.each do |reply| %> +
    + <%= reply.content %>
    +
    +
    + <% end %> + <% else %> + No Replies in this post yet . + <% end %> +
    +
    \ No newline at end of file From 0470c265ba8bfc6dc9d9797185875e98ca1f9b4b Mon Sep 17 00:00:00 2001 From: Ahmed ELAssuty Date: Mon, 21 Apr 2014 17:07:04 +0200 Subject: [PATCH 201/938] Issue #221 clear code --- tutor/app/controllers/utilities_controller.rb | 2 +- tutor/app/views/layouts/_signed_in_header.html.erb | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/tutor/app/controllers/utilities_controller.rb b/tutor/app/controllers/utilities_controller.rb index 6b8fab96..0a95a442 100644 --- a/tutor/app/controllers/utilities_controller.rb +++ b/tutor/app/controllers/utilities_controller.rb @@ -11,7 +11,7 @@ def simple_search @teaching_assisstants = TeachingAssistant.search(params[:search]) @courses = Course.search(params[:search]) respond_to do |format| - format.js #render 'simple_search.js.erb' + format.js format.html end end diff --git a/tutor/app/views/layouts/_signed_in_header.html.erb b/tutor/app/views/layouts/_signed_in_header.html.erb index 0700ef83..e5bb0049 100644 --- a/tutor/app/views/layouts/_signed_in_header.html.erb +++ b/tutor/app/views/layouts/_signed_in_header.html.erb @@ -4,12 +4,8 @@ # Author: Ahmed Elassuty -->
    - <%- remote = params[:controller].include?"utilities"%> - <%- puts params[:controller] %> - <%- puts remote %> - <%- puts ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>" %> - <%= form_tag utilities_simple_search_path , :method => 'get', remote: remote , class: "navbar-form navbar-left" do %> + <%= form_tag utilities_simple_search_path, :method => 'get', remote: remote, class: "navbar-form navbar-left" do %>

    <%= text_field_tag :search, params[:search], class: "form-control", size: "30", placeholder: "Search for Users and Courses" %>

    From c5ae313f414538d7bd3f9c856a229e4f3b9c463c Mon Sep 17 00:00:00 2001 From: Khaled Date: Mon, 21 Apr 2014 17:13:39 +0200 Subject: [PATCH 202/938] Issue #193 Added method for getting values of objects --- tutor/app/models/debugger.rb | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/tutor/app/models/debugger.rb b/tutor/app/models/debugger.rb index 2f52c438..7f967c89 100644 --- a/tutor/app/models/debugger.rb +++ b/tutor/app/models/debugger.rb @@ -12,7 +12,7 @@ class Debugger < ActiveRecord::Base def get_variables method_arguments = [] local_variables = [] - instance_variables = [] + instance_variables = get_instance_variables flag = 0 input "locals" output_buffer = buffer_until_complete @@ -26,10 +26,27 @@ def get_variables end variable_value = get_value line if flag == 1 - method_arguments << variable_value + method_arguments = method_arguments + variable_value else - local_variables << variable_value + local_variables = local_variables + variable_value end + return method_arguments + local_variables + instance_variables + end + + def get_value variable + result = [] + if variable.match("instance") + variable_name = get_name variable + input "dump " + variable_name + output_buffer = buffer_until_complete + result << variable + input "print " + variable_name + output_buffer = buffer_until_complete + result << variable + else + result << variable + end + return result end end \ No newline at end of file From 9a242b996d73e3150d807b1f25d01baa6af04fd1 Mon Sep 17 00:00:00 2001 From: Khaled Date: Mon, 21 Apr 2014 17:17:15 +0200 Subject: [PATCH 203/938] Issue #193 Added method for extracting name of variable --- tutor/app/models/debugger.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tutor/app/models/debugger.rb b/tutor/app/models/debugger.rb index 7f967c89..cbde1612 100644 --- a/tutor/app/models/debugger.rb +++ b/tutor/app/models/debugger.rb @@ -49,4 +49,9 @@ def get_value variable return result end + def get_name variable + name = variable.split(" = ").first + return name + end + end \ No newline at end of file From 01754af8ca45b83a6cb3ce5660926c104cf6a13c Mon Sep 17 00:00:00 2001 From: Ahmed ELAssuty Date: Mon, 21 Apr 2014 17:23:53 +0200 Subject: [PATCH 204/938] Issue #221 clear code and fix design --- tutor/app/helpers/application_helper.rb | 9 +++++++++ tutor/app/views/layouts/_signed_in_header.html.erb | 4 ++-- tutor/app/views/utilities/simple_search.html.erb | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/tutor/app/helpers/application_helper.rb b/tutor/app/helpers/application_helper.rb index de6be794..5c9fc9a0 100644 --- a/tutor/app/helpers/application_helper.rb +++ b/tutor/app/helpers/application_helper.rb @@ -1,2 +1,11 @@ module ApplicationHelper + + # [Simple Search - Story 1.22] + # helper to handle ajax search + # Parameters: string controller + # Returns: boolean if the requested controller equals the passed one + # Author: Ahmed Elassuty + def controller?(controller) + params[:controller].include?controller + end end diff --git a/tutor/app/views/layouts/_signed_in_header.html.erb b/tutor/app/views/layouts/_signed_in_header.html.erb index e5bb0049..75842880 100644 --- a/tutor/app/views/layouts/_signed_in_header.html.erb +++ b/tutor/app/views/layouts/_signed_in_header.html.erb @@ -4,8 +4,8 @@ # Author: Ahmed Elassuty -->
    - <%- remote = params[:controller].include?"utilities"%> - <%= form_tag utilities_simple_search_path, :method => 'get', remote: remote, class: "navbar-form navbar-left" do %> + <%= form_tag utilities_simple_search_path, :method => 'get', + remote: controller?("utilities"), class: "navbar-form navbar-left" do %>

    <%= text_field_tag :search, params[:search], class: "form-control", size: "30", placeholder: "Search for Users and Courses" %>

    diff --git a/tutor/app/views/utilities/simple_search.html.erb b/tutor/app/views/utilities/simple_search.html.erb index 154afffb..8de4fb67 100644 --- a/tutor/app/views/utilities/simple_search.html.erb +++ b/tutor/app/views/utilities/simple_search.html.erb @@ -3,4 +3,4 @@

    Search Results :

    <%= render 'simple_search'%> -
    \ No newline at end of file +
    \ No newline at end of file From cbffc6f255839ac205251573352e7433bac1961c Mon Sep 17 00:00:00 2001 From: Mohamed Saeed Date: Mon, 21 Apr 2014 17:34:37 +0200 Subject: [PATCH 205/938] adding validate method params --- tutor/.gitignore | 4 ++++ tutor/app/controllers/solutions_controller.rb | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/tutor/.gitignore b/tutor/.gitignore index 4ea75899..7e2d3651 100644 --- a/tutor/.gitignore +++ b/tutor/.gitignore @@ -37,3 +37,7 @@ Gemfile.lock, .ruby-version, .ruby-gemset # Ignoring generated model diagram models.svg + +# Ignoring Java files and class files +*.java +*.class diff --git a/tutor/app/controllers/solutions_controller.rb b/tutor/app/controllers/solutions_controller.rb index fcdc0705..7726b3d8 100644 --- a/tutor/app/controllers/solutions_controller.rb +++ b/tutor/app/controllers/solutions_controller.rb @@ -13,12 +13,12 @@ def create @solution.status = 0 @solution.length = @solution.code.length testcases = @solution.problem.test_cases - file = "st[" + current_student.id + "]pr[" + @solution.problem_id + "]so[" + file = "st[" + current_student.id.to_s + "]pr[" + @solution.problem_id.to_s + "]so[" #+ Solution_id response_message = Solution.validate(@solution.code , testcases , file) @solution.status = response_message[:status] - @errors = response_message[:failure] - @success = response_message[:success] + errors = response_message[:failure] + success = response_message[:success] respond_to do |format| format.html { redirect_to :back } format.js { render 'alert.js.erb' } From d42d412d50043561b9f4005e570cfc07707a658c Mon Sep 17 00:00:00 2001 From: Ahmed Moataz Date: Mon, 21 Apr 2014 17:35:05 +0200 Subject: [PATCH 206/938] Cleaning code --- tutor/.gitignore | 4 +++ tutor/app/controllers/compilers_controller.rb | 5 ---- tutor/app/controllers/solutions_controller.rb | 10 ++----- tutor/app/models/compiler.rb | 28 +++++++------------ tutor/app/views/compilers/test.html.erb | 6 ---- tutor/app/views/solutions/_new.html.erb | 6 ++-- 6 files changed, 19 insertions(+), 40 deletions(-) delete mode 100644 tutor/app/views/compilers/test.html.erb diff --git a/tutor/.gitignore b/tutor/.gitignore index 4ea75899..7e2d3651 100644 --- a/tutor/.gitignore +++ b/tutor/.gitignore @@ -37,3 +37,7 @@ Gemfile.lock, .ruby-version, .ruby-gemset # Ignoring generated model diagram models.svg + +# Ignoring Java files and class files +*.java +*.class diff --git a/tutor/app/controllers/compilers_controller.rb b/tutor/app/controllers/compilers_controller.rb index d60c9601..a0605fef 100644 --- a/tutor/app/controllers/compilers_controller.rb +++ b/tutor/app/controllers/compilers_controller.rb @@ -1,7 +1,2 @@ class CompilersController < ApplicationController - - def test - compiler = Compiler.last - @res = compiler.compile_test - end end diff --git a/tutor/app/controllers/solutions_controller.rb b/tutor/app/controllers/solutions_controller.rb index 6d5b7a2b..87f89b41 100644 --- a/tutor/app/controllers/solutions_controller.rb +++ b/tutor/app/controllers/solutions_controller.rb @@ -23,8 +23,6 @@ def create elsif params[:commit] == 'Compile' compile_solution end - - end # Author: Ahmed Moataz @@ -45,15 +43,13 @@ def compile_solution @solution.status = 2 flash[:compiler_fail] = "Compilation Failed!" flash[:compiler_feedback] = compiler_feedback[:errors] - end - #flash[:compiler_notice] = "Compiled! -->" + params.to_s + " -//- " + solution_params.to_s - #flash[:compiler_feedback] = Compiler.compiler_feedback("10", "12", solution_params[:code])[:errors] + end redirect_to :back else flash[:alert] = "You did not write any code!" redirect_to :back - end - end + end + end diff --git a/tutor/app/models/compiler.rb b/tutor/app/models/compiler.rb index 9e499092..1805b7d3 100644 --- a/tutor/app/models/compiler.rb +++ b/tutor/app/models/compiler.rb @@ -1,16 +1,15 @@ class Compiler < ActiveRecord::Base - + #Validations - + #Relations - + #Scoops - + #Methods # Author: Ahmed Moataz def self.compile(student_id, problem_id, solution_id, code) - #file name needs a third parameter to make it unique file_name = 'st' + student_id.to_s + 'pr' + problem_id.to_s + 'so' + solution_id.to_s + '.java' File.open(file_name, 'w') { |file| file.write(code) } return %x[ #{'javac -g ' + file_name + ' 2>&1'} ] @@ -25,13 +24,7 @@ def self.compiler_feedback(student_id, problem_id, solution_id, code) else new_feedback = change_error_headers(student_id, problem_id, solution_id, feedback) return { success: false, errors: new_feedback } - end - end - - # Author: Ahmed Moataz - def self.compile_test - var = %x[ #{'javac -g ' + 'rubyJava2.java' + ' 2>&1'} ] - # return var + " \n " + "________" + end end # Author: Ahmed Moataz @@ -40,15 +33,14 @@ def self.change_class_name(student_id, problem_id, solution_id, code) if code.include? 'public' && 'class' && '{' return code.sub(code[0..code.index('{')], 'public class ' + name + ' {') else - return code - end - end + return code + end + end # Author: Ahmed Moataz def self.change_error_headers(student_id, problem_id, solution_id, feedback) header = 'st' + student_id.to_s + 'pr' + problem_id.to_s + 'so' + solution_id.to_s return feedback.gsub(header, 'CoolSoft') - end - - + end + end \ No newline at end of file diff --git a/tutor/app/views/compilers/test.html.erb b/tutor/app/views/compilers/test.html.erb deleted file mode 100644 index 9a33a6d5..00000000 --- a/tutor/app/views/compilers/test.html.erb +++ /dev/null @@ -1,6 +0,0 @@ -

    Hi!

    -
    <%= `javac rubyJava2.java 2>&1` %>
    -
    <%= `java rubyJava2 2>&1` %>
    -
    <%= "rubyJava.java:3: ';' expected\n\t\tSystem.out.println(\"CoolSoft!\")\n\t\t                               ^\n1 error\n"%>
    -

    this

    -
    <%= @res %>
    diff --git a/tutor/app/views/solutions/_new.html.erb b/tutor/app/views/solutions/_new.html.erb index e182d7d7..54762e75 100644 --- a/tutor/app/views/solutions/_new.html.erb +++ b/tutor/app/views/solutions/_new.html.erb @@ -33,15 +33,13 @@



    -

    <%= flash[:compiler_notice] %>

    + Console:
    -
    +

    <%= flash[:compiler_success] %>

    <%= flash[:compiler_fail] %>

    <%= flash[:compiler_feedback] %>

    - <% end %> \ No newline at end of file From e0fe03dff8eb3c9f4f8c1419eef6b995f0e3ccf5 Mon Sep 17 00:00:00 2001 From: Ahmed Moataz Date: Mon, 21 Apr 2014 17:41:41 +0200 Subject: [PATCH 207/938] More cleaning --- tutor/app/controllers/solutions_controller.rb | 1 - tutor/app/views/solutions/_new.html.erb | 1 - tutor/config/routes.rb | 1 - 3 files changed, 3 deletions(-) diff --git a/tutor/app/controllers/solutions_controller.rb b/tutor/app/controllers/solutions_controller.rb index 87f89b41..abf04401 100644 --- a/tutor/app/controllers/solutions_controller.rb +++ b/tutor/app/controllers/solutions_controller.rb @@ -12,7 +12,6 @@ def create @solution.student_id = current_student.id @solution.status = 0 @solution.length = @solution.code.length - if @solution.save flash[:success] = "Your Solution has been submitted successfully" redirect_to :back diff --git a/tutor/app/views/solutions/_new.html.erb b/tutor/app/views/solutions/_new.html.erb index 54762e75..52311b75 100644 --- a/tutor/app/views/solutions/_new.html.erb +++ b/tutor/app/views/solutions/_new.html.erb @@ -5,7 +5,6 @@ Time spent: 0:00 -<%= @solution_id.to_s %> <%= form_for :solution, :url => { :controller => "solutions", :action => "create" }, :html => {:method => :post} do |f| %> diff --git a/tutor/config/routes.rb b/tutor/config/routes.rb index c493914a..491e12d0 100644 --- a/tutor/config/routes.rb +++ b/tutor/config/routes.rb @@ -13,7 +13,6 @@ post 'solutions/compile_solution' => 'problems#show' post 'courses/new' => 'courses#new' get 'courses/sign_up' - get 'compilers/test' # You can have the root of your site routed with "root" root 'site#index' From bacb82da863dec1497b9bb9d4243c107669050ce Mon Sep 17 00:00:00 2001 From: Ahmed ELAssuty Date: Mon, 21 Apr 2014 17:54:40 +0200 Subject: [PATCH 208/938] Issue #221 clear models --- tutor/app/controllers/utilities_controller.rb | 3 +++ tutor/app/helpers/application_helper.rb | 8 ++++---- tutor/app/models/concerns/searchable.rb | 17 +++++++++++++++++ tutor/app/models/lecturer.rb | 13 ++++--------- tutor/app/models/student.rb | 14 ++++---------- tutor/app/models/teaching_assistant.rb | 12 +++--------- 6 files changed, 35 insertions(+), 32 deletions(-) create mode 100644 tutor/app/models/concerns/searchable.rb diff --git a/tutor/app/controllers/utilities_controller.rb b/tutor/app/controllers/utilities_controller.rb index 0a95a442..4e01adc0 100644 --- a/tutor/app/controllers/utilities_controller.rb +++ b/tutor/app/controllers/utilities_controller.rb @@ -15,4 +15,7 @@ def simple_search format.html end end + + def advanced_search + end end diff --git a/tutor/app/helpers/application_helper.rb b/tutor/app/helpers/application_helper.rb index 5c9fc9a0..f208731f 100644 --- a/tutor/app/helpers/application_helper.rb +++ b/tutor/app/helpers/application_helper.rb @@ -2,10 +2,10 @@ module ApplicationHelper # [Simple Search - Story 1.22] # helper to handle ajax search - # Parameters: string controller - # Returns: boolean if the requested controller equals the passed one + # Parameters: string controller, string action + # Returns: boolean if the requested controller equals the passed one and also the action # Author: Ahmed Elassuty - def controller?(controller) - params[:controller].include?controller + def controller?(controller,action) + params[:controller].include?controller and params[:action].include?action end end diff --git a/tutor/app/models/concerns/searchable.rb b/tutor/app/models/concerns/searchable.rb new file mode 100644 index 00000000..40974cdf --- /dev/null +++ b/tutor/app/models/concerns/searchable.rb @@ -0,0 +1,17 @@ +module Searchable + extend ActiveSupport::Concern + + # [Simple Search - Story 1.22] + # search for users + # Parameters: keyword + # Returns: A hash with search results according to the keyword + # Author: Ahmed Elassuty + + #class Methods + module ClassMethods + def search(keyword) + self.where("name LIKE ? or email LIKE ?", "%#{keyword}%" , "%#{keyword}%") if keyword.present? + end + end + +end \ No newline at end of file diff --git a/tutor/app/models/lecturer.rb b/tutor/app/models/lecturer.rb index cbe49618..66fcd372 100644 --- a/tutor/app/models/lecturer.rb +++ b/tutor/app/models/lecturer.rb @@ -2,7 +2,10 @@ class Lecturer < ActiveRecord::Base # Include default devise modules. Others available are: # :confirmable, :lockable, :timeoutable and :omniauthable devise :database_authenticatable, :registerable, - :recoverable, :rememberable, :trackable, :validatable + :recoverable, :rememberable, :trackable, :validatable + + #concerns + include Searchable #Validations @@ -27,12 +30,4 @@ class Lecturer < ActiveRecord::Base #Methods - # [Simple Search - Story 1.22] - # search for users - # Parameters: keyword - # Returns: A hash with search results according to the keyword - # Author: Ahmed Elassuty - def self.search(keyword) - where("name LIKE ? or email LIKE ?", "%#{keyword}%" , "%#{keyword}%") if keyword.present? - end end diff --git a/tutor/app/models/student.rb b/tutor/app/models/student.rb index 44dac300..f6aa5e2d 100644 --- a/tutor/app/models/student.rb +++ b/tutor/app/models/student.rb @@ -3,7 +3,10 @@ class Student < ActiveRecord::Base # :confirmable, :lockable, :timeoutable and :omniauthable devise :database_authenticatable, :registerable, :recoverable, :rememberable, :trackable, :validatable - + + #concerns + include Searchable + #Validations #Relations @@ -75,14 +78,5 @@ def getProblemsStatus end return res end - - # [Simple Search - Story 1.22] - # search for users - # Parameters: keyword - # Returns: A hash with search results according to the keyword - # Author: Ahmed Elassuty - def self.search(keyword) - where("name LIKE ? or email LIKE ?", "%#{keyword}%" , "%#{keyword}%") if keyword.present? - end end diff --git a/tutor/app/models/teaching_assistant.rb b/tutor/app/models/teaching_assistant.rb index 2d651bb0..7201c082 100644 --- a/tutor/app/models/teaching_assistant.rb +++ b/tutor/app/models/teaching_assistant.rb @@ -4,6 +4,9 @@ class TeachingAssistant < ActiveRecord::Base devise :database_authenticatable, :registerable, :recoverable, :rememberable, :trackable, :validatable + #concerns + include Searchable + #Validations #Relations @@ -24,13 +27,4 @@ class TeachingAssistant < ActiveRecord::Base #Scoops #Methods - - # [Simple Search - Story 1.22] - # search for users - # Parameters: keyword - # Returns: A hash with search results according to the keyword - # Author: Ahmed Elassuty - def self.search(keyword) - where("name LIKE ? or email LIKE ?", "%#{keyword}%" , "%#{keyword}%") if keyword.present? - end end From 231e8b3f208129a67f5e08712f8b41c6c78ce6ed Mon Sep 17 00:00:00 2001 From: Khaled Date: Mon, 21 Apr 2014 18:04:18 +0200 Subject: [PATCH 209/938] Issue #193 Fixed bugs --- tutor/app/models/debugger.rb | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/tutor/app/models/debugger.rb b/tutor/app/models/debugger.rb index cbde1612..81763f47 100644 --- a/tutor/app/models/debugger.rb +++ b/tutor/app/models/debugger.rb @@ -9,6 +9,10 @@ class Debugger < ActiveRecord::Base #Methods + def input input + $input.puts input + end + def get_variables method_arguments = [] local_variables = [] @@ -20,29 +24,36 @@ def get_variables if line == "Method arguments:" flag = 1 next - else + elsif line == "Local variables:" flag = 2 next end - variable_value = get_value line - if flag == 1 - method_arguments = method_arguments + variable_value - else - local_variables = local_variables + variable_value + if flag != 0 + variable_value = get_value line + if flag == 1 + method_arguments = method_arguments + variable_value + else + local_variables = local_variables + variable_value + end end return method_arguments + local_variables + instance_variables end + def get_instance_variables + input "dump this" + end + def get_value variable result = [] if variable.match("instance") variable_name = get_name variable input "dump " + variable_name - output_buffer = buffer_until_complete - result << variable + output_buffer1 = buffer_until_complete input "print " + variable_name - output_buffer = buffer_until_complete - result << variable + output_buffer2 = buffer_until_complete + result << output_buffer1 + if output_buffer1 != output_buffer2 + result << output_buffer2 else result << variable end From 7c13b3c2eb9cf740b9dc622d9c4e63608fecc849 Mon Sep 17 00:00:00 2001 From: Ahmed Moataz Date: Mon, 21 Apr 2014 18:11:11 +0200 Subject: [PATCH 210/938] Even more cleaning --- tutor/app/controllers/solutions_controller.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/tutor/app/controllers/solutions_controller.rb b/tutor/app/controllers/solutions_controller.rb index abf04401..eccde5d4 100644 --- a/tutor/app/controllers/solutions_controller.rb +++ b/tutor/app/controllers/solutions_controller.rb @@ -50,8 +50,6 @@ def compile_solution end end - - # [Code Editor: Write Code - Story 3.3] # Fills the ID of the problem , code from the form_for # Parameters: From 27392dc28eee8c07cbd4ab0bdea11c90513808e9 Mon Sep 17 00:00:00 2001 From: Ahmed Moataz Date: Mon, 21 Apr 2014 18:13:36 +0200 Subject: [PATCH 211/938] Even more cleaning 2 --- tutor/app/views/solutions/_new.html.erb | 1 + 1 file changed, 1 insertion(+) diff --git a/tutor/app/views/solutions/_new.html.erb b/tutor/app/views/solutions/_new.html.erb index 52311b75..40ead454 100644 --- a/tutor/app/views/solutions/_new.html.erb +++ b/tutor/app/views/solutions/_new.html.erb @@ -5,6 +5,7 @@ Time spent: 0:00 + <%= form_for :solution, :url => { :controller => "solutions", :action => "create" }, :html => {:method => :post} do |f| %> From 3335fb3a132801bfea9db0b99791d0f7e29ede8e Mon Sep 17 00:00:00 2001 From: Muhammad Mamdouh Date: Mon, 21 Apr 2014 18:46:47 +0200 Subject: [PATCH 212/938] added index,changed routes,working on the controller --- .../controllers/teaching_assistants_controller.rb | 12 +++++++++++- .../app/views/teaching_assistants/index.html.erb | 15 +++++++++++++++ tutor/app/views/teaching_assistants/new.html.erb | 14 +++++++------- tutor/config/routes.rb | 2 +- 4 files changed, 34 insertions(+), 9 deletions(-) create mode 100644 tutor/app/views/teaching_assistants/index.html.erb diff --git a/tutor/app/controllers/teaching_assistants_controller.rb b/tutor/app/controllers/teaching_assistants_controller.rb index 4cc5abf8..72b51bcb 100644 --- a/tutor/app/controllers/teaching_assistants_controller.rb +++ b/tutor/app/controllers/teaching_assistants_controller.rb @@ -1,9 +1,19 @@ class TeachingAssistantsController < ApplicationController def new - end + end + + def create + @teaching_assistant = teaching_assistants.where(email: params[:email]) + @course = courses.find_by_id(params[:course_id]) + end + + def index + @course = Course.find(params[:course_id]) + @teaching_assistants = @course.TAs.order('name') + end diff --git a/tutor/app/views/teaching_assistants/index.html.erb b/tutor/app/views/teaching_assistants/index.html.erb new file mode 100644 index 00000000..3d60589f --- /dev/null +++ b/tutor/app/views/teaching_assistants/index.html.erb @@ -0,0 +1,15 @@ +

    Listing articles

    + + + + + + + + <% @teaching_assistants.each do |teacing_assistant| %> + + + + + <% end %> +
    TitleText
    <%= teaching_assistant.name %><%= teaching_assistant.email %>
    \ No newline at end of file diff --git a/tutor/app/views/teaching_assistants/new.html.erb b/tutor/app/views/teaching_assistants/new.html.erb index 98831ba4..644b0d70 100644 --- a/tutor/app/views/teaching_assistants/new.html.erb +++ b/tutor/app/views/teaching_assistants/new.html.erb @@ -1,13 +1,13 @@

    Add a Teaching Assistant

    -<%= form_for :teaching_assistant do |f| %> +<%= form_for :teaching_assistant, url: {action: "create"} do |f| %>

    <%= select("teaching_assistant", "email", TeachingAssistant.find(:all).collect {|p| [ p.name ] }, {:prompt => 'Select'}) %>

    -

    - <%= select("lecturer_teaching_assistant", "email", TeachingAssistant.find(:all).collect {|p| [ p.name ] }, {:prompt => 'Select'}) %> -

    +

    - <%= f.submit %> -

    -<% end %> \ No newline at end of file + <%= f.submit "Add TA", class: "btn btn-success"%> +

    +<% end %> + +<%= button_to "Back", {:controller => 'courses', :action =>'index'}, class: "btn btn-success", style: "float:right; margin-top:-50px", :method => :get %> \ No newline at end of file diff --git a/tutor/config/routes.rb b/tutor/config/routes.rb index b5a9c55a..3893eb96 100644 --- a/tutor/config/routes.rb +++ b/tutor/config/routes.rb @@ -21,7 +21,7 @@ post 'courses/new' => 'courses#new' resources :courses do post 'topics/new' => 'topics#new' - resources :teaching_assistants, only: [:new] + resources :teaching_assistants resources :topics end resources :model_answers do From 69a5ac217056c4b5284399a44bd3aeba4576c035 Mon Sep 17 00:00:00 2001 From: Ahmed Akram Date: Mon, 21 Apr 2014 18:47:58 +0200 Subject: [PATCH 213/938] Issue #264, fixing bugs --- tutor/app/assets/stylesheets/solutions.css | 15 +++- tutor/app/controllers/solutions_controller.rb | 2 +- tutor/app/models/executer.rb | 11 ++- tutor/app/views/problems/show.html.erb | 6 +- tutor/app/views/solutions/_new.html.erb | 86 ++++++++++--------- 5 files changed, 68 insertions(+), 52 deletions(-) diff --git a/tutor/app/assets/stylesheets/solutions.css b/tutor/app/assets/stylesheets/solutions.css index 6a9ba8fb..96832896 100644 --- a/tutor/app/assets/stylesheets/solutions.css +++ b/tutor/app/assets/stylesheets/solutions.css @@ -35,4 +35,17 @@ textarea { max-height: 200px; overflow-y:scroll; overflow-x:hidden; -} \ No newline at end of file +} + +.editor { + background-color: black; + color: white; + width: 100%; + min-height: 500px; +} + +.test { + width: 100%; + min-height: 200px; + float: left; +} diff --git a/tutor/app/controllers/solutions_controller.rb b/tutor/app/controllers/solutions_controller.rb index 4ca730b4..bb432eae 100644 --- a/tutor/app/controllers/solutions_controller.rb +++ b/tutor/app/controllers/solutions_controller.rb @@ -49,7 +49,7 @@ def execute def solution_params params.require(:solution).permit(:code , :problem_id) end - + # Ahmed Akram def input params.require(:solution).permit(:input) end diff --git a/tutor/app/models/executer.rb b/tutor/app/models/executer.rb index 6741bd70..4a06c301 100644 --- a/tutor/app/models/executer.rb +++ b/tutor/app/models/executer.rb @@ -9,10 +9,10 @@ def self.execute(file, input) validity = check_input_validity(input, problem_id) if validity[:status] @execute_res = %x[#{'java -cp ' + classes_path + ' ' + file + ' ' + input + ' 2>&1'}] - if @execute_res.empty? - true + if @execute_res.include?("Exception") + return false else - false + return true end else @execute_res = validity[:msg] @@ -27,12 +27,11 @@ def self.check_input_validity(input, problem_id) if input.include?("\n") return {status: false, msg: "Input can not have line breaks \"don't use enter\""} end - if input.split(" ").count == variables_number - return true - else + if input.split(" ").count != variables_number msg = "Enter only " + variables_number.to_s + " numbers" return {status: false, msg: msg} end + return {status: true, msg:""} end def self.get_runtime_error() diff --git a/tutor/app/views/problems/show.html.erb b/tutor/app/views/problems/show.html.erb index de9d3abd..bda4ffb4 100644 --- a/tutor/app/views/problems/show.html.erb +++ b/tutor/app/views/problems/show.html.erb @@ -1,5 +1,5 @@ - / - / + +

    @@ -25,6 +25,6 @@ <% end %> <% end %> - +
    \ No newline at end of file diff --git a/tutor/app/views/solutions/_new.html.erb b/tutor/app/views/solutions/_new.html.erb index 26b0d703..a8499b1c 100644 --- a/tutor/app/views/solutions/_new.html.erb +++ b/tutor/app/views/solutions/_new.html.erb @@ -7,56 +7,60 @@ 0:00
    -<%= form_for :solution, - :url => { :controller => "solutions", :action => "create" }, - :html => {:method => :post} do |f| %> - <%= @code = f.text_area :code, placeholder: "Write your code here and then click submit", - class: "editor" %> - <%= f.hidden_field :problem_id, value: params[:id] %> -
    - - - - - -
    - <%= button_tag 'Debug', id: 'debug' %> - <%= button_tag 'Previous Step', id: 'previous', disabled: true %> - <%= button_tag 'Next Step', id: 'next', disabled: true %> - - Accepted - Wrong Answer - Runtime Error - Compilation Error - <%= f.submit "Compile"%> - <%= f.submit "Run Test Case"%> - <%= f.submit "Submit"%> -
    -

    + <%= form_for :solution, + :url => { :controller => "solutions", :action => "create" }, + :html => {:method => :post} do |f| %> + <%= @code = f.text_area :code, placeholder: "Write your code here and then click submit", + class: "editor" %> + <%= f.hidden_field :problem_id, value: params[:id] %> +
    + + + + + +
    + <%= button_tag 'Debug', id: 'debug' %> + <%= button_tag 'Previous Step', id: 'previous', disabled: true %> + <%= button_tag 'Next Step', id: 'next', disabled: true %> + + Accepted + Wrong Answer + Runtime Error + Compilation Error + <%= f.submit "Compile"%> + <%= f.submit "Run Test Case"%> + <%= f.submit "Submit"%> +
    +

    Input:
    - <%= f.text_area :input, placeholder: "Write your test case here", - class: "form-control", style: "width:400px" %> + <%= f.text_area :input, placeholder: "Write your test case here", + value: @input, class: "form-control", style: "width:400px" %>

    Output: <% if flash[:exp] %>
    -
    -

    Error

    -
    -
    -

    <%= flash[:msg] %>

    -
    -
    -

    Explanation

    -
    -
    -

    <%= flash[:exp] %>

    -
    +
    +

    Error

    +
    +
    +

    <%= flash[:msg] %>

    +
    +
    +

    Explanation

    +
    +
    +

    <%= flash[:exp] %>

    +
    +
    + <% else %> +
    +

    <%= flash[:msg] %>

    <% end %>
    -<% end %> + <% end %>
    \ No newline at end of file From d05615df8f2fc892d869b867dea0e07d5fdf8d86 Mon Sep 17 00:00:00 2001 From: Linsara Date: Mon, 21 Apr 2014 18:51:49 +0200 Subject: [PATCH 214/938] Issue #182 fixing Ajax call on sortable list --- tutor/app/controllers/topics_controller.rb | 12 +++++++ tutor/app/views/topics/show.html.erb | 39 ++++++++++++++++------ tutor/config/routes.rb | 6 ++++ 3 files changed, 46 insertions(+), 11 deletions(-) diff --git a/tutor/app/controllers/topics_controller.rb b/tutor/app/controllers/topics_controller.rb index 5e16ea1e..fd864732 100644 --- a/tutor/app/controllers/topics_controller.rb +++ b/tutor/app/controllers/topics_controller.rb @@ -106,3 +106,15 @@ def edit @topic = Topic.find_by_id(id) end + def sort + id = params[:id] + @topic = Topic.find_by_id(id) + @tracks = @topic.tracks #did nothing new here just made sure I have the the correct topic id and the tracks related to it + + #men hena not sure what I should do + new_Order_Array = params[:methodParam] #now we we can use the array passed by Ajax + @tracks.each do |track| + track.difficulty = params['track'].index(track.id) + 1 #track.id.to_s I removed.to_s part + track.save + end + end diff --git a/tutor/app/views/topics/show.html.erb b/tutor/app/views/topics/show.html.erb index f62768c1..91f081c5 100644 --- a/tutor/app/views/topics/show.html.erb +++ b/tutor/app/views/topics/show.html.erb @@ -12,15 +12,7 @@ //var order; // making order a global variable $(document).ready(function() { //var DoneFlag = new Boolean(0); //a flag to check whether the TA made changes or not - $("#list-of-tracks").sortable({ - update: function (event, ui) { - order = $(this).sortable('toArray') - // this will return an array of this form => track_1,track_2,track_3 - //DoneFlag = Boolean(1) ; - -//.toString(); remember to add this back - } - }); + $("#list-of-tracks").sortable(); $( "#edit_track_rating_dialog" ).dialog({ autoOpen: false, @@ -31,20 +23,45 @@ $(document).ready(function() { buttons: { Cancel: function(){ $( this ).dialog( "close" ); - } + } , //Done: function(){ //DoneFlag = Boolean(1); // call the updateValue() function here // display an alert("changes saved") //close the dialog box //} + Done: function(){ + //call the ajax function here + var array = $("#list-of-tracks").sortable('toArray') ; + + $.ajax({ + type: 'post', + url: '/tracks/sort', + traditional: true, + //dataType: "json", + data: { methodParam : array }, //use it as a key value pair + success: function (data) { + alert("success"); + }, + error: function (args) { + alert("Error on ajax post"); + } + }); + + //alert(array.toString()) ; //alert returns this format 1,2 + + $( this ).dialog( "close" ); // close + } } }); + $( "#opener" ).click(function() { $( "#edit_track_rating_dialog" ).dialog( "open" ); $("#edit_track_rating_dialog").css('overflow', 'hidden'); }).disableSelection(); }); + + @@ -128,7 +145,7 @@ $(document).ready(function() {
      <%- @tracks.each do |track| %> -
    • <%= track.title %>
      • +
    • <%= track.title %>
      • <% end %>
    diff --git a/tutor/config/routes.rb b/tutor/config/routes.rb index 45e271fa..b26615ab 100644 --- a/tutor/config/routes.rb +++ b/tutor/config/routes.rb @@ -46,6 +46,12 @@ get 'getProblems' end end + + resources :tracks do + member do + post 'sort' + end + end resources :discussion_boards do member do post 'toggle' From d7a5919f53e1e3f2ae4407662be2b66918823390 Mon Sep 17 00:00:00 2001 From: Muhammad Mamdouh Date: Mon, 21 Apr 2014 18:55:13 +0200 Subject: [PATCH 215/938] removed unnecessary file , added changes to index file --- tutor/app/views/courses/addTA.html.erb | 0 .../views/teaching_assistants/index.html.erb | 21 +++++++++++++------ 2 files changed, 15 insertions(+), 6 deletions(-) delete mode 100644 tutor/app/views/courses/addTA.html.erb diff --git a/tutor/app/views/courses/addTA.html.erb b/tutor/app/views/courses/addTA.html.erb deleted file mode 100644 index e69de29b..00000000 diff --git a/tutor/app/views/teaching_assistants/index.html.erb b/tutor/app/views/teaching_assistants/index.html.erb index 3d60589f..3b5396f4 100644 --- a/tutor/app/views/teaching_assistants/index.html.erb +++ b/tutor/app/views/teaching_assistants/index.html.erb @@ -1,15 +1,24 @@ -

    Listing articles

    - - +

    The Course's Teaching Assistants

    +
    +<% if flash[:notice] -%> +
    <%= flash[:notice] %>
    +<% end %> +
    + +
    + - + - + + <% @teaching_assistants.each do |teacing_assistant| %> + <% end %> -
    TitleTextDescription
    <%= teaching_assistant.name %> <%= teaching_assistant.email %>
    \ No newline at end of file + +<%= button_to "Back", {:controller => 'courses', :action => 'index'}, class: "btn btn-success", style: "float:right; margin-top:-50px", :method => :get %> \ No newline at end of file From 985fc229de757b3a3b9710f30454b4ec99dd1eb3 Mon Sep 17 00:00:00 2001 From: Linsara Date: Mon, 21 Apr 2014 19:05:41 +0200 Subject: [PATCH 216/938] Issue #182 Removed comments and more ajax trials --- tutor/app/controllers/topics_controller.rb | 4 ++-- tutor/app/views/topics/show.html.erb | 19 +++++++------------ 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/tutor/app/controllers/topics_controller.rb b/tutor/app/controllers/topics_controller.rb index fd864732..1d9c3c39 100644 --- a/tutor/app/controllers/topics_controller.rb +++ b/tutor/app/controllers/topics_controller.rb @@ -109,12 +109,12 @@ def edit def sort id = params[:id] @topic = Topic.find_by_id(id) - @tracks = @topic.tracks #did nothing new here just made sure I have the the correct topic id and the tracks related to it + @tracks = @topic.tracks #get the tracks of a certain topic #men hena not sure what I should do new_Order_Array = params[:methodParam] #now we we can use the array passed by Ajax @tracks.each do |track| - track.difficulty = params['track'].index(track.id) + 1 #track.id.to_s I removed.to_s part + track.difficulty = params[:methodParam].index(track.id) + 1 #track.id.to_s I removed.to_s part track.save end end diff --git a/tutor/app/views/topics/show.html.erb b/tutor/app/views/topics/show.html.erb index 91f081c5..e629c482 100644 --- a/tutor/app/views/topics/show.html.erb +++ b/tutor/app/views/topics/show.html.erb @@ -9,9 +9,8 @@ \ No newline at end of file + From bc8b0e3d6b57d039a4569e272ba5db40257a4dd3 Mon Sep 17 00:00:00 2001 From: Ahmed Atef Date: Mon, 21 Apr 2014 19:27:49 +0200 Subject: [PATCH 221/938] added validations for the post title and content --- tutor/app/models/post.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/tutor/app/models/post.rb b/tutor/app/models/post.rb index da15e87a..290c6e0a 100644 --- a/tutor/app/models/post.rb +++ b/tutor/app/models/post.rb @@ -1,6 +1,7 @@ class Post < ActiveRecord::Base #Validations + validates :title, :content, presence: true #Relations belongs_to :owner, polymorphic: true From ebc94a312c8d321a2fa4c6d3ef7766d5d2be051c Mon Sep 17 00:00:00 2001 From: Ahmed Atef Date: Mon, 21 Apr 2014 19:31:29 +0200 Subject: [PATCH 222/938] Added a question mark in current_student_signed_in? --- tutor/app/controllers/posts_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tutor/app/controllers/posts_controller.rb b/tutor/app/controllers/posts_controller.rb index 2218b04f..b2ac6773 100644 --- a/tutor/app/controllers/posts_controller.rb +++ b/tutor/app/controllers/posts_controller.rb @@ -45,7 +45,7 @@ def create elsif teaching_assistant_signed_in? @new_post.owner_id = current_teaching_assistant.id @new_post.owner_type = "teaching assistant" - elsif student_signed_in + elsif student_signed_in? @new_post.owner_id = current_student.id @new_post.owner_type = "student" end From 8240b543fcefdd123832b64ce2b4754e3575b6ac Mon Sep 17 00:00:00 2001 From: Linsara Date: Mon, 21 Apr 2014 19:41:06 +0200 Subject: [PATCH 223/938] Issue #182 Added minor changes --- tutor/app/controllers/topics_controller.rb | 2 +- tutor/app/views/topics/show.html.erb | 6 ++++-- tutor/config/routes.rb | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/tutor/app/controllers/topics_controller.rb b/tutor/app/controllers/topics_controller.rb index 1d9c3c39..94623895 100644 --- a/tutor/app/controllers/topics_controller.rb +++ b/tutor/app/controllers/topics_controller.rb @@ -96,7 +96,7 @@ def topic_params end def course_params - params.permit(:course_id) + params.permit(:course_id ) end end diff --git a/tutor/app/views/topics/show.html.erb b/tutor/app/views/topics/show.html.erb index e629c482..c0326cb9 100644 --- a/tutor/app/views/topics/show.html.erb +++ b/tutor/app/views/topics/show.html.erb @@ -26,14 +26,16 @@ $(document).ready(function() { Done: function(){ //call the ajax function here var array = $("#list-of-tracks").sortable('toArray') ; + $.ajax({ - type: 'post', + type: 'POST', + dataType: 'javascript', //should the url be "/tracks/sort" //or "/tracks" + topic_id + "/sort" //or "sort" only // should I include ROOT_PATH at the begining - url: '/tracks/1/sort', + url: 'topics/sort', traditional: true, //dataType: "json", data: { methodParam : array }, //use it as a key value pair diff --git a/tutor/config/routes.rb b/tutor/config/routes.rb index b26615ab..cb8d3dd9 100644 --- a/tutor/config/routes.rb +++ b/tutor/config/routes.rb @@ -47,7 +47,7 @@ end end - resources :tracks do + resources :topics do member do post 'sort' end From 1c86305038522494b07982e8b88d4311aa808f0a Mon Sep 17 00:00:00 2001 From: Ahmed Moataz Date: Mon, 21 Apr 2014 19:47:00 +0200 Subject: [PATCH 224/938] Adding documentation --- tutor/app/controllers/compilers_controller.rb | 2 +- tutor/app/controllers/courses_controller.rb | 2 +- tutor/app/controllers/solutions_controller.rb | 13 ++++-- tutor/app/models/compiler.rb | 41 ++++++++++++++++++- tutor/app/views/solutions/_new.html.erb | 3 +- 5 files changed, 54 insertions(+), 7 deletions(-) diff --git a/tutor/app/controllers/compilers_controller.rb b/tutor/app/controllers/compilers_controller.rb index a0605fef..3c899fed 100644 --- a/tutor/app/controllers/compilers_controller.rb +++ b/tutor/app/controllers/compilers_controller.rb @@ -1,2 +1,2 @@ class CompilersController < ApplicationController -end +end \ No newline at end of file diff --git a/tutor/app/controllers/courses_controller.rb b/tutor/app/controllers/courses_controller.rb index 5bd5e1f9..7ed2f0b4 100644 --- a/tutor/app/controllers/courses_controller.rb +++ b/tutor/app/controllers/courses_controller.rb @@ -4,7 +4,7 @@ class CoursesController < ApplicationController # Allows students to sign-up/register for new courses by choosing # the desired course attributes in the following order: # University > Semester > Course > Instructor > Sign-Up > Confirmation - # Parameter: + # Parameters: # params[]: A hash of the request URL attributes # Returns: # @status: The next status (0:Failure:Not a student, 1:University, 2:Semester, 3:Course, diff --git a/tutor/app/controllers/solutions_controller.rb b/tutor/app/controllers/solutions_controller.rb index eccde5d4..3302a35b 100644 --- a/tutor/app/controllers/solutions_controller.rb +++ b/tutor/app/controllers/solutions_controller.rb @@ -1,4 +1,5 @@ class SolutionsController < ApplicationController + # [Code Editor: Write Code - Story 3.3] # Creates a solution for a problem that the student chose # and outputs 2 flush messages for success and failure scenarios @@ -24,16 +25,21 @@ def create end end + # [Compiler: Compile - Story 3.4] + # Creates a soution for the current problem in the database and compiles it. + # Then it places the compilation results and feedback in the flash hash. + # Parameters: + # solution_params: submitted from the form_for + # Returns: none # Author: Ahmed Moataz def compile_solution @solution = Solution.new(solution_params) @solution.student_id = current_student.id @solution.length = @solution.code.length if @solution.save - compiler_feedback = Compiler.compiler_feedback(current_student.id, solution_params[:problem_id], @solution.id.to_s, solution_params[:code]) + compiler_feedback = Compiler.compiler_feedback(current_student.id, + solution_params[:problem_id],@solution.id.to_s, solution_params[:code]) if compiler_feedback[:success] - #to pass the current solution_id - @solution_id = @solution.id #compiled successfully @solution.status = 3 flash[:compiler_success] = "Compilation Succeeded!" @@ -61,4 +67,5 @@ def compile_solution def solution_params params.require(:solution).permit(:code , :problem_id) end + end \ No newline at end of file diff --git a/tutor/app/models/compiler.rb b/tutor/app/models/compiler.rb index 1805b7d3..8efefd12 100644 --- a/tutor/app/models/compiler.rb +++ b/tutor/app/models/compiler.rb @@ -8,6 +8,16 @@ class Compiler < ActiveRecord::Base #Methods + # [Compiler: Compile - Story 3.4] + # Writes the given code to a .java file with the name st[student_id]pr[problem_id]so[solution_id]. + # Then it compiles that file and returns the compiler's feedback. + # Parameters: + # student_id: The ID of the current student. + # problem_id: The ID of the current problem. + # solution_id: The ID of the submitted solution. + # code: The code to be compiled. + # Returns: + # The compiler's feedback. # Author: Ahmed Moataz def self.compile(student_id, problem_id, solution_id, code) file_name = 'st' + student_id.to_s + 'pr' + problem_id.to_s + 'so' + solution_id.to_s + '.java' @@ -15,18 +25,38 @@ def self.compile(student_id, problem_id, solution_id, code) return %x[ #{'javac -g ' + file_name + ' 2>&1'} ] end + # [Compiler: Compile - Story 3.4] + # Changes the class name of the submitted code using change_class_name/4. + # Then compiles it using compile/4 and passes its result and feedback in a list. + # Parameters: + # student_id: The ID of the current student. + # problem_id: The ID of the current problem. + # solution_id: The ID of the submitted solution. + # code: The submitted code. + # Returns: + # A list. The first element is a boolean indicating the result of the compilation process. + # The second element contains the compilation errors if any. # Author: Ahmed Moataz def self.compiler_feedback(student_id, problem_id, solution_id, code) new_code = change_class_name(student_id, problem_id, solution_id, code) feedback = compile(student_id,problem_id, solution_id, new_code) if feedback == "" - return { success: true } + return { success: true, errors: nil } else new_feedback = change_error_headers(student_id, problem_id, solution_id, feedback) return { success: false, errors: new_feedback } end end + # [Compiler: Compile - Story 3.4] + # Changes the class name to st[student_id]pr[problem_id]so[solution_id]. + # Parameters: + # student_id: The ID of the current student. + # problem_id: The ID of the current problrm. + # solution_id: The ID of the submitted solution. + # code: The submitted code. + # Returns: + # The code with the class name changed to CoolSoft if it exists. # Author: Ahmed Moataz def self.change_class_name(student_id, problem_id, solution_id, code) name = 'st' + student_id.to_s + 'pr' + problem_id.to_s + 'so' + solution_id.to_s @@ -37,6 +67,15 @@ def self.change_class_name(student_id, problem_id, solution_id, code) end end + # [Compiler: Compile - Story 3.4] + # Changes the error headers to CoolSoft. + # Parameters: + # student_id: The ID of the current student. + # problem_id: The ID of the current problrm. + # solution_id: The ID of the submitted solution. + # feedback: The compiler's feedback. + # Returns: + # The compiler's feedback with the error headers changed to CoolSoft. # Author: Ahmed Moataz def self.change_error_headers(student_id, problem_id, solution_id, feedback) header = 'st' + student_id.to_s + 'pr' + problem_id.to_s + 'so' + solution_id.to_s diff --git a/tutor/app/views/solutions/_new.html.erb b/tutor/app/views/solutions/_new.html.erb index 40ead454..6b3be578 100644 --- a/tutor/app/views/solutions/_new.html.erb +++ b/tutor/app/views/solutions/_new.html.erb @@ -36,7 +36,8 @@ Console:
    -
    +

    <%= flash[:compiler_success] %>

    <%= flash[:compiler_fail] %>

    <%= flash[:compiler_feedback] %>

    From 1a4744da4b57582847a16286b21264b0bdca3d76 Mon Sep 17 00:00:00 2001 From: Mussab ElDash Date: Mon, 21 Apr 2014 19:47:41 +0200 Subject: [PATCH 225/938] Update debug_controller.rb --- tutor/app/controllers/debug_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tutor/app/controllers/debug_controller.rb b/tutor/app/controllers/debug_controller.rb index a691b3dd..3babd983 100644 --- a/tutor/app/controllers/debug_controller.rb +++ b/tutor/app/controllers/debug_controller.rb @@ -2,7 +2,7 @@ class DebugController < ApplicationController # [Debugger: Debug - Story 3.6] # Send the recieved code to be debugged - # and return the result to the user as an json object + # and return the result to the user as a json object # Parameters: # id: The id of the problem being solved # code: The code to be debugged From 045e8838db4b5ccbc5f9fb5f3caa72cdfd5ea7b7 Mon Sep 17 00:00:00 2001 From: Mussab ElDash Date: Mon, 21 Apr 2014 19:48:35 +0200 Subject: [PATCH 226/938] Update debugger.rb --- tutor/app/models/debugger.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tutor/app/models/debugger.rb b/tutor/app/models/debugger.rb index 14959c4b..2245b4f3 100644 --- a/tutor/app/models/debugger.rb +++ b/tutor/app/models/debugger.rb @@ -10,7 +10,7 @@ class Debugger < ActiveRecord::Base #Methods # [Debugger: Debug - Story 3.6] # Gets the output from the output stream of the debugger - # untill the passed regex is encountered + # until the passed regex is encountered # Parameters: # regex : The input regex to be encountered to return # Returns: A String of the buffer @@ -29,7 +29,7 @@ def buffer_until regex # [Debugger: Debug - Story 3.6] # Gets the output from the output stream of the debugger - # untill the below regex is encountered + # until the below regex is encountered # Parameters: None # Returns: A String of the buffer # Author: Rami Khalil @@ -39,7 +39,7 @@ def buffer_until_ready # [Debugger: Debug - Story 3.6] # Gets the output from the output stream of the debugger - # untill the below regex is encountered + # until the below regex is encountered # Parameters: None # Returns: A String of the buffer # Author: Rami Khalil From 8c451db09544a3103c22e7605b22e55220ffc480 Mon Sep 17 00:00:00 2001 From: Ahmed Atef Date: Mon, 21 Apr 2014 20:02:15 +0200 Subject: [PATCH 227/938] Added post content in the post view --- tutor/app/views/posts/show.html.erb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tutor/app/views/posts/show.html.erb b/tutor/app/views/posts/show.html.erb index ab9a3ff0..00d70d9d 100644 --- a/tutor/app/views/posts/show.html.erb +++ b/tutor/app/views/posts/show.html.erb @@ -1,6 +1,8 @@

    <%=@post.title%>

    + <%= @post.content %> +
    <% unless @replies.blank? %> <% @replies.each do |reply| %>
    From a1957f0c529a1ec69b32c52eafee0792bb12ad2e Mon Sep 17 00:00:00 2001 From: Ahmed Moataz Date: Mon, 21 Apr 2014 20:04:12 +0200 Subject: [PATCH 228/938] Modifications and Improvements --- tutor/.gitignore | 4 +++- tutor/app/models/compiler.rb | 6 ++++-- tutor/rubyJava2.class | Bin 500 -> 0 bytes tutor/rubyJava2.java | 8 -------- tutor/s#p1sol.java | 1 - tutor/s#p1sol.java | 2 -- tutor/s#p1sol.java | 1 - tutor/s10p12.class | Bin 598 -> 0 bytes tutor/s10p12.java | 1 - tutor/s10p12sol15.java | 1 - tutor/s1p1sol.java | 1 - tutor/s1p1sol10.java | 1 - tutor/s1p1sol11.java | 1 - tutor/s1p1sol6.java | 1 - tutor/s1p1sol7.java | 1 - tutor/s1p1sol8.java | 1 - tutor/s1p1sol9.java | 1 - tutor/st1pr1so.class | Bin 367 -> 0 bytes tutor/st1pr1so.java | 5 ----- tutor/st1pr1so12.java | 1 - tutor/st1pr1so13.java | 1 - tutor/st1pr1so14.java | 2 -- tutor/st1pr1so15.java | 5 ----- tutor/st1pr1so16.java | 5 ----- tutor/st1pr1so17.java | 5 ----- tutor/st1pr1so18.java | 5 ----- tutor/st1pr1so19.class | Bin 373 -> 0 bytes tutor/st1pr1so19.java | 5 ----- tutor/st1pr1so20.class | Bin 373 -> 0 bytes tutor/st1pr1so20.java | 5 ----- tutor/st1pr1so21.class | Bin 524 -> 0 bytes tutor/st1pr1so21.java | 5 ----- tutor/st1pr1so22.java | 5 ----- tutor/st1pr1so23.java | 5 ----- tutor/st1pr1so24.java | 5 ----- tutor/st1pr1so25.class | Bin 373 -> 0 bytes tutor/st1pr1so25.java | 5 ----- tutor/st1pr1so26.java | 5 ----- tutor/st1pr1so27.java | 7 ------- tutor/st1pr1so28.class | Bin 373 -> 0 bytes tutor/st1pr1so28.java | 5 ----- tutor/st1pr1so29.class | Bin 373 -> 0 bytes tutor/st1pr1so29.java | 5 ----- tutor/st1pr1so31.class | Bin 373 -> 0 bytes tutor/st1pr1so31.java | 5 ----- tutor/st1pr1so32.class | Bin 373 -> 0 bytes tutor/st1pr1so32.java | 5 ----- tutor/st1pr1so33.class | Bin 373 -> 0 bytes tutor/st1pr1so33.java | 5 ----- tutor/st1pr1so34.class | Bin 373 -> 0 bytes tutor/st1pr1so34.java | 5 ----- tutor/st1pr1so35.class | Bin 373 -> 0 bytes tutor/st1pr1so35.java | 5 ----- tutor/st1pr1so36.class | Bin 373 -> 0 bytes tutor/st1pr1so36.java | 5 ----- tutor/st1pr1so37.java | 4 ---- tutor/st1pr1so38.java | 5 ----- tutor/st1pr1so39.java | 5 ----- tutor/st1pr1so40.class | Bin 373 -> 0 bytes tutor/st1pr1so40.java | 5 ----- tutor/st1pr1so41.java | 5 ----- tutor/st1pr1so42.class | Bin 373 -> 0 bytes tutor/st1pr1so42.java | 5 ----- tutor/st1pr1so43.java | 5 ----- tutor/st1pr1so44.java | 5 ----- tutor/st1pr1so45.class | Bin 373 -> 0 bytes tutor/st1pr1so45.java | 5 ----- tutor/st1pr1so46.java | 5 ----- tutor/st1pr1so47.class | Bin 373 -> 0 bytes tutor/st1pr1so47.java | 5 ----- tutor/st1pr1so48.java | 5 ----- tutor/st1pr3so53.class | Bin 373 -> 0 bytes tutor/st1pr3so53.java | 5 ----- tutor/st1pr3so54.java | 4 ---- tutor/st1pr3so55.java | 14 -------------- tutor/st1pr3so57.java | 5 ----- tutor/st1pr3so58.java | 5 ----- tutor/st1pr3so59.java | 5 ----- tutor/st1pr3so61.java | 5 ----- tutor/st1pr3so62.java | 5 ----- tutor/st1pr3so63.java | 5 ----- tutor/st1pr3so69.java | 5 ----- tutor/st1pr3so76.class | Bin 373 -> 0 bytes tutor/st1pr3so76.java | 5 ----- tutor/st1pr3so77.java | 5 ----- tutor/st1pr3so78.java | 1 - tutor/st1pr3so79.java | 1 - tutor/st1pr3so80.java | 5 ----- tutor/st1pr3so81.java | 4 ---- tutor/st1pr3so82.java | 4 ---- tutor/st1pr3so84.class | Bin 373 -> 0 bytes tutor/st1pr3so84.java | 5 ----- tutor/st1pr3so85.java | 1 - tutor/st1pr3so86.java | 1 - tutor/st1pr3so87.class | Bin 373 -> 0 bytes tutor/st1pr3so87.java | 5 ----- tutor/st1pr3so88.java | 1 - tutor/st1pr3so89.java | 6 ------ tutor/st1pr3so90.java | 7 ------- tutor/st1pr3so91.class | Bin 373 -> 0 bytes tutor/st1pr3so91.java | 5 ----- tutor/st1pr3so92.class | Bin 373 -> 0 bytes tutor/st1pr3so92.java | 5 ----- tutor/st1pr3so93.class | Bin 373 -> 0 bytes tutor/st1pr3so93.java | 5 ----- tutor/st1pr3so94.class | Bin 373 -> 0 bytes tutor/st1pr3so94.java | 5 ----- tutor/st1pr3so95.class | Bin 373 -> 0 bytes tutor/st1pr3so95.java | 5 ----- tutor/st1pr3so96.java | 4 ---- tutor/st1pr3so97.java | 4 ---- 111 files changed, 7 insertions(+), 341 deletions(-) delete mode 100644 tutor/rubyJava2.class delete mode 100644 tutor/rubyJava2.java delete mode 100644 tutor/s#p1sol.java delete mode 100644 tutor/s#p1sol.java delete mode 100644 tutor/s#p1sol.java delete mode 100644 tutor/s10p12.class delete mode 100644 tutor/s10p12.java delete mode 100644 tutor/s10p12sol15.java delete mode 100644 tutor/s1p1sol.java delete mode 100644 tutor/s1p1sol10.java delete mode 100644 tutor/s1p1sol11.java delete mode 100644 tutor/s1p1sol6.java delete mode 100644 tutor/s1p1sol7.java delete mode 100644 tutor/s1p1sol8.java delete mode 100644 tutor/s1p1sol9.java delete mode 100644 tutor/st1pr1so.class delete mode 100644 tutor/st1pr1so.java delete mode 100644 tutor/st1pr1so12.java delete mode 100644 tutor/st1pr1so13.java delete mode 100644 tutor/st1pr1so14.java delete mode 100644 tutor/st1pr1so15.java delete mode 100644 tutor/st1pr1so16.java delete mode 100644 tutor/st1pr1so17.java delete mode 100644 tutor/st1pr1so18.java delete mode 100644 tutor/st1pr1so19.class delete mode 100644 tutor/st1pr1so19.java delete mode 100644 tutor/st1pr1so20.class delete mode 100644 tutor/st1pr1so20.java delete mode 100644 tutor/st1pr1so21.class delete mode 100644 tutor/st1pr1so21.java delete mode 100644 tutor/st1pr1so22.java delete mode 100644 tutor/st1pr1so23.java delete mode 100644 tutor/st1pr1so24.java delete mode 100644 tutor/st1pr1so25.class delete mode 100644 tutor/st1pr1so25.java delete mode 100644 tutor/st1pr1so26.java delete mode 100644 tutor/st1pr1so27.java delete mode 100644 tutor/st1pr1so28.class delete mode 100644 tutor/st1pr1so28.java delete mode 100644 tutor/st1pr1so29.class delete mode 100644 tutor/st1pr1so29.java delete mode 100644 tutor/st1pr1so31.class delete mode 100644 tutor/st1pr1so31.java delete mode 100644 tutor/st1pr1so32.class delete mode 100644 tutor/st1pr1so32.java delete mode 100644 tutor/st1pr1so33.class delete mode 100644 tutor/st1pr1so33.java delete mode 100644 tutor/st1pr1so34.class delete mode 100644 tutor/st1pr1so34.java delete mode 100644 tutor/st1pr1so35.class delete mode 100644 tutor/st1pr1so35.java delete mode 100644 tutor/st1pr1so36.class delete mode 100644 tutor/st1pr1so36.java delete mode 100644 tutor/st1pr1so37.java delete mode 100644 tutor/st1pr1so38.java delete mode 100644 tutor/st1pr1so39.java delete mode 100644 tutor/st1pr1so40.class delete mode 100644 tutor/st1pr1so40.java delete mode 100644 tutor/st1pr1so41.java delete mode 100644 tutor/st1pr1so42.class delete mode 100644 tutor/st1pr1so42.java delete mode 100644 tutor/st1pr1so43.java delete mode 100644 tutor/st1pr1so44.java delete mode 100644 tutor/st1pr1so45.class delete mode 100644 tutor/st1pr1so45.java delete mode 100644 tutor/st1pr1so46.java delete mode 100644 tutor/st1pr1so47.class delete mode 100644 tutor/st1pr1so47.java delete mode 100644 tutor/st1pr1so48.java delete mode 100644 tutor/st1pr3so53.class delete mode 100644 tutor/st1pr3so53.java delete mode 100644 tutor/st1pr3so54.java delete mode 100644 tutor/st1pr3so55.java delete mode 100644 tutor/st1pr3so57.java delete mode 100644 tutor/st1pr3so58.java delete mode 100644 tutor/st1pr3so59.java delete mode 100644 tutor/st1pr3so61.java delete mode 100644 tutor/st1pr3so62.java delete mode 100644 tutor/st1pr3so63.java delete mode 100644 tutor/st1pr3so69.java delete mode 100644 tutor/st1pr3so76.class delete mode 100644 tutor/st1pr3so76.java delete mode 100644 tutor/st1pr3so77.java delete mode 100644 tutor/st1pr3so78.java delete mode 100644 tutor/st1pr3so79.java delete mode 100644 tutor/st1pr3so80.java delete mode 100644 tutor/st1pr3so81.java delete mode 100644 tutor/st1pr3so82.java delete mode 100644 tutor/st1pr3so84.class delete mode 100644 tutor/st1pr3so84.java delete mode 100644 tutor/st1pr3so85.java delete mode 100644 tutor/st1pr3so86.java delete mode 100644 tutor/st1pr3so87.class delete mode 100644 tutor/st1pr3so87.java delete mode 100644 tutor/st1pr3so88.java delete mode 100644 tutor/st1pr3so89.java delete mode 100644 tutor/st1pr3so90.java delete mode 100644 tutor/st1pr3so91.class delete mode 100644 tutor/st1pr3so91.java delete mode 100644 tutor/st1pr3so92.class delete mode 100644 tutor/st1pr3so92.java delete mode 100644 tutor/st1pr3so93.class delete mode 100644 tutor/st1pr3so93.java delete mode 100644 tutor/st1pr3so94.class delete mode 100644 tutor/st1pr3so94.java delete mode 100644 tutor/st1pr3so95.class delete mode 100644 tutor/st1pr3so95.java delete mode 100644 tutor/st1pr3so96.java delete mode 100644 tutor/st1pr3so97.java diff --git a/tutor/.gitignore b/tutor/.gitignore index 7e2d3651..989a5106 100644 --- a/tutor/.gitignore +++ b/tutor/.gitignore @@ -38,6 +38,8 @@ Gemfile.lock, .ruby-version, .ruby-gemset # Ignoring generated model diagram models.svg -# Ignoring Java files and class files +# Ignoring .java and .class files *.java *.class +/students_solutions/Java/*.java +/students_solutions/Class/*.class diff --git a/tutor/app/models/compiler.rb b/tutor/app/models/compiler.rb index 8efefd12..a763d29e 100644 --- a/tutor/app/models/compiler.rb +++ b/tutor/app/models/compiler.rb @@ -20,9 +20,11 @@ class Compiler < ActiveRecord::Base # The compiler's feedback. # Author: Ahmed Moataz def self.compile(student_id, problem_id, solution_id, code) - file_name = 'st' + student_id.to_s + 'pr' + problem_id.to_s + 'so' + solution_id.to_s + '.java' + java_path = 'students_solutions/Java/' + file_name = java_path + 'st' + student_id.to_s + 'pr' + problem_id.to_s + 'so' + solution_id.to_s + '.java' File.open(file_name, 'w') { |file| file.write(code) } - return %x[ #{'javac -g ' + file_name + ' 2>&1'} ] + class_path = 'students_solutions/Class' + return %x[ #{'javac -g -d ' + class_path + ' ' + file_name + ' 2>&1'} ] end # [Compiler: Compile - Story 3.4] diff --git a/tutor/rubyJava2.class b/tutor/rubyJava2.class deleted file mode 100644 index 360886e24f4e90a403ac74ed1ab8a0c984d931be..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 500 zcmZutO;5r=5Pb`UmQn#h5I+!56N?8)IEpbbBt{K>BsE+-ZJ}aGKTK^+@L%Zx6A%6X zf0S_+jD*BJ%$t4t=FQB0eSdrcXkk}H3i%WYSW!?^QNpT%vVt{{uFKevvB{7;vOPOI zW{B&J9)r~J2NpxNYkSsJp}kP}1+ZBmT^r4)=ylBMfYB*cOGV;YUH= zI<zYps&Y8vX;rtXJ(4F>Jx!L>{j4-kP4)#h3!xF{hl%yq)L6&kMJ)4#SwKv4_ l@d+e>iC;|4P?p1sol.java b/tutor/s#p1sol.java deleted file mode 100644 index 50c30f96..00000000 --- a/tutor/s#p1sol.java +++ /dev/null @@ -1 +0,0 @@ -public class s1p1 \ No newline at end of file diff --git a/tutor/s#p1sol.java b/tutor/s#p1sol.java deleted file mode 100644 index 5d423ba6..00000000 --- a/tutor/s#p1sol.java +++ /dev/null @@ -1,2 +0,0 @@ -klerjhter;ehwf'wFJ;DSMV -[KRP[AJ \ No newline at end of file diff --git a/tutor/s#p1sol.java b/tutor/s#p1sol.java deleted file mode 100644 index bb03f9f9..00000000 --- a/tutor/s#p1sol.java +++ /dev/null @@ -1 +0,0 @@ -ksgpad \ No newline at end of file diff --git a/tutor/s10p12.class b/tutor/s10p12.class deleted file mode 100644 index bbdc219c463a98c8fd6810e95487fa08bf94bfa7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 598 zcmZ`%%TB^T6g|VM1*#w@z6E?yT!^w1V`5B9Oz@FlSm8@B{oP zftMo!1_E_uf$CfAf*ZnwE7RQ^TA{DBxU=*{8o&fRXkLGun5 zEl=Uz9H!{tAi*%fh!9^Yt?U({Gd@`m!t3Ti68gE)@@Bm%q`4DC z&CD=wN>ML_Q4W8Tp?y>>AnXJEomZ~t^cbh!Gk}*A0^I4 zA%ZUK%)B@A-t2ySzP$suz+s314g!n=ObGs!s+GAW45lYbf;(>>B_YmKEpIpLT6$0i5~8d%>9bDTCcT`o$6BbGa5R0$R^mk@m8i>PVYI5tS+_&z zl2wy`+Jtb?Y;+-SlwBJ4zUS5|f(wsldYUlmciiPGSr{C{;UC)LfL{ZTqt7VeOq{*b tSJ1X=2ORy5B|wtfj5#_OeE}3@L%9F| diff --git a/tutor/st1pr1so19.java b/tutor/st1pr1so19.java deleted file mode 100644 index b9415d0c..00000000 --- a/tutor/st1pr1so19.java +++ /dev/null @@ -1,5 +0,0 @@ -public class st1pr1so19 { - public static void main(String [] args) { - - } -} \ No newline at end of file diff --git a/tutor/st1pr1so20.class b/tutor/st1pr1so20.class deleted file mode 100644 index fd04e65020d8819f47ff98505bc7740cb0810997..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 373 zcmZusJx{|h5Pg^CgN8s#i`dx;NQ8DR>Vm`+!BEtN$q7+#l_tn>`CpwXG4KQUQHZla z3KCfI-Mx4B-q|0YZ|?x6I1bUnQGj895y8KfwbXM$Z+x~SxHrvHL5NdX7k8U=R;UM& zRm=?2CKuIGC~5Ey>FQ_M5~8%#lNU84M zN>+{jX%oUlvr&0*E6vil^Sv}y5nOmY)6s-Mx8pur6}iSK9R8s>4)`_jIQond&cxX} t-+{Ka9dPt5N!a5$`W`?ZA)`L_En~zNe2w^z(ETMO9N^Fn#vC0Cz5oF@L!kfw diff --git a/tutor/st1pr1so20.java b/tutor/st1pr1so20.java deleted file mode 100644 index df27ab34..00000000 --- a/tutor/st1pr1so20.java +++ /dev/null @@ -1,5 +0,0 @@ -public class st1pr1so20 { - public static void main(String [] args) { - - } -} \ No newline at end of file diff --git a/tutor/st1pr1so21.class b/tutor/st1pr1so21.class deleted file mode 100644 index 7258596a95e33c1193bbfc102bb945227873fb43..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 524 zcmZuuO;5r=5Pe$;rL|fF!EX^y=)ndq9xz@^JT+>9;o@n*4J_#gX%`cJmL4?m;1BRe z8K=dhlCX!Foi}gZ%1D;TPEsgl(B7L2fGIL4D2(ME@ddy6+@wYI$+SR zqbI@Ocrp~X^I$0A2R`%(sd~|f`vV@!H2wp1HIWH}?Io%+i#tiw?es_^;4)-rv>&}G zf99^w!?D{}u?)w(tOt+BR8?D%X0ZCvJRXS~nKpHD-Sbq+hJmty0~?1pV$deiK-0!C zT2z>G87g_>yWv!f)DqNxNt6g^i6h>kK@lOmTqBVRoG0DH~S7THn;GOW?vUJ%HyQ)FTT4k2mrMJ7hr8?w|U_|h*WG(fA&>Nqv2<~mt`Ug~LBI#{s_v9!H;1!kIXG t=dYlhZ3i5EOA_|Dj=l%bN64s;eajf}1z#inBXoZW2?sc|gE2=3gD(v>L$Ck< diff --git a/tutor/st1pr1so25.java b/tutor/st1pr1so25.java deleted file mode 100644 index 53d5796a..00000000 --- a/tutor/st1pr1so25.java +++ /dev/null @@ -1,5 +0,0 @@ -public class st1pr1so25 { - public static void main(String [] args) { - - } -} \ No newline at end of file diff --git a/tutor/st1pr1so26.java b/tutor/st1pr1so26.java deleted file mode 100644 index f763c3ab..00000000 --- a/tutor/st1pr1so26.java +++ /dev/null @@ -1,5 +0,0 @@ -public class st1pr1so26 { - public static void main(String [] args) { - - -} \ No newline at end of file diff --git a/tutor/st1pr1so27.java b/tutor/st1pr1so27.java deleted file mode 100644 index 4ef01271..00000000 --- a/tutor/st1pr1so27.java +++ /dev/null @@ -1,7 +0,0 @@ -public class st1pr1so27 { - public static void main(String [] args) { - System.out.println("Ahmed Moataz") -System.out.println("Ahmed Moataz") -System.out.println("Ahmed Moataz") - } -} \ No newline at end of file diff --git a/tutor/st1pr1so28.class b/tutor/st1pr1so28.class deleted file mode 100644 index 806415addceb6d427a3a1e213900c7a3fcad15f9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 373 zcmZusO-sW-5Pg&8!^UW8E8e|T1w(r(RC*CS1wB-H@wAB{Zb=i_Z2ez72_F0b{wQ&F z6(Z=u&dhr=@6GPV=i57gDUL(*a1>w|U_|h*WG(fA&>Nqv2<~mt`Ug~LBI#{s_v9!H;1!kIXG t=dYlhZ3i5EOA_|Dj=l%bN64s;eajf}1z#inBXoZW2?sc|gE2=3gD(_lL%9F| diff --git a/tutor/st1pr1so28.java b/tutor/st1pr1so28.java deleted file mode 100644 index f48d4935..00000000 --- a/tutor/st1pr1so28.java +++ /dev/null @@ -1,5 +0,0 @@ -public class st1pr1so28 { - public static void main(String [] args) { - - } -} \ No newline at end of file diff --git a/tutor/st1pr1so29.class b/tutor/st1pr1so29.class deleted file mode 100644 index bed6e62a248762a744f80ada0ab957e0f3156767..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 373 zcmZusO-sW-5Pg&8!^UW8E8e|T1w(r)m0ko-K@XK)JZ)l#Thc@}TmM&2f(L(qKT4ck zg$TN^GxOfed$arT`SuQAisKMH90eE#7!mv{Sxdbj^u}i^f_vRO7KAvJb#c4hWQDpH zS;fpSZE{hqgpvmTkgk4`Eg?!wwcc6?6DEDCY+2P(zSRINhRtsS!yNga&C7B zRkCXIPn!@fo2|-=8)=rto$sZwir~WInT{q5x*d1fy2v$7;qVX5alo&E$I)k$a3;>) t`73B=+W|-4l7v03qwfLq5i;sy-!evg!PkiY2;E;o!T}ELV9e3M;0qScL%aY0 diff --git a/tutor/st1pr1so29.java b/tutor/st1pr1so29.java deleted file mode 100644 index b61ed003..00000000 --- a/tutor/st1pr1so29.java +++ /dev/null @@ -1,5 +0,0 @@ -public class st1pr1so29 { - public static void main(String [] args) { - - } -} \ No newline at end of file diff --git a/tutor/st1pr1so31.class b/tutor/st1pr1so31.class deleted file mode 100644 index 8314e0d7ae020a9e6375e409e3eac9dd9a0bda7d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 373 zcmZusO-sW-5Pg&8!^UW8E8e|T1w-^$@lx;<^ib)=(;LLW@Zb;dM~Smh zh@cBQGw;p3H@hF7Z|?vua2R5Mg8<_I6M}!GYGtkogXzhV;Le*zNr*F5%iGO5m-=4h z6*J?kDMYmtT3P%o>geYrG`mEEoxlCv5u@1DBz46(K;9fV61tCslUEFRrS)uMl zRxvY7n_N^Yp`^h-q^qA~ONi1|PoCAJZD!Lsdu)WP2`A%+bS+*)Qi-}umRiZWoZB5j zm8=^5(`iIQ&C%9Pn%4ar7A_oQbn{ t{tDXJcEHiMBw>&1=z9QtgpB&ww~P^A@HOH;Lid-DaDYQQ7;|(m_yP!RL#hA( diff --git a/tutor/st1pr1so32.java b/tutor/st1pr1so32.java deleted file mode 100644 index e7dbcf7d..00000000 --- a/tutor/st1pr1so32.java +++ /dev/null @@ -1,5 +0,0 @@ -public class st1pr1so32{ - public static void main(String [] args) { - - } -} \ No newline at end of file diff --git a/tutor/st1pr1so33.class b/tutor/st1pr1so33.class deleted file mode 100644 index d8b1d18a27fc4397c30de56cdf59d47ff64c9734..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 373 zcmZusO-sW-5Pg&8!^UW8E8e|T1w-wz(u?3J=%Lb!r%eoTOPa`L>;LMh;K3i@j}m8B zA%ZUK%)B@A-t2ySzP$su!f}Wmjsgq=j0pa*vNLN40mJp?_p1i0@+f1i3_E-y96HdmD=}Nqcq!M+REVPn!IkP*2 zDp@u9r%ebK%|_+Ltu#yH&iB$-MR4KqOh*$2-H!WgRpc6{aQKJjIN;a7&1=z9QtgpB&ww~P^A@HOH;Lid-DaDYQQ7;|(m_yP*kL#+S+ diff --git a/tutor/st1pr1so33.java b/tutor/st1pr1so33.java deleted file mode 100644 index d7c06871..00000000 --- a/tutor/st1pr1so33.java +++ /dev/null @@ -1,5 +0,0 @@ -public class st1pr1so33{ - public static void main(String [] args) { - - } -} \ No newline at end of file diff --git a/tutor/st1pr1so34.class b/tutor/st1pr1so34.class deleted file mode 100644 index d0c8958d30c30e17d0bab4be8737ef0b9c7763a0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 373 zcmZusO-sW-5Pg&8!^UW8E8e|T1w*a3iWk9C&_kscPn)>JEomZ~ZU2`i!Gk}*A0?fQ zLIhpdnR##Kz1jWzdj9}$fx{3z90V8!7!mv{RVi~#=#5Vn1ox(Xl7u)_mAqT8GN~U# zRx&e8>s*uzp_Royq-&m4Lx|GGOkVV)si&7S_E-s35st=>=~8S&Qi`fb=0>Zkn6*2E zE?71Cr%edw^;+lhR@tR-=X-9gBDnB)rlSdiZpVGLl)1q%9R8s_4)`_jIQond&cxX} teFMF=?SP}-l7tKDqaLnK@XK)JZ<6-_`31r9^>a1dY^U_|h*RHe){p*KER5Zs&kNfP2zRq}4V%A|e} zS;@>Wt#eT>gjN>+kgj=F4IxS!GkMXIrk-BT*kdJBMK~Hirc1FANhzu#nH#ODV%F{u zx?t7lpEeatj=l%bN64s;-IlT9Grm^*N9g_%685m)4#pfE47LxSL$d$? diff --git a/tutor/st1pr1so35.java b/tutor/st1pr1so35.java deleted file mode 100644 index 0e8dd07a..00000000 --- a/tutor/st1pr1so35.java +++ /dev/null @@ -1,5 +0,0 @@ -public class st1pr1so35 { - public static void main(String [] args) { - - } -} \ No newline at end of file diff --git a/tutor/st1pr1so36.class b/tutor/st1pr1so36.class deleted file mode 100644 index 4df2b7c354caa9b3a9158fd0e869dd41bf095ccc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 373 zcmZusO-sW-5Pg&8!^UW8E8e|T1w$=(sdy1Q1wB-H@wACc+>$1;+4g^V5gML2z&CCrOA?Rmr>cDwFy_ zWF<4hw9ZAj5L#LML%QZ!HH0W_%;ZH+ntFOUV~>?k72#<7m@dUeB&Dc|WNx&oidnlu z=z>+Ff7*m_Uaxg7ZKs-+YUJTElJqnI{F?!A0eYYc3Z}Z&-hyLAEEn8NZ7-EI~a3xFxUbT1w*y~ diff --git a/tutor/st1pr1so36.java b/tutor/st1pr1so36.java deleted file mode 100644 index 89753aee..00000000 --- a/tutor/st1pr1so36.java +++ /dev/null @@ -1,5 +0,0 @@ -public class st1pr1so36 { - public static void main(String [] args) { - - } -} \ No newline at end of file diff --git a/tutor/st1pr1so37.java b/tutor/st1pr1so37.java deleted file mode 100644 index ec975b61..00000000 --- a/tutor/st1pr1so37.java +++ /dev/null @@ -1,4 +0,0 @@ -public class st1pr1so37 { - - } -} \ No newline at end of file diff --git a/tutor/st1pr1so38.java b/tutor/st1pr1so38.java deleted file mode 100644 index e26a35e4..00000000 --- a/tutor/st1pr1so38.java +++ /dev/null @@ -1,5 +0,0 @@ -public class st1pr1so38 { - public static void main(String [] args) { - - -} \ No newline at end of file diff --git a/tutor/st1pr1so39.java b/tutor/st1pr1so39.java deleted file mode 100644 index 50cdf607..00000000 --- a/tutor/st1pr1so39.java +++ /dev/null @@ -1,5 +0,0 @@ -public class st1pr1so39 {{ - public static void main(String [] args) { - - } -} \ No newline at end of file diff --git a/tutor/st1pr1so40.class b/tutor/st1pr1so40.class deleted file mode 100644 index e35f4a8d5d07699ea4253375f128ad92c7281e1a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 373 zcmZusO-sW-5Pg&8!^UW8E8e|T1!If1iWk9C&_kscPn)>JEomZ~wExSK;K3i@kCM)= zLIhpdnR##Kz1jWzdj9}0#bJmZ4gw4Vj0pafs#JST=#5Vn1ox(Xl7u)_mAqT8GN~U# zRx&e8>s*uzp_Rcuq}x8Lh7hGqJ9*KQroOzGvByfNif}Z3OqXIKl2TMfGHKtoZ3i5EOA>atj=l%bN64s;UCS8p8DAs*BXoZW347SLgE2=3gDnOML#F@$ diff --git a/tutor/st1pr1so40.java b/tutor/st1pr1so40.java deleted file mode 100644 index 74439d01..00000000 --- a/tutor/st1pr1so40.java +++ /dev/null @@ -1,5 +0,0 @@ -public class st1pr1so40 { - public static void main(String [] args) { - - } -} \ No newline at end of file diff --git a/tutor/st1pr1so41.java b/tutor/st1pr1so41.java deleted file mode 100644 index 57b7e473..00000000 --- a/tutor/st1pr1so41.java +++ /dev/null @@ -1,5 +0,0 @@ -public class st1pr1so41 { - public static void main(String [] args) { - s - } -} \ No newline at end of file diff --git a/tutor/st1pr1so42.class b/tutor/st1pr1so42.class deleted file mode 100644 index 9957c8f769be8bbbe794a5b85ace1dc125bd7201..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 373 zcmZusO-sW-5Pg&8!^UW8E8e|T1w%`3m0ko-K@XK)JZ)l#Thc@}TmM&2f(L(qKT4ck zg$TN^GxOfed$arT`SuQAisKMH90eE#7!mv{Sxdbj^u}i^f_vRO7KAvJb#c4hWQDpH zS;fpSZE{hqgpvmTkgk4`Eg?!wwX=m?6DEDCY+2P(zSRINhRtsS!yNga&C7B zRkCXIPn!@fo2|-=8)=rto$sZwir~WInT{q5x*d1fy2v$7;qVX5alo&E$I)k$a3;>) t`73B=+W|-4l7v03qwfLq5i;sy-!evg!PkiY2;E;o!T}ELV9e3M;0p@YL#+S+ diff --git a/tutor/st1pr1so42.java b/tutor/st1pr1so42.java deleted file mode 100644 index 529b2e95..00000000 --- a/tutor/st1pr1so42.java +++ /dev/null @@ -1,5 +0,0 @@ -public class st1pr1so42 { - public static void main(String [] args) { - - } -} \ No newline at end of file diff --git a/tutor/st1pr1so43.java b/tutor/st1pr1so43.java deleted file mode 100644 index 99320a70..00000000 --- a/tutor/st1pr1so43.java +++ /dev/null @@ -1,5 +0,0 @@ -public class st1pr1so43 { - public static void main(Sting [] args) { - - } -} \ No newline at end of file diff --git a/tutor/st1pr1so44.java b/tutor/st1pr1so44.java deleted file mode 100644 index c6291224..00000000 --- a/tutor/st1pr1so44.java +++ /dev/null @@ -1,5 +0,0 @@ -public class st1pr1so44 { - public static void main(String [] args) { - d - } -} \ No newline at end of file diff --git a/tutor/st1pr1so45.class b/tutor/st1pr1so45.class deleted file mode 100644 index c5e64ba3572be8e81300629dc44f53dd6a417242..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 373 zcmZusO-sW-5Pg&8!^UW8E8e|T1w*BtDqaLnK@XK)JZ<6-_`31r9^>a1dY^U_|h*RHe){p*KER5Zs&kNfP2zRq}4V%A|e} zS;@>Wt#eT>gjN>+kgj=F4IxS!GkMXIrk-BT*kdJBMK~Hirc1FANhzu#nH#ODV%F{u zx?t7lpEeatj=l%bN64s;-IlT9Grm^*N9g_%685m)4#pfE47L&oL$&|_ diff --git a/tutor/st1pr1so45.java b/tutor/st1pr1so45.java deleted file mode 100644 index 92f699f7..00000000 --- a/tutor/st1pr1so45.java +++ /dev/null @@ -1,5 +0,0 @@ -public class st1pr1so45 { - public static void main(String [] args) { - - } -} \ No newline at end of file diff --git a/tutor/st1pr1so46.java b/tutor/st1pr1so46.java deleted file mode 100644 index 9ad86888..00000000 --- a/tutor/st1pr1so46.java +++ /dev/null @@ -1,5 +0,0 @@ -public class st1pr1so46 { - public static void main(Strig [] args) { - - } -} \ No newline at end of file diff --git a/tutor/st1pr1so47.class b/tutor/st1pr1so47.class deleted file mode 100644 index eee5ad9c5f681fece17e12acf0c39ed1f9f36baa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 373 zcmZusO-sW-5Pg&8!^UW8E8e|T1w*Caq2fjG6!cK(#nUD(aZ8%WX50VeN$}tg@JC5! zqYyzCc4pq2d2e<N>$2S6MEy51;M?kpClnpRVDA%t4!(# zk(JC0(>fRBLTF|259yj`)exezF_RZPY3k|aj6GIDRfMDQW4aU@k(8n;lDW~UDrW5t zp$k@x{%I4!dA-)Tyj6B--1(kcs|YSUp6O`9pxbeuEoE+S42OScj{|-UJdQr2gfnsW uPTxSUZ9CxTw*#v`eT0nq*ligrKI3b}e}wKYAz=^u?O@E&!C(s()I+=g diff --git a/tutor/st1pr1so47.java b/tutor/st1pr1so47.java deleted file mode 100644 index cd34d2c4..00000000 --- a/tutor/st1pr1so47.java +++ /dev/null @@ -1,5 +0,0 @@ -public class st1pr1so47 { - public static void main(String [] args) { - - } -} \ No newline at end of file diff --git a/tutor/st1pr1so48.java b/tutor/st1pr1so48.java deleted file mode 100644 index 0885caaf..00000000 --- a/tutor/st1pr1so48.java +++ /dev/null @@ -1,5 +0,0 @@ -public class st1pr1so48 { - public static void main(String [ args) { - - } -} \ No newline at end of file diff --git a/tutor/st1pr3so53.class b/tutor/st1pr3so53.class deleted file mode 100644 index 90c1848d0dc49d4d81e3a6025d4ddd79816e18f9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 373 zcmZusO-sW-5Pg&8!^UW8E8e|T1%nn(6)%FPpodB?o;ESWEomZ~ZU0wKf(L(qKT0~g z3K4W+XXd?`_h$F=>-_`3B@RRMa1dY^U_|h*Wi9m$p*KF66WrV8xgf-;tc&~AGAq=h z$SP)rX_Jd;E|fI*hjjIeYza}?>Wf!3X`8Fbls%S0)`X++Q@RjqkyN5ClbKesE~j>f zP$jEI|Fj9=tXZkNxRYjS-1(jxs|YSUp6O`9pxg0~Es9*@7!Lo?90&XwcpQC331{N$ toxXuKwjFTvElJqnI{F?!A0eYYb}eJXXMBzLkI?-kBWt#VN=gi#j%kZ$v&YC@FO&Dpb=)Yaw1ls#5LX~MzyAzg|Wk(5Fg$-FU27t?l! zFa@hd|Fj9=yjq)F-YB~??tD+JRRk9v&vZ0l(CxU(mNIW}2#0@Yj{|-UJdQr2gfnsW uj^9A9Z9CxTw*#v`eT0nq*lrmsKH+P{e}wKYAz=r*?O@E&!QcxZjYG%) diff --git a/tutor/st1pr3so76.java b/tutor/st1pr3so76.java deleted file mode 100644 index be48f94c..00000000 --- a/tutor/st1pr3so76.java +++ /dev/null @@ -1,5 +0,0 @@ -public class st1pr3so76 { - public static void main(String [] args) { - - } -} \ No newline at end of file diff --git a/tutor/st1pr3so77.java b/tutor/st1pr3so77.java deleted file mode 100644 index 8f0f3b03..00000000 --- a/tutor/st1pr3so77.java +++ /dev/null @@ -1,5 +0,0 @@ -public class st1pr3so77 { - public static void main(String [] args) { - s - } -} \ No newline at end of file diff --git a/tutor/st1pr3so78.java b/tutor/st1pr3so78.java deleted file mode 100644 index 2f259b79..00000000 --- a/tutor/st1pr3so78.java +++ /dev/null @@ -1 +0,0 @@ -s \ No newline at end of file diff --git a/tutor/st1pr3so79.java b/tutor/st1pr3so79.java deleted file mode 100644 index 30d74d25..00000000 --- a/tutor/st1pr3so79.java +++ /dev/null @@ -1 +0,0 @@ -test \ No newline at end of file diff --git a/tutor/st1pr3so80.java b/tutor/st1pr3so80.java deleted file mode 100644 index f104c6da..00000000 --- a/tutor/st1pr3so80.java +++ /dev/null @@ -1,5 +0,0 @@ -public class CoolSoft - public static void main(String [] args) - - } -} \ No newline at end of file diff --git a/tutor/st1pr3so81.java b/tutor/st1pr3so81.java deleted file mode 100644 index 731c05a0..00000000 --- a/tutor/st1pr3so81.java +++ /dev/null @@ -1,4 +0,0 @@ -public class CoolSoft - public static void main(String [] args) - - diff --git a/tutor/st1pr3so82.java b/tutor/st1pr3so82.java deleted file mode 100644 index 7ae732b3..00000000 --- a/tutor/st1pr3so82.java +++ /dev/null @@ -1,4 +0,0 @@ -public class ahmed - public static void main(String [] args) - - diff --git a/tutor/st1pr3so84.class b/tutor/st1pr3so84.class deleted file mode 100644 index d990f60bc37e1f68d423cf91c49b6f17ed23dc31..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 373 zcmZusO-sW-5Pg&8!^UW8E8e|T1%uXu(Beh#6!cK(#nUD(aZ9?9P3r&hBzW)#_@j!m zQHY=mJ2UUiyf?d_oA(a@=hzR?!(M=4fDyr;DXp3-LT`MuAh_4nqa?(s((-n_%A~m$ zS;@>Wt#VN=gi#j%kZ$v&YC@FO&Dpb=)Yaw1ls#5LX~MzyAzg|Wk(5Fg$-FU27t?l! zFa@hd|Fj9=yjq)F-YB~??tD+JRRk9v&vZ0l(CxU(mNIW}2#0@Yj{|-UJdQr2gfnsW uj^9A9Z9CxTw*#v`eT0nq*lrmsKH+P{e}wKYAz=r*?O@E&!QcxXDnrEp diff --git a/tutor/st1pr3so84.java b/tutor/st1pr3so84.java deleted file mode 100644 index 43a81164..00000000 --- a/tutor/st1pr3so84.java +++ /dev/null @@ -1,5 +0,0 @@ -public class st1pr3so84 { - public static void main(String [] args) { - - } -} \ No newline at end of file diff --git a/tutor/st1pr3so85.java b/tutor/st1pr3so85.java deleted file mode 100644 index 0e3e4975..00000000 --- a/tutor/st1pr3so85.java +++ /dev/null @@ -1 +0,0 @@ -jhk'eratjs \ No newline at end of file diff --git a/tutor/st1pr3so86.java b/tutor/st1pr3so86.java deleted file mode 100644 index e531f9d3..00000000 --- a/tutor/st1pr3so86.java +++ /dev/null @@ -1 +0,0 @@ -teyitkrdyf \ No newline at end of file diff --git a/tutor/st1pr3so87.class b/tutor/st1pr3so87.class deleted file mode 100644 index 727a829e986dee9eba033cf9b22ca9c2e730b0b8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 373 zcmZusO-sW-5Pg&8!^UW8E8e|T1%vjW(Beh#6!cK(#nUD(aZ9?9P3r&hBzW)#_@j!m zQHY=mJ2UUiyf?d_oA(a@=hzR?!(M=4fDyr;DXp3-LT`MuAh_4nqa?(s((-n_%A~m$ zS;@>Wt#VN=gi#j%kZ$v&YC@FO&Dpb=)Yaw1ls#5LX~MzyAzg|Wk(5Fg$-FU27t?l! zFa@hd|Fj9=yjq)F-YB~??tD+JRRk9v&vZ0l(CxU(mNIW}2#0@Yj{|-UJdQr2gfnsW uj^9A9Z9CxTw*#v`eT0nq*lrmsKH+P{e}wKYAz=r*?O@E&!QcxeTtm(P diff --git a/tutor/st1pr3so87.java b/tutor/st1pr3so87.java deleted file mode 100644 index b1587150..00000000 --- a/tutor/st1pr3so87.java +++ /dev/null @@ -1,5 +0,0 @@ -public class st1pr3so87 { - public static void main(String [] args) { - - } -} \ No newline at end of file diff --git a/tutor/st1pr3so88.java b/tutor/st1pr3so88.java deleted file mode 100644 index c59d9b63..00000000 --- a/tutor/st1pr3so88.java +++ /dev/null @@ -1 +0,0 @@ -d \ No newline at end of file diff --git a/tutor/st1pr3so89.java b/tutor/st1pr3so89.java deleted file mode 100644 index d265f2d5..00000000 --- a/tutor/st1pr3so89.java +++ /dev/null @@ -1,6 +0,0 @@ -public - class CoolSoft { - public static void main(String [] args) { - - } -} \ No newline at end of file diff --git a/tutor/st1pr3so90.java b/tutor/st1pr3so90.java deleted file mode 100644 index f5c71b21..00000000 --- a/tutor/st1pr3so90.java +++ /dev/null @@ -1,7 +0,0 @@ -public -class -CoolSoft { - public static void main(String [] args) { - - } -} \ No newline at end of file diff --git a/tutor/st1pr3so91.class b/tutor/st1pr3so91.class deleted file mode 100644 index 1d8a2173bd67fac56b3064eb925cc99b81046784..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 373 zcmZusO-sW-5Pg&8!^UW8E8e|T1w-vgDqaLnK@XK)JZ<6-_`31r9^>a1dY^U_|h*RHe){p*KER5Zs&kNfP2zRq}4V%A|e} zS;@>Wt#eT>gjN>+kgj=F4IxS!GkMX|roNoa*kdJBMK~Hirc1FANhzu#nH#ODV%F{u zx?t7lpEeatj=l%bN64s;-IlT9Grm^*N9g_%685m)4#pfE47M3zL%#q3 diff --git a/tutor/st1pr3so91.java b/tutor/st1pr3so91.java deleted file mode 100644 index 00efded6..00000000 --- a/tutor/st1pr3so91.java +++ /dev/null @@ -1,5 +0,0 @@ -public class st1pr3so91 { - public static void main(String [] args) { - - } -} \ No newline at end of file diff --git a/tutor/st1pr3so92.class b/tutor/st1pr3so92.class deleted file mode 100644 index 005db07c97ce514765d655d063355c9945c3f96e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 373 zcmZusO-sW-5Pg&8!^UW8E8e|T1%vHLDqaLnK@XK)JZ<6-_`31cxDdI0!HdFe3O@s#5JWp*KER5Zs&kNfP2zRq}4V%A|e} zS;@>Wt#eT>gjNRskZ${|8bXvd?Zu0pHudFX#vUu7D#FqDF!^$-LF7DrR-_`3B@RRMa1dY^U_|h*Wi9m$p*KF66WrV8xgf-;tc&~AGAq=h z$SP)rX_Jd;E|fI*hjjIeYza}?>Wf!3X`8Fbls%S0)`X++Q@RjqkyN5ClbKesE~j>f zP$jEI|Fj9=tXZkNxRYjS-1(jxs|YSUp6O`9pxg0~Es9*@7!Lo?90&XwcpQC331{N$ toxXuKwjFTvElJqnI{F?!A0eYYb}eJXXMBzLkI?-kB&l&lls3r2_F0b{;1+? z6e8%t&dhr=@6GP#=KTY}Irc;Juoqw$U_|g|N~`9I&>J5u2<~RRbM|Z|b#-|$Wsj9mns6|FNSES8B&Ep<lS9Y= diff --git a/tutor/st1pr3so94.java b/tutor/st1pr3so94.java deleted file mode 100644 index 888454f2..00000000 --- a/tutor/st1pr3so94.java +++ /dev/null @@ -1,5 +0,0 @@ -public class st1pr3so94 { - public static void main(String [] args) { - - } -} \ No newline at end of file diff --git a/tutor/st1pr3so95.class b/tutor/st1pr3so95.class deleted file mode 100644 index 03a2f9514a9975b3b01d4582bea815dfd4f90815..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 373 zcmZusO-sW-5Pg&8!^UW8E8e|T1%nn3(&9z%6!cK(#nUD(aZ9?9P3r&hBzW)#_@j!m zQHY=mJ2UUiyf?d_oA(a@=hzR?!(M=4fDyr;DXp3-LT`MuAh_4nqa?(s((-n_%A~m$ zS;@>Wt#VN=gi#j%kZ$v&YC@FO&Dpb=)Yaw1ls#5LX~MzyAzg|Wk(5Fg$-FU27t?l! zFa@hd|Fj9=yjq)F-YB~??tD+JRRk9v&vZ0l(CxU(mNIW}2#0@Yj{|-UJdQr2gfnsW uj^9A9Z9CxTw*#v`eT0nq*lrmsKH+P{e}wKYAz=r*?O@E&!Qcxb`9sS9 diff --git a/tutor/st1pr3so95.java b/tutor/st1pr3so95.java deleted file mode 100644 index 32be5af5..00000000 --- a/tutor/st1pr3so95.java +++ /dev/null @@ -1,5 +0,0 @@ -public class st1pr3so95 { - public static void main(String [] args) { - - } -} \ No newline at end of file diff --git a/tutor/st1pr3so96.java b/tutor/st1pr3so96.java deleted file mode 100644 index cf4b226c..00000000 --- a/tutor/st1pr3so96.java +++ /dev/null @@ -1,4 +0,0 @@ -public class st1pr3so96 { - - } -} \ No newline at end of file diff --git a/tutor/st1pr3so97.java b/tutor/st1pr3so97.java deleted file mode 100644 index 6beb6c78..00000000 --- a/tutor/st1pr3so97.java +++ /dev/null @@ -1,4 +0,0 @@ -public class Ahmed - public static void main(String [] args) - - From 5151cd6315fcce3bbb277f9c0659191fc52fd6a7 Mon Sep 17 00:00:00 2001 From: AbdullRahman ElHusseini Date: Mon, 21 Apr 2014 20:10:45 +0200 Subject: [PATCH 229/938] Issue #208 --- tutor/app/controllers/problems_controller.rb | 9 ++++----- .../views/problems/_failure_options.html.erb | 4 ++-- .../views/problems/_success_options.html.erb | 1 + tutor/app/views/problems/edit.html.erb | 3 ++- tutor/app/views/problems/new.html.erb | 1 + tutor/app/views/tracks/show.html.erb | 4 ++-- tutor/db/development.sqlite3 | Bin 208896 -> 208896 bytes tutor/db/seeds.rb | 8 ++++---- 8 files changed, 16 insertions(+), 14 deletions(-) create mode 100644 tutor/app/views/problems/_success_options.html.erb diff --git a/tutor/app/controllers/problems_controller.rb b/tutor/app/controllers/problems_controller.rb index 41bf6630..078da8c6 100644 --- a/tutor/app/controllers/problems_controller.rb +++ b/tutor/app/controllers/problems_controller.rb @@ -33,7 +33,6 @@ def create p.owner_type = "teaching assistant" end p.incomplete = true - p.track_id = params[:id] if p.save redirect_to :action => "edit", :id => p.id else @@ -53,7 +52,6 @@ def edit @problem = Problem.find_by_id(params[:id]) @test_cases = @problem.test_cases @answers = @problem.model_answers - @track = Track.find_by_id(@problem.track_id) else render ('public/404') end @@ -96,7 +94,7 @@ def done redirect_to :back else @problem.incomplete = false - redirect_to :action => "show", :id => @problem.id + redirect_to :controller => "tracks", :action => "show", :id => @problem.track_id end end @@ -104,9 +102,10 @@ def destroy_problem @problem = Problem.find_by_id(params[:problem_id]) @problem.test_cases.destroy @problem.model_answers.destroy + @track = @problem.track_id @problem.destroy flash.keep[:notice] = "Problem has been deleted" - redirect_to :action => "new" + redirect_to :controller => "tracks", :action => "show", :id => @problem.track_id end # [Add Problem - 4.4] # Passes the input of the form as paramaters for create action to use it @@ -117,6 +116,6 @@ def destroy_problem # Author: Abdullrahman Elhusseny private def problem_params - params.require(:Problem).permit(:title , :description) + params.require(:Problem).permit(:title , :description, :track_id) end end \ No newline at end of file diff --git a/tutor/app/views/problems/_failure_options.html.erb b/tutor/app/views/problems/_failure_options.html.erb index 28ae175a..27410fa3 100644 --- a/tutor/app/views/problems/_failure_options.html.erb +++ b/tutor/app/views/problems/_failure_options.html.erb @@ -1,3 +1,3 @@ -<%= button_to 'Abort and Delete Problem', problem_destroy_problem_path(:problem_id => @problem.id), method: :get, :confirm => 'Are you sure?' %> -<%= button_to 'Save as Incomplete', problem_path(:id => @problem.id), method: :get %> \ No newline at end of file +<%= button_to 'Abort and Delete Problem', problem_destroy_problem_path(:problem_id => @problem.id), method: :get, :confirm => 'Are you sure you want to delete this problem?' %> +<%= button_to 'Save as Incomplete', track_path(:id => @problem.track_id), method: :get %> \ No newline at end of file diff --git a/tutor/app/views/problems/_success_options.html.erb b/tutor/app/views/problems/_success_options.html.erb new file mode 100644 index 00000000..fd835cf1 --- /dev/null +++ b/tutor/app/views/problems/_success_options.html.erb @@ -0,0 +1 @@ +<%= button_to 'Done', problem_done_path(:problem_id => @problem.id), method: :get %> \ No newline at end of file diff --git a/tutor/app/views/problems/edit.html.erb b/tutor/app/views/problems/edit.html.erb index 552efe0b..e8bba23e 100644 --- a/tutor/app/views/problems/edit.html.erb +++ b/tutor/app/views/problems/edit.html.erb @@ -19,9 +19,10 @@ and a paragraph to view the problem description of the instance variable @proble <%= p.hidden_field :title, value: @problem.title %> <% end %> + <%= render partial: "test_cases/index" %> <%= render partial: "model_answers/new" %> -<%= button_to 'Done', problem_done_path(:problem_id => @problem.id), method: :get %> +<%= render partial: "problems/success_options" %> <%= render partial: "problems/failure_options" %> diff --git a/tutor/app/views/problems/new.html.erb b/tutor/app/views/problems/new.html.erb index 3b0ca32b..2faf1e66 100644 --- a/tutor/app/views/problems/new.html.erb +++ b/tutor/app/views/problems/new.html.erb @@ -11,6 +11,7 @@ <%= p.label :description %>
    <%= p.text_area :description , :cols => "50", :rows => "10" %>

    + <%= p.hidden_field :track_id, value: params[:id] %>

    <%= p.submit %>

    diff --git a/tutor/app/views/tracks/show.html.erb b/tutor/app/views/tracks/show.html.erb index 9ff4b63d..f58e4a36 100644 --- a/tutor/app/views/tracks/show.html.erb +++ b/tutor/app/views/tracks/show.html.erb @@ -37,10 +37,10 @@ <%= p.description %>
    - + <% end %>
    <% if true %> - + <% end %> \ No newline at end of file diff --git a/tutor/db/development.sqlite3 b/tutor/db/development.sqlite3 index c624d4befd16aa15c9f007dc878af6bcf0b5146d..cdf0f15783ba35b3bc67b2141177f8cabc9605b4 100644 GIT binary patch delta 3935 zcmZ`+YitzP6`nI=LvZY!g*ezEwJ{V7xGI5iXqCsRy`_~3R86WD1yYlEg{m|`Rew;aX{!Ecq%JI$B6mLnYh=uTbXY90UFVa5H zLHzEC6HpSb>}o78+Ww?+0H(u%VCbBGCbATqk8Hga>Ut~Voogm~=1#u%3=(g_WyVB>wXa#yYpDSxqXz@yr%v27R@WqHO1 z*HTD)^-=AC6iHmO9LsQco-umXb((-5_p;1bakUZloa!wZ4RHze^DwL(d zL5Mguck)@uBI1e)JZr7vPMv&O&^m>zx#3?)-xOmqG{e-Hv1zL*#H6-i8KSxx4or;I zM>>N;-l2~E#YrFYHCao8?c-WkJN0XHkS`Ck4=wqvkrvA8Pax0%Ltl2cu7z&O?7v_WW+Gu!spW)v}^nIjd%x8vYMuL68 z=9AN=uaC891Hq}OX>YryXOskbds;@14zLc!yO)|~mb@!dzCkTk1v{nP$sUm;kC@&K zd$K_=Tep#;oRCwElR`+LAbR-NRAjJ!{#b9*;QYu!tKPlX*3{K@f{uxa6!NnDIO;R7IAE}A58u+4q$4Al*>5e4b0TX^JyOotK<)XYB z-bnne8>)(c-`ZYdK~d~ftVdM#!H3YB_`DDB^2N87T`h{$#!kl1mcCx}ZCC76!ZQfl z0s7*9EqO`lj`fRAhu|+TAa1`1--p5Y^(X$Iu-K3&KLfYnMe+U__z9ejzq92>$~R(X z;_nuJ`NLtDg0qRxFw_B@O9(&wN`~QhJ1i8%_Qw3;HvxDJMua~IcVJX}bqs$65_iYo z8GvBo)AO(sU@YjY1W-pwLZ?72=l{cUv-RD#z%%TM})wDE5blW1s#p2!#?DN-e zfa`E33Y~BVquX3*_>jpg$2L*h_u*1!W%Y`tD6I`OY#tHa<!*KqOP&1QQ#42-1QgPX3sqC`rt}B3p>6CiCtQq@2 zE0bN4*nSUu;_}DvLV9N==9_S$=k3gNGy`+)P?bKOY<*iwrDvX2k!Yy$cxLCrBcb4Q zAQ%~q7AYC2$@PTdW$GF;Er;gHT3LgoCk2+;RA*EK?!j~E)L57rZrk}}V@Rg0JB*3D z_rRMj3sd8cMfH5T(VChzGi~*{v=?ijdf?=?QmG;veRLuk3a-a47mVF*(0PN&G?Or5 z=ghBML`sqRvtjq@2jG4iT?hncq8sL7-=NpG==Za5)6r?)M5||x z_IZ8UoVP975^d`WG@ZZDHFQ!V{r;eKe0C@j(gV{+Ct@|QOR7ThuqUt(re2Wur3a&< zktF5$a)m*p5Krd!%adgm9Cb5T}5mehy%B_&*q@@LOyqrfUNto)>46ltU}>fgY^%!TmWV0gSc z;0%POoN<3JV)t||GzTus+P)Jrkxpa4S~Qw_{r&arQ<24q-bre;&&8gCO6jR21If$d zsfrbgZ(fuuLK)T>s&fJ5#voD%$qiz0)F1oiLw@~ta=_*ohNItCVE>Ut*u1i-F z)tGLQO?s3(?BhI3A>uSz8!5@9I9;5AC&mndd+uG|`EgvSZS75YmzrLQXtu+#7W4WJ zPrrtZiDAO~u54$m8NO;1>Itq9>R1jJ*EU+C+FN!(;d5-p30r$l{;@ii+6B`XGtqTk zBs7CO3tJ`Fw$0;_3)$cxuvmT>;nOK(?E`s>yX2VUdR3is9a9e?``jhM59K}C7G`*Y zp!qIPrx`IBCF0cw@`1Eqp=6+%@B*WfqczGTS8q$LNOzN{eJGck1!7L>2xCZc&dkQ4 zqZ18}^tvSy7+rQf(_+-gAA=MR7wZTnczwOq;bQmO#mbS)JBx{LaF(tYknIf8Ba54= z@)fbHDw%f{Q!_X!+NRi&6_`Q98>;fPGlCu)RxCGMNU$2k0hmsN_b6Kd zW)e$#mH)_3gtu0Fy$WI#;`9AVg^2H0`e0W4eZO)I<`UnlRb&O`#Y=~js}K=-o$^PB kCjMKe;30NF96GE#f<T};bOcywlSDGvAqzm!G-ahxt%l41+OvSyVn@om?Xq&@2+jU>oxW+ zwrN_}ytEIkQdqU8v{D06)2gikscF4Us|ebt4^(QJst=9S66GZ?6#}BFeJE||zut?$ zGow8#?SB9H&v*X&T==x?!lz~5tf>?i1wqhpHQ)kV4=?W5L~-%r*fzNTv$IQbuEktcGErl3NCAOv#gp0_lBEKp_6F)73Crbx6si?<5 zj?PU5guf|+U6e-inYxn?>d7Iib8Y z?rf)8mmW;c4VnIlWTaOMj}Q4z&<^Fee?|$gY13?5jj z7<0*i!>l_pJ$x=Q(iLGbffJ?t!!Ff^j; zE-`5-IfS^8h(vn^ySgIw#NTENCc_Keqa%^!k;ya4c!C~2G&z56B$=@1 z$>J0pn(Hpb!zFoDknhQVl`|e6{Ij|8j!-FlAP66T1-HaX>9q~pcvS%2$=nP;eF?A| z6+Q!`)X;gpV;DXLA@lh#WS{g#&y|u?LrP4aD*Iu{>)w=<@sC0UKuP*9rEf@q)KmPk zlkjKQz~6fbz5yH4Ki%|u$x3bFRju~--4RV<~TH~`LNa%RaI@a-VK-@ z1%!{i348O>n!-$r>4qZ$)dIrbMQJOSV47lCR5hK&0i|<@$MY+p#B)OMobdk5doJU> z0$m<)OyaLygQgZ;bRI(#Q#TCi%vquA^n9*Ci+ zl&H4N&!Kd&m@ti6hBKM)3|qH!qK=j17#gk&EvBk22F2Y5rMhKeF#Z-9j`6pyLsi=6 z>slFu@(kR9q&LeK(~v2YQd_5v`(sr#Y+~3N|Ne(im(L_y(KJK1*E&A`$%1U+5> z{e4-Gb9=Kv3V z0x#qpZYY{fC|Q3QWI`3yFl@^B?N6XBYe0;21G|SwG-nPFOR)(SeQjJU6Y3A*p_|t% zI3FL6hGRbM_|)`*4?kza^UJ=e;C#pz$UzSBm`w~Dg85|ctH>UYhgc-b3Dr;IMZ#~5 zm9KmR<-Y*&D}{it6&-`hE$?i_WHu#~|Hv!W=5MbmXh3Sa1lOsU5Z zPGqrmf6m9YLJgG~>ut3rokQ>%FW@z7enS@bP0huYZKE82afg3(7+fCs!272zg;itMQNf@EPW17 z;Tae?gt1khc(;&Z6sIlQa_Gie7m?P5L^2efO+3~xgJ(vj+rz!FsoCyc=GWLv-;%#a ziB7il^wBekXh)Zy9aH0qLI>NE<7ehZ6MA1)Eaih5p%#rO;}ZDHL2-AnV`6^dT(*uf zlE5%sLx>BBeyc5VB#`KwJ#!?g97|4zl5u;vKR%r7B7=#po>~9IOq;%Rq&ZASjt(2+ z1MSfh!C1Coit-&nzK>r*#@i}Bcrnj{W=pr_HqRE3)*qXIK_VN2`v9Esl zyjUI0MIlwNnp=)Gu;z~(LY^eCtelPX_fEvxdm^KUwR3$#=0IdIIn)vANyOTE2m8V} zNc8p0&&|Z9=JfHCGs*<(KD2s4Eb)~}-i+YQ$S=#KH!6HT_6`m}sZiaReG~BemwYey z)TwYZ8uyLF=c6GXap?#erlW>~>^i?;VCsrxn9Q28eOIiJ^Jl0yonk$4sj*Dau)9#3x7`$JQQFiQWiH(l zUo|vLYlB~XTw15LrMq-!im9$)_^#d(zbi)ysm@I7z%KkvESOp3dDtkx=FNV;i)Br; zAI^}@v#^BZkkyaG4dtbm1n(vJmvUTgKo`F5<(KY>jd=qa7)hwZrD|j|TVtk;20V-g z^z*&<#VS*BcoEwNV^nwR_?QtoGZ^EY_r#sq_nNh4gR_N3T%rMk+SVE2bN9uadD9!% z8f=xibX2P71~qlE`asm`^MeZx7+43~%uzrFM1EbCp5aTfRCo)*xydBNr4VAv$|3w6 zS^8q05Ee%q09{%oO6QQ(a>*=*#*F2Y7{Jq+_)cjfz%!Y}UDAKWO|=`VpR0vbHUE5% zRL#?Sq+zJzf8Qfrh5F3b8zfNzAAe(?bOm;DwMqH|?8^MFNy54KS-x+-^aytIeFvlm Ru!q+u(x0Fqb61h7;Qs@BrF{SZ diff --git a/tutor/db/seeds.rb b/tutor/db/seeds.rb index aa0556ef..652305ad 100644 --- a/tutor/db/seeds.rb +++ b/tutor/db/seeds.rb @@ -89,10 +89,10 @@ Problem.create(title:"Problem 5", description:"This is very easy Problem") puts("# -----------------------Tracks---------------------------") - Track.create(title: "Track 1", difficulty: 1) - Track.create(title: "Track 2", difficulty: 2) - Track.create(title: "Track 3", difficulty: 3) - Track.create(title: "Track 4", difficulty: 4) + Track.create(title: "Track 1", difficulty: 1, topic_id: 1) + Track.create(title: "Track 2", difficulty: 2, topic_id: 1) + Track.create(title: "Track 3", difficulty: 3, topic_id: 1) + Track.create(title: "Track 4", difficulty: 4, topic_id: 1) puts("# -----------------------Solutions---------------------------") Solution.create(code:"println(My first solution)", length:5, status:0) From ebe72095bcd232233371f9d912a8847c826278a1 Mon Sep 17 00:00:00 2001 From: serag Date: Mon, 21 Apr 2014 20:11:02 +0200 Subject: [PATCH 230/938] Controllers fixed --- ..._controller.rb => lecturers_controller.rb} | 6 +- tutor/app/controllers/students_controller.rb | 6 +- .../teaching_assistant_controller.rb | 7 --- .../teaching_assistants_controller.rb | 7 +++ tutor/app/views/lecturers/index.html.erb | 8 +++ tutor/app/views/lecturers/show.html.erb | 6 +- tutor/app/views/students/index.html.erb | 8 +++ tutor/app/views/students/show.html.erb | 8 +-- .../views/teaching_assistants/index.html.erb | 59 ++++++++++++++++++ .../views/teaching_assistants/show.html.erb | 15 +++-- tutor/config/routes.rb | 4 +- tutor/db/development.sqlite3 | Bin 200704 -> 212992 bytes 12 files changed, 103 insertions(+), 31 deletions(-) rename tutor/app/controllers/{lecturer_controller.rb => lecturers_controller.rb} (51%) delete mode 100644 tutor/app/controllers/teaching_assistant_controller.rb create mode 100644 tutor/app/controllers/teaching_assistants_controller.rb create mode 100644 tutor/app/views/lecturers/index.html.erb create mode 100644 tutor/app/views/students/index.html.erb create mode 100644 tutor/app/views/teaching_assistants/index.html.erb diff --git a/tutor/app/controllers/lecturer_controller.rb b/tutor/app/controllers/lecturers_controller.rb similarity index 51% rename from tutor/app/controllers/lecturer_controller.rb rename to tutor/app/controllers/lecturers_controller.rb index d6fe74e2..096e7bdd 100644 --- a/tutor/app/controllers/lecturer_controller.rb +++ b/tutor/app/controllers/lecturers_controller.rb @@ -1,7 +1,7 @@ -class LecturerController < ApplicationController +class LecturersController < ApplicationController + def index + end def show @lecturer = Lecturer.find(params[:id]) end - def new - end end \ No newline at end of file diff --git a/tutor/app/controllers/students_controller.rb b/tutor/app/controllers/students_controller.rb index de83ebb3..bd7f3e35 100644 --- a/tutor/app/controllers/students_controller.rb +++ b/tutor/app/controllers/students_controller.rb @@ -1,7 +1,7 @@ -class StudentController < ApplicationController +class StudentsController < ApplicationController + def index + end def show @student = Student.find(params[:id]) end - def new - end end \ No newline at end of file diff --git a/tutor/app/controllers/teaching_assistant_controller.rb b/tutor/app/controllers/teaching_assistant_controller.rb deleted file mode 100644 index cf5149bd..00000000 --- a/tutor/app/controllers/teaching_assistant_controller.rb +++ /dev/null @@ -1,7 +0,0 @@ -class Teaching_assistantController < ApplicationController - def show - @teaching_assistant = teaching_assistant.find(params[:id]) - end - def new - end -end \ No newline at end of file diff --git a/tutor/app/controllers/teaching_assistants_controller.rb b/tutor/app/controllers/teaching_assistants_controller.rb new file mode 100644 index 00000000..f07c2afe --- /dev/null +++ b/tutor/app/controllers/teaching_assistants_controller.rb @@ -0,0 +1,7 @@ +class TeachingAssistantsController < ApplicationController + def index + end + def show + @teaching_assistant = TeachingAssistant.find(params[:id]) + end +end \ No newline at end of file diff --git a/tutor/app/views/lecturers/index.html.erb b/tutor/app/views/lecturers/index.html.erb new file mode 100644 index 00000000..05ef7fb7 --- /dev/null +++ b/tutor/app/views/lecturers/index.html.erb @@ -0,0 +1,8 @@ + + + + CoolSoft - Java Tutor + +

    I am a lecturer

    + + \ No newline at end of file diff --git a/tutor/app/views/lecturers/show.html.erb b/tutor/app/views/lecturers/show.html.erb index 55a56cbf..b5386660 100644 --- a/tutor/app/views/lecturers/show.html.erb +++ b/tutor/app/views/lecturers/show.html.erb @@ -1,8 +1,8 @@ -< + - Hello I'm a Lecturer - + CoolSoft - Java Tutor +

    I am <%= @lecturer.email%>

    \ No newline at end of file diff --git a/tutor/app/views/students/index.html.erb b/tutor/app/views/students/index.html.erb new file mode 100644 index 00000000..0a3bb0ae --- /dev/null +++ b/tutor/app/views/students/index.html.erb @@ -0,0 +1,8 @@ + + + + CoolSoft - Java Tutor + +

    I am a student

    + + \ No newline at end of file diff --git a/tutor/app/views/students/show.html.erb b/tutor/app/views/students/show.html.erb index 16db1565..298eccd4 100644 --- a/tutor/app/views/students/show.html.erb +++ b/tutor/app/views/students/show.html.erb @@ -1,8 +1,8 @@ -< + - Hello I'm a Student - + CoolSoft - Java Tutor +

    I am <%= @student.email%>

    - + \ No newline at end of file diff --git a/tutor/app/views/teaching_assistants/index.html.erb b/tutor/app/views/teaching_assistants/index.html.erb new file mode 100644 index 00000000..22e306fc --- /dev/null +++ b/tutor/app/views/teaching_assistants/index.html.erb @@ -0,0 +1,59 @@ + + + + CoolSoft - Java Tutor + <%= stylesheet_link_tag "application", "bootstrap", :media => "all"%> + <%= javascript_include_tag "application","bootstrap","jquery"%> + <%= csrf_meta_tags%> + + +
    +
    +
    + <%= link_to image_tag("logo.png" , { :title => "Java Tutor!" , size: "50x50"})%> +
    + CoolSoft - Java Tutor + <% if signed_in? %> + <%= render "layouts/signed_in_header"%> + <% else %> + + <% end %> +
    +
    +
    +
    + <% if signed_in? %> +
    + <%= render "layouts/right_side_bar"%> +
    + <%= render "problems/system_recommendation" if student_signed_in?%> + <%= yield %> +
    +
    + <% else %> +
    + <%= yield %> +
    + <% end %> +
    +
    +
    +
    + <%= render "layouts/footer"%> +
    +
    + + \ No newline at end of file diff --git a/tutor/app/views/teaching_assistants/show.html.erb b/tutor/app/views/teaching_assistants/show.html.erb index da0b698d..c0cb5ab1 100644 --- a/tutor/app/views/teaching_assistants/show.html.erb +++ b/tutor/app/views/teaching_assistants/show.html.erb @@ -1,9 +1,8 @@ -< + - - Hello I am a TA - - - - - + + CoolSoft - Java Tutor + +

    I am <%= @teaching_assistant.email%>

    + + \ No newline at end of file diff --git a/tutor/config/routes.rb b/tutor/config/routes.rb index 7075b636..dd86ad5c 100644 --- a/tutor/config/routes.rb +++ b/tutor/config/routes.rb @@ -13,13 +13,12 @@ post 'courses/new' => 'courses#new' get 'courses/sign_up' - # You can have the root of your site routed with "root" root 'site#index' # Example of named route that can be invoked with purchase_url(id: product.id) # get 'products/:id/purchase' => 'catalog#purchase', as: :purchase - + # Example resource route (maps HTTP verbs to controller actions automatically): # resources :products resources :courses @@ -88,5 +87,4 @@ # # (app/controllers/admin/products_controller.rb) # resources :products # end - end \ No newline at end of file diff --git a/tutor/db/development.sqlite3 b/tutor/db/development.sqlite3 index 89552ecb87e86bdb8b45e229820c4207c04c8247..787bda07a4d857bb724d1f36400e23df8c49c314 100644 GIT binary patch delta 8067 zcma($4Nx5Cb^Gn!0e5iwfslk`g|bG95vf@1|Boh)eF7w5A$0sB5Q5`wfrH}?-5nsX z-4l}CPNOuDbrWxtc4E89s7=#kT;T?f6Q>%_c-lD4k5eb=jFWci%rs7#)N#jdn%a%~ zc8|k%?4o$#e)itC@4fH+zxQ2yvg+c+z}35Upko9EF_C(6@o;m+0*79Tbl;sc>X=Y(ABoN*U>NESX4?ff}j-rIYc6jCD)- ztEs*DWob_prs@$ao`@TBY40AIlF?!~6$``tSOgXWwpb#QrgjCW!)VUPOedpb^Wjt& zz8a}CMORUGql}Txj77rfgpsCdDyb$kmy8l+gSWQi*j;47D-c; z71TbIGUnqkBklE-!pP+vZ0{ao2 zJxlqCeVFtSaxmCx;}*s8f9ac!r5X6oQ)4pIDZ_B8Nn;gJ=;!^oU-pN&XY_cnPK`;%S6%017Levj}t{NITH#~nUA&9pME2)xNs&nNC&%r;dLMYZ`{{BMX zU?a)7148%!&mCAfKQlWQK0m31CkKvQU=O#+r@OM;f_OAEx6;+83`CEfI+GEX<#1Pm z9|~$c7cNA^)LgNu3PdCk=$ELf08w>W0yP$;h*AhIs4NG6{Kl6o%dggxTO~kLSmL;& z1T;wyG?##-up1CJ38*r+5Iw2)s~rk=VNx6HooSMnRU^_i+j%_QKcz(mx#UvU(%e+% zvDS(9=u&If`Toh%z{-=kn(9Bh_B~GpiC-n~f8tjmSbP`rcJ?eGMAlHvzEbJuW6ZA! z{4V}AJoX>h=b;EhQWW94$)V~Gmt7~y$t*!;$^W7rqQ2wR==*Tp);})d`if_+CNZUw|6hP z>@{EMNAtOlL&k~CO_`y7wBP*80n{Q*4wl!|*Q3h~87pgsGZ|xUK9eqd3avfu!M=8; zFL<=GooU?o*$gI;VtPkVt@-dUxp)6$I2MPL)yP1aG^UKyA*M0C5Q#tn-~7pZc??N+ zQ$B+7QO|ltyq>aMWjD%~E6OUq@4Mo^$A7Ex8&$94KL)OULbk3R8Y-`g)T31+mWUb` z?6e=HV-JRKd|NT6_ASR|Qm^pX2&3%5njvG|2m4^^)*Gy>+0&zBQ3eFd8R8O zVUSZYwQPpQ(9`}$f6pkdYiK|pugrZDEtl%(t6@}Ev5<%@LO~ES-|Qx9*S{S`Uqfgz z_W)Wz{xuY$pfbSK1b!Ni<7yBfiL+f)1;N|l<&<6Ygf?p)#w8G2S;&f$#XfA8d3*uV zMQ)4FCG?3|R+VL4cE&M4n1^&hfw>KXu20FTDhjR)<{^Q=b3|ES$j(uLp)&eM^a{NP zWYHFw90#K#x{(!YdzaH--fVIq!_KF`R^y3-O}*Wn%tRQjXj5~G=*-@{zzTxSahg*) zI;-gtuUY#zm#e8B&W@LTa8e58L@2PTC@N476a`aT5dsG>4x+y>?!5zr?3Ufgt|Vkd zkvON2fdmxv8n2Ff?m%J-1*t?{*}TyREYu*n>=YP~;3ZL0xiP3&iEem(0F}7d7tiX7 z%5fz*$09v@gx6V#6IE3iLm!-iQx=fcA*su}OW~kH!iP(+;y9-NiSPuTA_7n082u;o zaj>_?AieKLRbUaTLFDt*2ZM!jJTq-Dld)7f!&r?16SF@KL3wTzY9zaA2R~nCrlFE# z(n$d3OZo5wn5?}tHVMy$^3iW+AzPN1OV;ksfK8Q?RHw%X5-Wml>U^8061cRQJkUZ2 zSSm^GwkA29Re4V1oc6d0X@e551dHfYJ1mwJa9>vfc?jTm96acg+0VhZ)t#g*!2Njv zc7U+b%=>bI>T=dF<{{VQsOyI#UIaRQtOcZ1^o{e~c-hEr?$pu5RC1r%u z%LO}ei2^b!a~#x-PHF-Ru}4yrX%7(T*h)kKBH1*v1VXiTG+FFlFXG##21=YF6C&;*U=r@$%g{ge>l^GYh-P7x(n zLTUqegywV!(37A*%gf)GCz%}qyhwQIVS*mUYnZ2hLH`BV$_YAq65`Tcg0KQZ4-5~M z`8!#p1_7CKdJV6!;M*cEw?Z-iWR?Tl$YjU%p*xUyp5L_U?E52}O;9Vu`(i9E1UXhz z;JO2(6_RW*5|=82V+F2JkzGt2SP?i20$aHkOk5v12??TDOv1Kef@e8!Tqt0+=1dTi zCRzdv;1kflUM1*X(pT~4K@XSc>>ZNSvX3cdMZQ?u8_pcU{( zFen!bkXT(*G)+DO!wqYK=7X-T2zfsG+qmzANmjGh$+7}|DXFS6BS8>SMQGHmC@=yd z8XO&g;ZG2utvkp}$L!ou*Z}3?{m?K8q6SH9tH=b1LaL_g%FU3cx`L#iBk(Bw97yad zbas^??;`4fJcbus!C;fsx#s(}-uwhhm~^1zRM?WryUl_&A@^_8??sL4viv|t&wvzVWt6!+vxrK zve(N0$5-Kdr}AJ`GB6W(kNyoP>9Z8I+BjvRDEb1LHg81HEfh1S47i(FubM=6AvC+* zG=*xB|56}cUf0xwE}t>mrqR4PFhcG&pP5FN(448p(3`%GB=X&gX!0{?$c9^OWA5e3 zTJx7NM4Q)V&^2FM(rz6e88M|-+3vCPbDDT`fKMg5QY-PH$-`QIXQ$B@ zIvzP55%p}0*XOy=K%`?hKHDvv=#H)!9UdcC~GSmz+Zt7yiU;T_$>B=9==FtyCF)} zHRX$@3(UO?H*Lh@NoFvaibomVCGZN+rYfS~lm+w^F!&X8B?K`MP}*v>PzuE;x1^*j z)K<`rN}yV6n7n0{ya@?Gq9{hm7o&7q3p~fG5>(7?81oR|t_NPZoz*9=jeB6I{~Cdx z!bj=XKrFA&*>hGV4T4ypb+C>a@^vIswD~(GYNR8n*t~TX;vys7D&G{rS%gDvtH>h9 zbE8&j4HCWr{>?he#xG=x2{<=l^`VfSoZAEZlE&+*K5A7sfFE+7jWJ(h75L|W7y3ic z+3BFntqKu9`y3j+(jM`zXcr%AO}9a0Qo4)%AwJ4 zeOh64U9{x6l^ebQ0h{;1Swqor!iUN{K2$hP2+;pVc<5^ceGNa0llUHB_!8ZF$~ydj z+QV)St@AEs`!bN1q1Y2(zU$xtBmxs=7;b|xwdZQ8gW2OAz>D%8)o0_CJg(_q6lKn( zngfg=VHjx~w+@y{5Q&tFa21x~g*BrxSFC-9f?FfIo<{stllxQYzB2iyZ2r+%%QhkkB@F6iV05o%|L zEcpVY+d56#7G+_l`HkA0HascHP!Dd2E>>_UK)S&rw#VrVXYe2oHK6RQFgGEV6A)|O z(0lkpRcM$fi}^-<-}9dj#AqM=L+^}dh590S4Gn{sjv(rioL&FcIZ}piJO5z)nNe~l zqE@>eHh*%K{0_A`_mKIG5cz=l$x*V>JaLx1PCoRY`PMM`uK&^V89TpUkcasU7T delta 3298 zcmaJ^e{2)i9lv+)9Q*w11t@iaWi}*WAmnntf4Cb>AS4h%Z1Mv_D1_iRaYAe-K08@L zC*#nvX`rfL(VHf%>()x^v`#9dTBfmyZGWsQMWfn=*rt{JkT$K-C}rJRsi3lV7vlWh z`R;q~-uLPA{qf%ShfkgIoO;>)!rGNYfglJDKQq_R`EC3Yc(&?q>uq?BL?4@+P3S)Q z*h5_!If=?P^OCd$&-wOX@_5LDDMYsjyyAUyYjQ>8ZB)4BuW~|k)114B{)y+_LWP^v z)l<}m;4|d@2(Q0Jplj$K==YfS6C}9-ECYHb+Y?J>bjl5(pB{`wGud=3t-DCL4n$Mg zv>wy#SeA!=v~coa*cMo6_gp8?o2Uo*yub90c{h8mPp%03(39)5JBg|_Bv?h%);6SL zu@iwvynisIr-tHVL-9e0-Q3`M@h6{-rBdVIH%pxx0?6ocvC;#ew!@nw*XO+L{VH4(cXLXCrx94%S$NoaTvX@m>T+PLtY8(E0-NSse%VzD zXnZX1qQd>FG(N_6&13vubQjP475OO$X#gn_QxXD5(@yLB-!T{c2i?Jo{*1gO6b%4` z){7)3?_Vt~1s)6Ye8hJ77*+ZT6$z98w33l;={dSiuX{kC2iPYBu@XD* zUkLl3pf5+L(yc4O8w7ZREGK_JKBW3>*Ghh8A9Vz1j{b%7qHBZe1NV15J3N2#{t=Pq zFKqV?1G}%f8st}Gx{nVI8@U#+)+Ad@^3jy}Nx=y_Gx@;d0A!%rxDo~50jzPf2fXIs z?7nsDz-hgZa=mW+I0lXY-gu%HyZ{8_d%fT{Ks27|1LuHL_`c&BDa*#qIQS7zjOY8o zH-K9BY01~glUm`b?Y?uOJY@IzeBjxQg)7w0jhBv+hhIDfY+>RCLEL~}fuB*Y*m_E6 zdxaxJi_V~HtGnQN-dm1n%l;G{0hn^^R3W zVJp<;3*6{@PI}Vr^ZUWqw8Gn9%sAQx))dZp_Zr_!0N>P&1h@jg7mTwhkcIgTUo@_^ zlCOg8Mo%00Gw_tLu^oTaOkHay*8)&G_4fnhD&WkI?y&oUL2$atAUnt*ds_hiJ^?X zA<&=9#QI|CZGjEF-Ti~O3M}Rs?;a+<4eE{b)8wb1!AKk-3v_h%^gfjt^ieWN4W;yq z@l-iHL1*?@R-aZ3*hOA6Uh5*Cb`YhOA948MNS_mxW@JuMkq7<@@4A40A=gd069oFa zSMwZjCvfB*ap&^ARN1_(A#nV1v++9<89W={v=A?aB!!U_P37eI9Dxl z4?of{lnn2Qjx{wlkV{KaRC$38)7q)3tg%8dT#JMJF}T>$T+lL=HdED%7)}ZBxbg`h zUSKp;5#`z3G?$}^yukJ1%3foVIaUtzaEF?k(!y}ER#9rBzsC@Qx+r)XPokUvf?HnMU#8wE8NVp)dQG)-3K zixE_lBZ#UjN|`wBKx!;H$IM>6Z}d1@H_|CFEw!4~(^SnwcQVQGp44b;w;ay$qX#`W)=#uVRpCZ}j!aggroWRYtDAU~<7m~IrjG#)AAQnw44$S&N zp*IQi4!Vb1#P@K#zKU{>Lk=vCFKPu0f_Y~Vu7Z_d!N!qhg_>if+55VIg8&X{J9Wv{ z;^=gIO26g2=lan77tbZ{ufQ%MglOU&b*rY>%Pj{!I#wND*c4<+#8F_Lmq=nk&% z=o9pBt9yD6t)w6UD3d^wkhtJaKD-J7I3e52{~epHq&)es%T`)U)Kzm6wKe-cb~HQC From b54542add2ed057bead1c58ab54dca94b12711c1 Mon Sep 17 00:00:00 2001 From: Ahmed Moataz Date: Mon, 21 Apr 2014 20:11:21 +0200 Subject: [PATCH 231/938] More modifications and improvements --- tutor/app/views/solutions/_new.html.erb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tutor/app/views/solutions/_new.html.erb b/tutor/app/views/solutions/_new.html.erb index 6b3be578..e7bcd6c1 100644 --- a/tutor/app/views/solutions/_new.html.erb +++ b/tutor/app/views/solutions/_new.html.erb @@ -33,6 +33,10 @@



    + Output:
    +

    + Output response +

    Console:
    From 53cc3575c416131eefe915d25a1a987ff5a7cedd Mon Sep 17 00:00:00 2001 From: AbdullRahman ElHusseini Date: Mon, 21 Apr 2014 20:14:06 +0200 Subject: [PATCH 232/938] Issue #208 More on Linking with track, Handling failure demos, delete problem, Save problem as incomplete --- tutor/app/controllers/problems_controller.rb | 9 +++++---- .../views/problems/_failure_options.html.erb | 4 ++-- .../views/problems/_success_options.html.erb | 1 - tutor/app/views/problems/edit.html.erb | 3 +-- tutor/app/views/problems/new.html.erb | 1 - tutor/app/views/tracks/show.html.erb | 4 ++-- tutor/db/development.sqlite3 | Bin 208896 -> 208896 bytes tutor/db/seeds.rb | 8 ++++---- 8 files changed, 14 insertions(+), 16 deletions(-) delete mode 100644 tutor/app/views/problems/_success_options.html.erb diff --git a/tutor/app/controllers/problems_controller.rb b/tutor/app/controllers/problems_controller.rb index 078da8c6..41bf6630 100644 --- a/tutor/app/controllers/problems_controller.rb +++ b/tutor/app/controllers/problems_controller.rb @@ -33,6 +33,7 @@ def create p.owner_type = "teaching assistant" end p.incomplete = true + p.track_id = params[:id] if p.save redirect_to :action => "edit", :id => p.id else @@ -52,6 +53,7 @@ def edit @problem = Problem.find_by_id(params[:id]) @test_cases = @problem.test_cases @answers = @problem.model_answers + @track = Track.find_by_id(@problem.track_id) else render ('public/404') end @@ -94,7 +96,7 @@ def done redirect_to :back else @problem.incomplete = false - redirect_to :controller => "tracks", :action => "show", :id => @problem.track_id + redirect_to :action => "show", :id => @problem.id end end @@ -102,10 +104,9 @@ def destroy_problem @problem = Problem.find_by_id(params[:problem_id]) @problem.test_cases.destroy @problem.model_answers.destroy - @track = @problem.track_id @problem.destroy flash.keep[:notice] = "Problem has been deleted" - redirect_to :controller => "tracks", :action => "show", :id => @problem.track_id + redirect_to :action => "new" end # [Add Problem - 4.4] # Passes the input of the form as paramaters for create action to use it @@ -116,6 +117,6 @@ def destroy_problem # Author: Abdullrahman Elhusseny private def problem_params - params.require(:Problem).permit(:title , :description, :track_id) + params.require(:Problem).permit(:title , :description) end end \ No newline at end of file diff --git a/tutor/app/views/problems/_failure_options.html.erb b/tutor/app/views/problems/_failure_options.html.erb index 27410fa3..28ae175a 100644 --- a/tutor/app/views/problems/_failure_options.html.erb +++ b/tutor/app/views/problems/_failure_options.html.erb @@ -1,3 +1,3 @@ -<%= button_to 'Abort and Delete Problem', problem_destroy_problem_path(:problem_id => @problem.id), method: :get, :confirm => 'Are you sure you want to delete this problem?' %> -<%= button_to 'Save as Incomplete', track_path(:id => @problem.track_id), method: :get %> \ No newline at end of file +<%= button_to 'Abort and Delete Problem', problem_destroy_problem_path(:problem_id => @problem.id), method: :get, :confirm => 'Are you sure?' %> +<%= button_to 'Save as Incomplete', problem_path(:id => @problem.id), method: :get %> \ No newline at end of file diff --git a/tutor/app/views/problems/_success_options.html.erb b/tutor/app/views/problems/_success_options.html.erb deleted file mode 100644 index fd835cf1..00000000 --- a/tutor/app/views/problems/_success_options.html.erb +++ /dev/null @@ -1 +0,0 @@ -<%= button_to 'Done', problem_done_path(:problem_id => @problem.id), method: :get %> \ No newline at end of file diff --git a/tutor/app/views/problems/edit.html.erb b/tutor/app/views/problems/edit.html.erb index e8bba23e..552efe0b 100644 --- a/tutor/app/views/problems/edit.html.erb +++ b/tutor/app/views/problems/edit.html.erb @@ -19,10 +19,9 @@ and a paragraph to view the problem description of the instance variable @proble <%= p.hidden_field :title, value: @problem.title %> <% end %> - <%= render partial: "test_cases/index" %> <%= render partial: "model_answers/new" %> -<%= render partial: "problems/success_options" %> +<%= button_to 'Done', problem_done_path(:problem_id => @problem.id), method: :get %> <%= render partial: "problems/failure_options" %> diff --git a/tutor/app/views/problems/new.html.erb b/tutor/app/views/problems/new.html.erb index 2faf1e66..3b0ca32b 100644 --- a/tutor/app/views/problems/new.html.erb +++ b/tutor/app/views/problems/new.html.erb @@ -11,7 +11,6 @@ <%= p.label :description %>
    <%= p.text_area :description , :cols => "50", :rows => "10" %>

    - <%= p.hidden_field :track_id, value: params[:id] %>

    <%= p.submit %>

    diff --git a/tutor/app/views/tracks/show.html.erb b/tutor/app/views/tracks/show.html.erb index f58e4a36..9ff4b63d 100644 --- a/tutor/app/views/tracks/show.html.erb +++ b/tutor/app/views/tracks/show.html.erb @@ -37,10 +37,10 @@ <%= p.description %>
    - + <% end %>
    <% if true %> - + <% end %> \ No newline at end of file diff --git a/tutor/db/development.sqlite3 b/tutor/db/development.sqlite3 index cdf0f15783ba35b3bc67b2141177f8cabc9605b4..c624d4befd16aa15c9f007dc878af6bcf0b5146d 100644 GIT binary patch delta 4010 zcmZu!TWl298J>T};bOcywlSDGvAqzm!G-ahxt%l41+OvSyVn@om?Xq&@2+jU>oxW+ zwrN_}ytEIkQdqU8v{D06)2gikscF4Us|ebt4^(QJst=9S66GZ?6#}BFeJE||zut?$ zGow8#?SB9H&v*X&T==x?!lz~5tf>?i1wqhpHQ)kV4=?W5L~-%r*fzNTv$IQbuEktcGErl3NCAOv#gp0_lBEKp_6F)73Crbx6si?<5 zj?PU5guf|+U6e-inYxn?>d7Iib8Y z?rf)8mmW;c4VnIlWTaOMj}Q4z&<^Fee?|$gY13?5jj z7<0*i!>l_pJ$x=Q(iLGbffJ?t!!Ff^j; zE-`5-IfS^8h(vn^ySgIw#NTENCc_Keqa%^!k;ya4c!C~2G&z56B$=@1 z$>J0pn(Hpb!zFoDknhQVl`|e6{Ij|8j!-FlAP66T1-HaX>9q~pcvS%2$=nP;eF?A| z6+Q!`)X;gpV;DXLA@lh#WS{g#&y|u?LrP4aD*Iu{>)w=<@sC0UKuP*9rEf@q)KmPk zlkjKQz~6fbz5yH4Ki%|u$x3bFRju~--4RV<~TH~`LNa%RaI@a-VK-@ z1%!{i348O>n!-$r>4qZ$)dIrbMQJOSV47lCR5hK&0i|<@$MY+p#B)OMobdk5doJU> z0$m<)OyaLygQgZ;bRI(#Q#TCi%vquA^n9*Ci+ zl&H4N&!Kd&m@ti6hBKM)3|qH!qK=j17#gk&EvBk22F2Y5rMhKeF#Z-9j`6pyLsi=6 z>slFu@(kR9q&LeK(~v2YQd_5v`(sr#Y+~3N|Ne(im(L_y(KJK1*E&A`$%1U+5> z{e4-Gb9=Kv3V z0x#qpZYY{fC|Q3QWI`3yFl@^B?N6XBYe0;21G|SwG-nPFOR)(SeQjJU6Y3A*p_|t% zI3FL6hGRbM_|)`*4?kza^UJ=e;C#pz$UzSBm`w~Dg85|ctH>UYhgc-b3Dr;IMZ#~5 zm9KmR<-Y*&D}{it6&-`hE$?i_WHu#~|Hv!W=5MbmXh3Sa1lOsU5Z zPGqrmf6m9YLJgG~>ut3rokQ>%FW@z7enS@bP0huYZKE82afg3(7+fCs!272zg;itMQNf@EPW17 z;Tae?gt1khc(;&Z6sIlQa_Gie7m?P5L^2efO+3~xgJ(vj+rz!FsoCyc=GWLv-;%#a ziB7il^wBekXh)Zy9aH0qLI>NE<7ehZ6MA1)Eaih5p%#rO;}ZDHL2-AnV`6^dT(*uf zlE5%sLx>BBeyc5VB#`KwJ#!?g97|4zl5u;vKR%r7B7=#po>~9IOq;%Rq&ZASjt(2+ z1MSfh!C1Coit-&nzK>r*#@i}Bcrnj{W=pr_HqRE3)*qXIK_VN2`v9Esl zyjUI0MIlwNnp=)Gu;z~(LY^eCtelPX_fEvxdm^KUwR3$#=0IdIIn)vANyOTE2m8V} zNc8p0&&|Z9=JfHCGs*<(KD2s4Eb)~}-i+YQ$S=#KH!6HT_6`m}sZiaReG~BemwYey z)TwYZ8uyLF=c6GXap?#erlW>~>^i?;VCsrxn9Q28eOIiJ^Jl0yonk$4sj*Dau)9#3x7`$JQQFiQWiH(l zUo|vLYlB~XTw15LrMq-!im9$)_^#d(zbi)ysm@I7z%KkvESOp3dDtkx=FNV;i)Br; zAI^}@v#^BZkkyaG4dtbm1n(vJmvUTgKo`F5<(KY>jd=qa7)hwZrD|j|TVtk;20V-g z^z*&<#VS*BcoEwNV^nwR_?QtoGZ^EY_r#sq_nNh4gR_N3T%rMk+SVE2bN9uadD9!% z8f=xibX2P71~qlE`asm`^MeZx7+43~%uzrFM1EbCp5aTfRCo)*xydBNr4VAv$|3w6 zS^8q05Ee%q09{%oO6QQ(a>*=*#*F2Y7{Jq+_)cjfz%!Y}UDAKWO|=`VpR0vbHUE5% zRL#?Sq+zJzf8Qfrh5F3b8zfNzAAe(?bOm;DwMqH|?8^MFNy54KS-x+-^aytIeFvlm Ru!q+u(x0Fqb61h7;Qs@BrF{SZ delta 3935 zcmZ`+YitzP6`nI=LvZY!g*ezEwJ{V7xGI5iXqCsRy`_~3R86WD1yYlEg{m|`Rew;aX{!Ecq%JI$B6mLnYh=uTbXY90UFVa5H zLHzEC6HpSb>}o78+Ww?+0H(u%VCbBGCbATqk8Hga>Ut~Voogm~=1#u%3=(g_WyVB>wXa#yYpDSxqXz@yr%v27R@WqHO1 z*HTD)^-=AC6iHmO9LsQco-umXb((-5_p;1bakUZloa!wZ4RHze^DwL(d zL5Mguck)@uBI1e)JZr7vPMv&O&^m>zx#3?)-xOmqG{e-Hv1zL*#H6-i8KSxx4or;I zM>>N;-l2~E#YrFYHCao8?c-WkJN0XHkS`Ck4=wqvkrvA8Pax0%Ltl2cu7z&O?7v_WW+Gu!spW)v}^nIjd%x8vYMuL68 z=9AN=uaC891Hq}OX>YryXOskbds;@14zLc!yO)|~mb@!dzCkTk1v{nP$sUm;kC@&K zd$K_=Tep#;oRCwElR`+LAbR-NRAjJ!{#b9*;QYu!tKPlX*3{K@f{uxa6!NnDIO;R7IAE}A58u+4q$4Al*>5e4b0TX^JyOotK<)XYB z-bnne8>)(c-`ZYdK~d~ftVdM#!H3YB_`DDB^2N87T`h{$#!kl1mcCx}ZCC76!ZQfl z0s7*9EqO`lj`fRAhu|+TAa1`1--p5Y^(X$Iu-K3&KLfYnMe+U__z9ejzq92>$~R(X z;_nuJ`NLtDg0qRxFw_B@O9(&wN`~QhJ1i8%_Qw3;HvxDJMua~IcVJX}bqs$65_iYo z8GvBo)AO(sU@YjY1W-pwLZ?72=l{cUv-RD#z%%TM})wDE5blW1s#p2!#?DN-e zfa`E33Y~BVquX3*_>jpg$2L*h_u*1!W%Y`tD6I`OY#tHa<!*KqOP&1QQ#42-1QgPX3sqC`rt}B3p>6CiCtQq@2 zE0bN4*nSUu;_}DvLV9N==9_S$=k3gNGy`+)P?bKOY<*iwrDvX2k!Yy$cxLCrBcb4Q zAQ%~q7AYC2$@PTdW$GF;Er;gHT3LgoCk2+;RA*EK?!j~E)L57rZrk}}V@Rg0JB*3D z_rRMj3sd8cMfH5T(VChzGi~*{v=?ijdf?=?QmG;veRLuk3a-a47mVF*(0PN&G?Or5 z=ghBML`sqRvtjq@2jG4iT?hncq8sL7-=NpG==Za5)6r?)M5||x z_IZ8UoVP975^d`WG@ZZDHFQ!V{r;eKe0C@j(gV{+Ct@|QOR7ThuqUt(re2Wur3a&< zktF5$a)m*p5Krd!%adgm9Cb5T}5mehy%B_&*q@@LOyqrfUNto)>46ltU}>fgY^%!TmWV0gSc z;0%POoN<3JV)t||GzTus+P)Jrkxpa4S~Qw_{r&arQ<24q-bre;&&8gCO6jR21If$d zsfrbgZ(fuuLK)T>s&fJ5#voD%$qiz0)F1oiLw@~ta=_*ohNItCVE>Ut*u1i-F z)tGLQO?s3(?BhI3A>uSz8!5@9I9;5AC&mndd+uG|`EgvSZS75YmzrLQXtu+#7W4WJ zPrrtZiDAO~u54$m8NO;1>Itq9>R1jJ*EU+C+FN!(;d5-p30r$l{;@ii+6B`XGtqTk zBs7CO3tJ`Fw$0;_3)$cxuvmT>;nOK(?E`s>yX2VUdR3is9a9e?``jhM59K}C7G`*Y zp!qIPrx`IBCF0cw@`1Eqp=6+%@B*WfqczGTS8q$LNOzN{eJGck1!7L>2xCZc&dkQ4 zqZ18}^tvSy7+rQf(_+-gAA=MR7wZTnczwOq;bQmO#mbS)JBx{LaF(tYknIf8Ba54= z@)fbHDw%f{Q!_X!+NRi&6_`Q98>;fPGlCu)RxCGMNU$2k0hmsN_b6Kd zW)e$#mH)_3gtu0Fy$WI#;`9AVg^2H0`e0W4eZO)I<`UnlRb&O`#Y=~js}K=-o$^PB kCjMKe;30NF96GE#f< Date: Mon, 21 Apr 2014 20:14:26 +0200 Subject: [PATCH 233/938] Revert "Issue #208 More on Linking with track, Handling failure demos, delete problem, Save problem as incomplete" This reverts commit 53cc3575c416131eefe915d25a1a987ff5a7cedd. --- tutor/app/controllers/problems_controller.rb | 9 ++++----- .../views/problems/_failure_options.html.erb | 4 ++-- .../views/problems/_success_options.html.erb | 1 + tutor/app/views/problems/edit.html.erb | 3 ++- tutor/app/views/problems/new.html.erb | 1 + tutor/app/views/tracks/show.html.erb | 4 ++-- tutor/db/development.sqlite3 | Bin 208896 -> 208896 bytes tutor/db/seeds.rb | 8 ++++---- 8 files changed, 16 insertions(+), 14 deletions(-) create mode 100644 tutor/app/views/problems/_success_options.html.erb diff --git a/tutor/app/controllers/problems_controller.rb b/tutor/app/controllers/problems_controller.rb index 41bf6630..078da8c6 100644 --- a/tutor/app/controllers/problems_controller.rb +++ b/tutor/app/controllers/problems_controller.rb @@ -33,7 +33,6 @@ def create p.owner_type = "teaching assistant" end p.incomplete = true - p.track_id = params[:id] if p.save redirect_to :action => "edit", :id => p.id else @@ -53,7 +52,6 @@ def edit @problem = Problem.find_by_id(params[:id]) @test_cases = @problem.test_cases @answers = @problem.model_answers - @track = Track.find_by_id(@problem.track_id) else render ('public/404') end @@ -96,7 +94,7 @@ def done redirect_to :back else @problem.incomplete = false - redirect_to :action => "show", :id => @problem.id + redirect_to :controller => "tracks", :action => "show", :id => @problem.track_id end end @@ -104,9 +102,10 @@ def destroy_problem @problem = Problem.find_by_id(params[:problem_id]) @problem.test_cases.destroy @problem.model_answers.destroy + @track = @problem.track_id @problem.destroy flash.keep[:notice] = "Problem has been deleted" - redirect_to :action => "new" + redirect_to :controller => "tracks", :action => "show", :id => @problem.track_id end # [Add Problem - 4.4] # Passes the input of the form as paramaters for create action to use it @@ -117,6 +116,6 @@ def destroy_problem # Author: Abdullrahman Elhusseny private def problem_params - params.require(:Problem).permit(:title , :description) + params.require(:Problem).permit(:title , :description, :track_id) end end \ No newline at end of file diff --git a/tutor/app/views/problems/_failure_options.html.erb b/tutor/app/views/problems/_failure_options.html.erb index 28ae175a..27410fa3 100644 --- a/tutor/app/views/problems/_failure_options.html.erb +++ b/tutor/app/views/problems/_failure_options.html.erb @@ -1,3 +1,3 @@ -<%= button_to 'Abort and Delete Problem', problem_destroy_problem_path(:problem_id => @problem.id), method: :get, :confirm => 'Are you sure?' %> -<%= button_to 'Save as Incomplete', problem_path(:id => @problem.id), method: :get %> \ No newline at end of file +<%= button_to 'Abort and Delete Problem', problem_destroy_problem_path(:problem_id => @problem.id), method: :get, :confirm => 'Are you sure you want to delete this problem?' %> +<%= button_to 'Save as Incomplete', track_path(:id => @problem.track_id), method: :get %> \ No newline at end of file diff --git a/tutor/app/views/problems/_success_options.html.erb b/tutor/app/views/problems/_success_options.html.erb new file mode 100644 index 00000000..fd835cf1 --- /dev/null +++ b/tutor/app/views/problems/_success_options.html.erb @@ -0,0 +1 @@ +<%= button_to 'Done', problem_done_path(:problem_id => @problem.id), method: :get %> \ No newline at end of file diff --git a/tutor/app/views/problems/edit.html.erb b/tutor/app/views/problems/edit.html.erb index 552efe0b..e8bba23e 100644 --- a/tutor/app/views/problems/edit.html.erb +++ b/tutor/app/views/problems/edit.html.erb @@ -19,9 +19,10 @@ and a paragraph to view the problem description of the instance variable @proble <%= p.hidden_field :title, value: @problem.title %> <% end %> + <%= render partial: "test_cases/index" %> <%= render partial: "model_answers/new" %> -<%= button_to 'Done', problem_done_path(:problem_id => @problem.id), method: :get %> +<%= render partial: "problems/success_options" %> <%= render partial: "problems/failure_options" %> diff --git a/tutor/app/views/problems/new.html.erb b/tutor/app/views/problems/new.html.erb index 3b0ca32b..2faf1e66 100644 --- a/tutor/app/views/problems/new.html.erb +++ b/tutor/app/views/problems/new.html.erb @@ -11,6 +11,7 @@ <%= p.label :description %>
    <%= p.text_area :description , :cols => "50", :rows => "10" %>

    + <%= p.hidden_field :track_id, value: params[:id] %>

    <%= p.submit %>

    diff --git a/tutor/app/views/tracks/show.html.erb b/tutor/app/views/tracks/show.html.erb index 9ff4b63d..f58e4a36 100644 --- a/tutor/app/views/tracks/show.html.erb +++ b/tutor/app/views/tracks/show.html.erb @@ -37,10 +37,10 @@ <%= p.description %>
    - + <% end %>
    <% if true %> - + <% end %> \ No newline at end of file diff --git a/tutor/db/development.sqlite3 b/tutor/db/development.sqlite3 index c624d4befd16aa15c9f007dc878af6bcf0b5146d..cdf0f15783ba35b3bc67b2141177f8cabc9605b4 100644 GIT binary patch delta 3935 zcmZ`+YitzP6`nI=LvZY!g*ezEwJ{V7xGI5iXqCsRy`_~3R86WD1yYlEg{m|`Rew;aX{!Ecq%JI$B6mLnYh=uTbXY90UFVa5H zLHzEC6HpSb>}o78+Ww?+0H(u%VCbBGCbATqk8Hga>Ut~Voogm~=1#u%3=(g_WyVB>wXa#yYpDSxqXz@yr%v27R@WqHO1 z*HTD)^-=AC6iHmO9LsQco-umXb((-5_p;1bakUZloa!wZ4RHze^DwL(d zL5Mguck)@uBI1e)JZr7vPMv&O&^m>zx#3?)-xOmqG{e-Hv1zL*#H6-i8KSxx4or;I zM>>N;-l2~E#YrFYHCao8?c-WkJN0XHkS`Ck4=wqvkrvA8Pax0%Ltl2cu7z&O?7v_WW+Gu!spW)v}^nIjd%x8vYMuL68 z=9AN=uaC891Hq}OX>YryXOskbds;@14zLc!yO)|~mb@!dzCkTk1v{nP$sUm;kC@&K zd$K_=Tep#;oRCwElR`+LAbR-NRAjJ!{#b9*;QYu!tKPlX*3{K@f{uxa6!NnDIO;R7IAE}A58u+4q$4Al*>5e4b0TX^JyOotK<)XYB z-bnne8>)(c-`ZYdK~d~ftVdM#!H3YB_`DDB^2N87T`h{$#!kl1mcCx}ZCC76!ZQfl z0s7*9EqO`lj`fRAhu|+TAa1`1--p5Y^(X$Iu-K3&KLfYnMe+U__z9ejzq92>$~R(X z;_nuJ`NLtDg0qRxFw_B@O9(&wN`~QhJ1i8%_Qw3;HvxDJMua~IcVJX}bqs$65_iYo z8GvBo)AO(sU@YjY1W-pwLZ?72=l{cUv-RD#z%%TM})wDE5blW1s#p2!#?DN-e zfa`E33Y~BVquX3*_>jpg$2L*h_u*1!W%Y`tD6I`OY#tHa<!*KqOP&1QQ#42-1QgPX3sqC`rt}B3p>6CiCtQq@2 zE0bN4*nSUu;_}DvLV9N==9_S$=k3gNGy`+)P?bKOY<*iwrDvX2k!Yy$cxLCrBcb4Q zAQ%~q7AYC2$@PTdW$GF;Er;gHT3LgoCk2+;RA*EK?!j~E)L57rZrk}}V@Rg0JB*3D z_rRMj3sd8cMfH5T(VChzGi~*{v=?ijdf?=?QmG;veRLuk3a-a47mVF*(0PN&G?Or5 z=ghBML`sqRvtjq@2jG4iT?hncq8sL7-=NpG==Za5)6r?)M5||x z_IZ8UoVP975^d`WG@ZZDHFQ!V{r;eKe0C@j(gV{+Ct@|QOR7ThuqUt(re2Wur3a&< zktF5$a)m*p5Krd!%adgm9Cb5T}5mehy%B_&*q@@LOyqrfUNto)>46ltU}>fgY^%!TmWV0gSc z;0%POoN<3JV)t||GzTus+P)Jrkxpa4S~Qw_{r&arQ<24q-bre;&&8gCO6jR21If$d zsfrbgZ(fuuLK)T>s&fJ5#voD%$qiz0)F1oiLw@~ta=_*ohNItCVE>Ut*u1i-F z)tGLQO?s3(?BhI3A>uSz8!5@9I9;5AC&mndd+uG|`EgvSZS75YmzrLQXtu+#7W4WJ zPrrtZiDAO~u54$m8NO;1>Itq9>R1jJ*EU+C+FN!(;d5-p30r$l{;@ii+6B`XGtqTk zBs7CO3tJ`Fw$0;_3)$cxuvmT>;nOK(?E`s>yX2VUdR3is9a9e?``jhM59K}C7G`*Y zp!qIPrx`IBCF0cw@`1Eqp=6+%@B*WfqczGTS8q$LNOzN{eJGck1!7L>2xCZc&dkQ4 zqZ18}^tvSy7+rQf(_+-gAA=MR7wZTnczwOq;bQmO#mbS)JBx{LaF(tYknIf8Ba54= z@)fbHDw%f{Q!_X!+NRi&6_`Q98>;fPGlCu)RxCGMNU$2k0hmsN_b6Kd zW)e$#mH)_3gtu0Fy$WI#;`9AVg^2H0`e0W4eZO)I<`UnlRb&O`#Y=~js}K=-o$^PB kCjMKe;30NF96GE#f<T};bOcywlSDGvAqzm!G-ahxt%l41+OvSyVn@om?Xq&@2+jU>oxW+ zwrN_}ytEIkQdqU8v{D06)2gikscF4Us|ebt4^(QJst=9S66GZ?6#}BFeJE||zut?$ zGow8#?SB9H&v*X&T==x?!lz~5tf>?i1wqhpHQ)kV4=?W5L~-%r*fzNTv$IQbuEktcGErl3NCAOv#gp0_lBEKp_6F)73Crbx6si?<5 zj?PU5guf|+U6e-inYxn?>d7Iib8Y z?rf)8mmW;c4VnIlWTaOMj}Q4z&<^Fee?|$gY13?5jj z7<0*i!>l_pJ$x=Q(iLGbffJ?t!!Ff^j; zE-`5-IfS^8h(vn^ySgIw#NTENCc_Keqa%^!k;ya4c!C~2G&z56B$=@1 z$>J0pn(Hpb!zFoDknhQVl`|e6{Ij|8j!-FlAP66T1-HaX>9q~pcvS%2$=nP;eF?A| z6+Q!`)X;gpV;DXLA@lh#WS{g#&y|u?LrP4aD*Iu{>)w=<@sC0UKuP*9rEf@q)KmPk zlkjKQz~6fbz5yH4Ki%|u$x3bFRju~--4RV<~TH~`LNa%RaI@a-VK-@ z1%!{i348O>n!-$r>4qZ$)dIrbMQJOSV47lCR5hK&0i|<@$MY+p#B)OMobdk5doJU> z0$m<)OyaLygQgZ;bRI(#Q#TCi%vquA^n9*Ci+ zl&H4N&!Kd&m@ti6hBKM)3|qH!qK=j17#gk&EvBk22F2Y5rMhKeF#Z-9j`6pyLsi=6 z>slFu@(kR9q&LeK(~v2YQd_5v`(sr#Y+~3N|Ne(im(L_y(KJK1*E&A`$%1U+5> z{e4-Gb9=Kv3V z0x#qpZYY{fC|Q3QWI`3yFl@^B?N6XBYe0;21G|SwG-nPFOR)(SeQjJU6Y3A*p_|t% zI3FL6hGRbM_|)`*4?kza^UJ=e;C#pz$UzSBm`w~Dg85|ctH>UYhgc-b3Dr;IMZ#~5 zm9KmR<-Y*&D}{it6&-`hE$?i_WHu#~|Hv!W=5MbmXh3Sa1lOsU5Z zPGqrmf6m9YLJgG~>ut3rokQ>%FW@z7enS@bP0huYZKE82afg3(7+fCs!272zg;itMQNf@EPW17 z;Tae?gt1khc(;&Z6sIlQa_Gie7m?P5L^2efO+3~xgJ(vj+rz!FsoCyc=GWLv-;%#a ziB7il^wBekXh)Zy9aH0qLI>NE<7ehZ6MA1)Eaih5p%#rO;}ZDHL2-AnV`6^dT(*uf zlE5%sLx>BBeyc5VB#`KwJ#!?g97|4zl5u;vKR%r7B7=#po>~9IOq;%Rq&ZASjt(2+ z1MSfh!C1Coit-&nzK>r*#@i}Bcrnj{W=pr_HqRE3)*qXIK_VN2`v9Esl zyjUI0MIlwNnp=)Gu;z~(LY^eCtelPX_fEvxdm^KUwR3$#=0IdIIn)vANyOTE2m8V} zNc8p0&&|Z9=JfHCGs*<(KD2s4Eb)~}-i+YQ$S=#KH!6HT_6`m}sZiaReG~BemwYey z)TwYZ8uyLF=c6GXap?#erlW>~>^i?;VCsrxn9Q28eOIiJ^Jl0yonk$4sj*Dau)9#3x7`$JQQFiQWiH(l zUo|vLYlB~XTw15LrMq-!im9$)_^#d(zbi)ysm@I7z%KkvESOp3dDtkx=FNV;i)Br; zAI^}@v#^BZkkyaG4dtbm1n(vJmvUTgKo`F5<(KY>jd=qa7)hwZrD|j|TVtk;20V-g z^z*&<#VS*BcoEwNV^nwR_?QtoGZ^EY_r#sq_nNh4gR_N3T%rMk+SVE2bN9uadD9!% z8f=xibX2P71~qlE`asm`^MeZx7+43~%uzrFM1EbCp5aTfRCo)*xydBNr4VAv$|3w6 zS^8q05Ee%q09{%oO6QQ(a>*=*#*F2Y7{Jq+_)cjfz%!Y}UDAKWO|=`VpR0vbHUE5% zRL#?Sq+zJzf8Qfrh5F3b8zfNzAAe(?bOm;DwMqH|?8^MFNy54KS-x+-^aytIeFvlm Ru!q+u(x0Fqb61h7;Qs@BrF{SZ diff --git a/tutor/db/seeds.rb b/tutor/db/seeds.rb index aa0556ef..652305ad 100644 --- a/tutor/db/seeds.rb +++ b/tutor/db/seeds.rb @@ -89,10 +89,10 @@ Problem.create(title:"Problem 5", description:"This is very easy Problem") puts("# -----------------------Tracks---------------------------") - Track.create(title: "Track 1", difficulty: 1) - Track.create(title: "Track 2", difficulty: 2) - Track.create(title: "Track 3", difficulty: 3) - Track.create(title: "Track 4", difficulty: 4) + Track.create(title: "Track 1", difficulty: 1, topic_id: 1) + Track.create(title: "Track 2", difficulty: 2, topic_id: 1) + Track.create(title: "Track 3", difficulty: 3, topic_id: 1) + Track.create(title: "Track 4", difficulty: 4, topic_id: 1) puts("# -----------------------Solutions---------------------------") Solution.create(code:"println(My first solution)", length:5, status:0) From 7f39001d327380553fd5f6abf387c5efcc7f1855 Mon Sep 17 00:00:00 2001 From: Khaled Date: Mon, 21 Apr 2014 20:18:59 +0200 Subject: [PATCH 234/938] Issue #193 Fixed bugs --- tutor/app/models/debugger.rb | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tutor/app/models/debugger.rb b/tutor/app/models/debugger.rb index 81763f47..fb48ce17 100644 --- a/tutor/app/models/debugger.rb +++ b/tutor/app/models/debugger.rb @@ -9,10 +9,6 @@ class Debugger < ActiveRecord::Base #Methods - def input input - $input.puts input - end - def get_variables method_arguments = [] local_variables = [] From af54438c2725c0e242b33e43610879186106104a Mon Sep 17 00:00:00 2001 From: ahmed93 Date: Mon, 21 Apr 2014 20:20:18 +0200 Subject: [PATCH 235/938] Issue #188 adding some javascript without any ajax --- ...nts.js.coffee => solutions_constraints.js} | 0 .../solutions_constraints_controller.rb | 13 +-- .../solutions_constraints/_form.html.erb | 100 ++++++++++++++++-- .../views/solutions_constraints/create.js.erb | 1 + .../solutions_constraints/index.html.erb | 4 +- .../views/solutions_constraints/new.html.erb | 3 + tutor/config/routes.rb | 9 +- tutor/db/development.sqlite3 | Bin 196608 -> 196608 bytes tutor/db/schema.rb | 2 + tutor/db/seeds.rb | 6 +- 10 files changed, 116 insertions(+), 22 deletions(-) rename tutor/app/assets/javascripts/{solutions_constraints.js.coffee => solutions_constraints.js} (100%) create mode 100644 tutor/app/views/solutions_constraints/create.js.erb create mode 100644 tutor/app/views/solutions_constraints/new.html.erb diff --git a/tutor/app/assets/javascripts/solutions_constraints.js.coffee b/tutor/app/assets/javascripts/solutions_constraints.js similarity index 100% rename from tutor/app/assets/javascripts/solutions_constraints.js.coffee rename to tutor/app/assets/javascripts/solutions_constraints.js diff --git a/tutor/app/controllers/solutions_constraints_controller.rb b/tutor/app/controllers/solutions_constraints_controller.rb index 53ab7261..d15ec3d7 100644 --- a/tutor/app/controllers/solutions_constraints_controller.rb +++ b/tutor/app/controllers/solutions_constraints_controller.rb @@ -6,17 +6,12 @@ def index end def create - + redirect_to action: "index" end - def show_params - @data = MethodParameter.all - render "show_data" - end - - def show_variables - @data = VariableConstraint.all - render "show_data" + def new + @constrain = MethodConstraint.new() + @params = MethodParameter.new() end def show diff --git a/tutor/app/views/solutions_constraints/_form.html.erb b/tutor/app/views/solutions_constraints/_form.html.erb index ee9d0fe9..2270cfa3 100644 --- a/tutor/app/views/solutions_constraints/_form.html.erb +++ b/tutor/app/views/solutions_constraints/_form.html.erb @@ -1,4 +1,85 @@ -<%= form_for :constrain do |f| %> + + +<%= form_for :@constrain do |f| %> @@ -10,14 +91,14 @@ - <%= form_for :patient do |u| %> + <%= form_for :@params do |u| %> - + - + - + <% end %> @@ -34,11 +115,14 @@
    Method Constrains
    Method Parameter <%= u.text_field :parameter, placeholder: "Variable Type" %><%= u.text_field :parameaaater, placeholder: "Variable Type", id:"params_type" %> <%= u.text_field :parameter, placeholder: "Variable Name" %><%= u.text_field :asd, placeholder: "Variable Name", id:"params_name" %> <%= image_submit_tag "add_buttom.png", id:"params", style: "width:15%;height:15%;margin_top:10px;"%><%= image_tag "add_buttom.png", id:"params", style: "width:15%;height:15%;margin_top:10px;cursor:pointer", onclick: "add_params(this);"%>
    - <% render action: "show_params"%> +

    Paramter

    + No paramter +
    - <% render action: "show_variables"%> +

    - <%= f.submit "Save Changes", class: "btn btn-success"%> + <%= f.submit "Save Changes", class: "btn btn-default"%> + <% end %> \ No newline at end of file diff --git a/tutor/app/views/solutions_constraints/create.js.erb b/tutor/app/views/solutions_constraints/create.js.erb new file mode 100644 index 00000000..df2ca465 --- /dev/null +++ b/tutor/app/views/solutions_constraints/create.js.erb @@ -0,0 +1 @@ +$('body').append('<%= @comment.text %>'); \ No newline at end of file diff --git a/tutor/app/views/solutions_constraints/index.html.erb b/tutor/app/views/solutions_constraints/index.html.erb index 617589f8..f8e2cd77 100644 --- a/tutor/app/views/solutions_constraints/index.html.erb +++ b/tutor/app/views/solutions_constraints/index.html.erb @@ -7,4 +7,6 @@ <% end %> - \ No newline at end of file + + + <%= link_to "Create new Constraint", solutions_constraints_path %> \ No newline at end of file diff --git a/tutor/app/views/solutions_constraints/new.html.erb b/tutor/app/views/solutions_constraints/new.html.erb new file mode 100644 index 00000000..b4dd62db --- /dev/null +++ b/tutor/app/views/solutions_constraints/new.html.erb @@ -0,0 +1,3 @@ +

    New mooo

    + +<%= render 'form' %> \ No newline at end of file diff --git a/tutor/config/routes.rb b/tutor/config/routes.rb index 480589ae..f4005e4d 100644 --- a/tutor/config/routes.rb +++ b/tutor/config/routes.rb @@ -29,7 +29,7 @@ resources :solutions resources :problems resources :topics - resources :solutions_constraints + # Example resource route with options: # resources :products do @@ -55,6 +55,13 @@ resources :model_answers do post "model_answers/new" end + resources :solutions_constraints do + collection do + post "new" + end + end + + # Example resource route with sub-resources: # resources :products do # resources :comments, :sales diff --git a/tutor/db/development.sqlite3 b/tutor/db/development.sqlite3 index d19c0b1d72718ca09796e9cf12d0309b4ca00b82..16f9168c6518c0aa49ad1fcc1826ba2aa4fd9b2e 100644 GIT binary patch delta 4675 zcmbVQZERat8NSDMlBP}K?xTbuN+Q%%ZK__MbI*4-v^ZYtv}qG3aheZMz8W`QPMpMc zl0}2KQYH9<*tk+ILWnX1;tyL_M@lB7vHn0H_yN--v_H_X-w4KpplDJX&UHrawS6KG zk@LsTbKmoRJn#FS>q4QSP-uAblW=XbVHi&yEgpYlZX$63vI`WNRB~bw3nFqJlJgd7 ztwh>$6XuP~!YOOw6oRL6OPvWiNUkT7Oy*+qD+3#o@tM@%bYEgaOs-x{<)-^PRx=~! z#Ly)ep=dFhj7DO&o&ujWo>GUG{-V*7x9pc+XkPG6!U!Uy^`V5Iav$bm@puPJr}?#> zd_1{4czwBRIG)N5MAKcDr!!dO2J%DKX3)g)4cI@hK0kls#(Kmow%2{(?7@i^g&b?5 zW+ovR3u4336Eka_BmLczaAWw&)tfh2)*R`bnIGwyyS6;k6Hj)p%c0nGv@>hvv)#G$ zCH`XnTy%2Dtd7F9iMU{gBKGT}?QI9HVT3T$kfHf0Vx!Tg>0C5BJQM96q4~MBx%qf( zHkXWKQ(|r;zZglUiA*QD7p|w##lelvz7caMhE_MGV)pph`Tw2+Xzpjn%>n(ta!?#^ z37D{`hvX~UZsVjpUJv~>4*19YnH&=3t$(voX*Ui-O`dWInV|A%BwQ+gz z67OBQYGU(NEBKsoQi(mR{_VNVQ=Si42qL-8hkXQTd`Nb!!r6@&pXj=R%&Dox$(P_l z%v>4TSi9KG2lI(ozGG-0-?6$ron2fS=}z#n+YLw1ypQ{2`uc_%Gs1bS)C5WMwBvH{6W6S zXPZDwG|6*4;erVJ`){1|Qq2ex6j$3;QYs-Y29K%KxHHj+MiZHA?hr0jhw81kh?Eec>(-d)g-$S=27v9rQ=xephW#ML{4%sQBjBe4=GkouX|BDI~RMtft<0 zW^M-bZhgXjEgA|TYs770Wlv7Hav{cOvU8o!loRR%1IfBJ>5 zvDG(JYT8e+k-LxWzx);Z5-2FqvmvsGv^ziYEfjGm8L6QGk^SS3ET7v##jRBdlngRl z{M%c8w<+aVpAu;aj_nU0x12s`48f$pnjlpvnY2&uwffvRgsKDu1)<2!l(Pw=T0vQm zGK<@9?X~!_#~|mLDdE~y>v4N;@7s-@C!9)3v;H8OHOw~JO>c*9HvX#VyWuYbX)GACufE!{`}J1P5U>+9pV)n&$J@t(aj+YC7DR&e zktgb!BN1@B(V0F2wrZCqRwfp*&b_C>XPm@2uvX8WtZPOH+-`QhdKP@IA(flSOpUFi za`}}-=Y@0N8@u0X1HTPzK~Q@nWQ2bj9twxHpD6sZX|pd_Zy@)cAB|osJ(X}xr*f&4 zY%88!%vGmCX&(|yHHG^R(ib?~rd4j!Tm1rBoatMwg!F;KjiPd+UNxoU`g=JqA&tgv zpdCb7Jdvq;klPPc^;e;lkluiEcMN>qSs(L@Oduw8BglQqMV!~iK%1vYfe6vB+kIqb z9DL{-S*rD=(9e8?)J@DengM4$>s*a$q#5I?T}z1bl?pmit3Veq7cSzwQBFV987L&; za%Tyg2z&YDP^}KV^%CMX?WWtboBn*NqA6=ypGt^xXA=lt#1J#xno|*%kevbuy<2+% zgpA;db0iV?Vr}5PKn)1ly~p3%{Yh^i6L3Z&;D@^>l7ZXjrVrF3q}qns!MKk+59$n1 zUmuMIbe;-z{eqftr8H4Ob_#*_U-n{N}c-^boX^Y>kK0Zi>=3Hu3J)VaXnjI9E8(eL04}C znj$D)sJih`r%*x1MEA3VOIMnL&ix8HV*2fXD8@u=?UlO@A=k)K87J!Qi=FmzIufd} jw2=}^y~{a;3c9*a>DM+^X~)j}3OZ7+*IMfssVe;&FxWn2 delta 4570 zcmbVPYfM|$9lyus5yImpO&ii`8K}#mlq%+&d)~BDF-}5&1Ptcgl}Ess7>p^HIi9NF zD4#d2yAoHLrlnOkbzj<~MuKXuM%uJ#`?7qiCT;2ZZR)hO(=+1bqcx)tLM*(R$#vF#@wtN&p@pCVxy@iY5Uhw@xVrcu8{7;QfwiV zVME=E8%x&pkx18-**57Nb;a8Mqx+ow*_ z|0@K!nHIBn43-E|r1Qr`?CvBf<^>CBVSP2ai2Z{k_Oclvdeb703%exNTfFcmoKDZfnG5pGrftv)Ff-a z5E>25T7#=}Vv=;d%gEo+)ZTsuUR41*3o4E1Xm+l|@Zn)_k1 z0ul>KG(p}+a^HUXfQe(u>)PA#sO*xhtB{(33 zI+f+#*l6Mqnr;DLh9tx~2jskMQU#~*btp1E(Fq~XZX?#@vSWt3} zKl_OKdde`a1J_DVs@3ke!_9*hBS=Cf?ChN}uNV3M>Aet2a_;UoJVi?|WKs>J!{eD# z!7LoAt}~u4_%IY*UC!vGVo8N2aLNf6300LEA@-x6*B3jOUSq~w^2-2D$5i_v5VQ~l7AOi*a={qe=35T$`rZRiV# zJ^$c;Vk;d|Li;xlf*#w5G3Ab?v?NDJU>kq*f|rd{q_k{C8Ns&mQKyFu8PsnTYS|#f z%Khn=p2lXBBYj8&#|&fpuYbdy08+u_q2h28F9<~T>{eHN7~;7P3En+;aAyF&LrP(vE(G*k|`zJu)g%WqxvFJ6X!c zglG+`C<(=Wf3L+8J)){zpGU6BczbW}JB>vp6jPkvhYpV)!7!!V`Eer`^W3oNy<2>P<$@3(+NZa1v0CkZ;pL1s#e8IUfT~Y%=s*6GUm5Vsax^J|r%(GXp;MOcd2T zyh4RBsdgOaXc9cjO0O(Nb3X1=F3OX8_MQA0|X1s8E{Zvx@*SZ!k!a_k~ISx|Mq>Phgn;T#S7o~`z8 z_) z@59%M;?>wC>J6vyRjp@4%B@GfW-nW%MB8VQFtrsrouzcBZbkhqK-8?GPPUBBp+1mO zJ;jCP+$*C~HAc14F=7yJJuZeIfVQP1 Date: Mon, 21 Apr 2014 20:22:55 +0200 Subject: [PATCH 236/938] Issue #216 Fixed documentation --- tutor/app/controllers/application_controller.rb | 4 ++-- tutor/app/models/lecturer.rb | 2 +- tutor/app/models/student.rb | 2 +- tutor/app/models/teaching_assistant.rb | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tutor/app/controllers/application_controller.rb b/tutor/app/controllers/application_controller.rb index e7b5eb1e..d303835a 100644 --- a/tutor/app/controllers/application_controller.rb +++ b/tutor/app/controllers/application_controller.rb @@ -6,7 +6,7 @@ class ApplicationController < ActionController::Base protect_from_forgery with: :exception before_action :update_sanitized_params, if: :devise_controller? - # [User Authentication Advanced - Story 5.9, 5.11, 5.12, 5.16] + # [User Authentication Advanced - Story 5.9, 5.10, 5.11, 5.14, 5.15] # Permits some fields to be passed through sign up forms to update the lecturer, # student, and teaching_assistant models # Parameters: None @@ -33,7 +33,7 @@ def update_sanitized_params end end - # [User Authentication Advanced - Story 5.9, 5.11, 5.12, 5.16] + # [User Authentication Advanced - Story 5.9, 5.10, 5.11, 5.14, 5.15] # Checks if a user is signed-in in order to be used in authentication over different pages # where they are redirected to homepage if they aren't authenticated # Parameters: None diff --git a/tutor/app/models/lecturer.rb b/tutor/app/models/lecturer.rb index dcd4a28c..a6212275 100644 --- a/tutor/app/models/lecturer.rb +++ b/tutor/app/models/lecturer.rb @@ -37,7 +37,7 @@ class Lecturer < ActiveRecord::Base #Methods - # [User Authentication Advanced - Story 5.9, 5.11, 5.12, 5.16] + # [User Authentication Advanced - Story 5.9, 5.10, 5.11, 5.14, 5.15] # Checks if the email is already registered in tables: Student and TeachingAssistant # before registering the email for table: Lecturer # Parameters: None diff --git a/tutor/app/models/student.rb b/tutor/app/models/student.rb index ce42ede8..77db215e 100644 --- a/tutor/app/models/student.rb +++ b/tutor/app/models/student.rb @@ -32,7 +32,7 @@ class Student < ActiveRecord::Base #Methods - # [User Authentication Advanced - Story 5.9, 5.11, 5.12, 5.16] + # [User Authentication Advanced - Story 5.9, 5.10, 5.11, 5.14, 5.15] # Checks if the email is already registered in tables: Lecturer and TeachingAssistant # before registering the email for table: Student # Parameters: None diff --git a/tutor/app/models/teaching_assistant.rb b/tutor/app/models/teaching_assistant.rb index 20bb9967..87aec822 100644 --- a/tutor/app/models/teaching_assistant.rb +++ b/tutor/app/models/teaching_assistant.rb @@ -38,7 +38,7 @@ class TeachingAssistant < ActiveRecord::Base #Methods - # [User Authentication Advanced - Story 5.9, 5.11, 5.12, 5.16] + # [User Authentication Advanced - Story 5.9, 5.10, 5.11, 5.14, 5.15] # Checks if the email is already registered in tables: Lecturer and Student # before registering the email for table: TeachingAssistant # Parameters: None From 0a97b3a87a3ac8c40156bdbb7730e697ea4c1db7 Mon Sep 17 00:00:00 2001 From: Ahmed Akram Date: Mon, 21 Apr 2014 20:27:51 +0200 Subject: [PATCH 237/938] Issue #264, adding methods --- tutor/app/models/executer.rb | 53 ++++++++++++----------- tutor/app/views/problems/show.html.erb | 4 +- tutor/as | 0 tutor/students_solutions/Java/as.java | 0 tutor/students_solutions/Java/test.class | Bin 0 -> 470 bytes 5 files changed, 30 insertions(+), 27 deletions(-) create mode 100644 tutor/as create mode 100644 tutor/students_solutions/Java/as.java create mode 100644 tutor/students_solutions/Java/test.class diff --git a/tutor/app/models/executer.rb b/tutor/app/models/executer.rb index 4a06c301..dabce31a 100644 --- a/tutor/app/models/executer.rb +++ b/tutor/app/models/executer.rb @@ -1,24 +1,24 @@ class Executer - def self.execute(file, input) - java_path = 'students_solutions/Java/' + def self.execute(file_name, input) + # java_path = 'students_solutions/Java/' classes_path = 'students_solutions/Class' - compile = %x[#{'javac -g -d ' + classes_path + ' ' + java_path + file + '.java' + ' 2>&1'}] - if compile.empty? - problem_id = 3 - validity = check_input_validity(input, problem_id) - if validity[:status] - @execute_res = %x[#{'java -cp ' + classes_path + ' ' + file + ' ' + input + ' 2>&1'}] - if @execute_res.include?("Exception") - return false - else - return true - end - else - @execute_res = validity[:msg] + # compile = %x[#{'javac -g -d ' + classes_path + ' ' + java_path + file + '.java' + ' 2>&1'}] + # if compile.empty? + problem_id = 3 + validity = check_input_validity(input, problem_id) + if validity[:status] + @execute_res = %x[#{'java -cp ' + classes_path + ' ' + file_name + ' ' + input + ' 2>&1'}] + if @execute_res.include?("Exception") return false + else + return true end + else + @execute_res = validity[:msg] + return false end + # end end def self.check_input_validity(input, problem_id) @@ -34,21 +34,24 @@ def self.check_input_validity(input, problem_id) return {status: true, msg:""} end - def self.get_runtime_error() + def self.remove_class_name(file_name, error, sub_name) + return error.gsub(file_name, sub_name) + end + + def self.get_runtime_error(file_name, sub_name) + @execute_res = remove_class_name(file_name, @execute_res, sub_name) if @execute_res.include?("/ by zero") - return msg = {error: @execute_res, - explaination: "Division by Zero results in infinity, which computers can not understand. Be carefull !"} + message = "Division by Zero results in infinity, "\ + "which computers can not understand. Be careful !" + return msg = {error: @execute_res, explaination: message} else - return msg = {error: @execute_res, - explaination: "To be set Runtime Error!"} + message = "To be set Runtime Error!" + return msg = {error: @execute_res, explaination: message} end end - def self.get_output() + def self.get_output() return @execute_res end -end - -# Executer.execute(ARGV[0], ARGV[1]) -# Executer.get_runtime_error() \ No newline at end of file +end \ No newline at end of file diff --git a/tutor/app/views/problems/show.html.erb b/tutor/app/views/problems/show.html.erb index bda4ffb4..9f5ca099 100644 --- a/tutor/app/views/problems/show.html.erb +++ b/tutor/app/views/problems/show.html.erb @@ -1,5 +1,5 @@ - - +\ +\

    diff --git a/tutor/as b/tutor/as new file mode 100644 index 00000000..e69de29b diff --git a/tutor/students_solutions/Java/as.java b/tutor/students_solutions/Java/as.java new file mode 100644 index 00000000..e69de29b diff --git a/tutor/students_solutions/Java/test.class b/tutor/students_solutions/Java/test.class new file mode 100644 index 0000000000000000000000000000000000000000..1105c49fabc18d4f5186578f40af263bc2c1a82e GIT binary patch literal 470 zcmZut%T59@6g_1Mg>mF54+TVa0}DxX3A!;cAt7plVdJV`Lx#+Q48_FH(uEoqet;ik zyu}3}u}$vd^xSiA@AuE=7l3oLZKRO1kw+neB1$$6P!^~NR2fnOFZA>!gXMN64E!p3 zR1CS17pj|eFjeuroce_DKzboV#eEnp?q-ux^`K{#bbfIPh6}HeY)M~C`hV)X#D@7?o+5KmX z;f~Vyd8JiAAB)ze;E(S`y*rv&)8tA9eTLGe&o0a$mWJfhhq*iKOwdM>c4$rl^olgu z3}sF7jC`{D4)#I;ErM)n0~*R69EuHf0E;eA>sn_YNDR8%xQka<^@jfjzO62T6VIYH P99hz;QpB)NSOVE!!W~^~ literal 0 HcmV?d00001 From a265e8fdbeb8560e9c2fa907e8bdfacbf34661b7 Mon Sep 17 00:00:00 2001 From: AbdullRahman ElHusseini Date: Mon, 21 Apr 2014 20:41:13 +0200 Subject: [PATCH 238/938] Issue 297 Drop down list of tracks and edit track --- tutor/app/controllers/problems_controller.rb | 26 ++++++++++++++----- tutor/app/views/problems/edit.html.erb | 7 +++++ tutor/db/development.sqlite3 | Bin 200704 -> 208896 bytes 3 files changed, 26 insertions(+), 7 deletions(-) diff --git a/tutor/app/controllers/problems_controller.rb b/tutor/app/controllers/problems_controller.rb index 195ced4a..cbda44a7 100644 --- a/tutor/app/controllers/problems_controller.rb +++ b/tutor/app/controllers/problems_controller.rb @@ -32,6 +32,7 @@ def create p.owner_id = current_teaching_assistant.id p.owner_type = "teaching assistant" end + p.incomplete = true if p.save redirect_to :action => "edit", :id => p.id else @@ -51,6 +52,9 @@ def edit @problem = Problem.find_by_id(params[:id]) @test_cases = @problem.test_cases @answers = @problem.model_answers + @track = Track.find_by_id(@problem.track_id) + @topic = Topic.find_by_id(@track.topic_id) + @tracks = Track.find_all_by_topic_id(@track.topic_id) else render ('public/404') end @@ -72,17 +76,24 @@ def new end def update + @track = Track.find_by_id(problem_params[:track_id]) @problem = Problem.find_by_id(params[:id]) - if @problem.update_attributes(problem_params) - redirect_to :action => "edit", :id => @problem.id + @problem_test = @track.problems.find_all_by_title(@problem.title) + if(Array(@problem_test).size == 0) + @problem = Problem.find_by_id(params[:id]) + if @problem.update_attributes(problem_params) + redirect_to :action => "edit", :id => @problem.id + else + flash.keep[:notice] = "Update paramater is empty" + end else - flash.keep[:notice] = "Update paramater is empty" - redirect_to :back + flash.keep[:notice] = "#{@track.title} has a problem with the same title" end + redirect_to :back end def done - @problem = Problem.find_by_id(params[:id]) + @problem = Problem.find_by_id(params[:problem_id]) if @problem.test_cases.empty? @failure = true flash.keep[:notice] = "Test cases are empty #{@failure}" @@ -92,12 +103,13 @@ def done flash.keep[:notice] = "Answers are empty" redirect_to :back else + @problem.incomplete = false redirect_to :action => "show", :id => @problem.id end end def destroy_problem - @problem = Problem.find_by_id(params[:id]) + @problem = Problem.find_by_id(params[:problem_id]) @problem.test_cases.destroy @problem.model_answers.destroy @problem.destroy @@ -113,6 +125,6 @@ def destroy_problem # Author: Abdullrahman Elhusseny private def problem_params - params.require(:Problem).permit(:title , :description) + params.require(:Problem).permit(:title , :description, :track_id) end end \ No newline at end of file diff --git a/tutor/app/views/problems/edit.html.erb b/tutor/app/views/problems/edit.html.erb index 13693372..c290d91c 100644 --- a/tutor/app/views/problems/edit.html.erb +++ b/tutor/app/views/problems/edit.html.erb @@ -19,6 +19,13 @@ and a paragraph to view the problem description of the instance variable @proble <%= p.hidden_field :title, value: @problem.title %> <% end %> +

    Current Track: <%= @track.title %>

    +<%= form_for :Problem, url: problem_path(@problem), method: :patch do |p| %> + <% if Array(@tracks).size > 1 %> + <%= p.collection_select(:track_id, @tracks, :id,:title ) %> + <%= p.submit('Change Track') %> + <% end %> +<% end %> <%= render partial: "test_cases/index" %> <%= render partial: "model_answers/new" %> diff --git a/tutor/db/development.sqlite3 b/tutor/db/development.sqlite3 index b42221be85b6afcfba8479cf19d57ea13ba01df1..ce46749b43351987e7bc0de2c7fda2d8ff323e0c 100644 GIT binary patch delta 8840 zcma(%3v3(bdH3Iul1Pd7%a(1~@ibjLx3)U#eD8l=8YdS1xhBoUSEiyZeiUe7W6akj3U6Uc52eciwtXShNU6vqek)~_* z9Vyxr@1%tG(K>y1-~0Xh;#cb~{(Ie(ySAbbK@cKbpM(p+_3eib2s`1ot*_thhFcQ< z3cd*ue}I35-~PLW`*1Vddad6zo`B~^ zFdc@+-SBuQnM+$#8eNnKRD=1wHTC<+ItpaSWOLyNa7y|}5H=nOWpinuPI(Zu%M-LL zbp6AAH{+$~Ul90fxQqS;nDHmHafEZm&fC| zcCohpdhNyk#rY2&_pG{7I*7*#bVAk%n;;mxtT|{`VgE&}J0Y6W}XEuo9)h zDxxIvTm`5MQqZ37RRT}bH+-*x_k7Q1ti-7u1-${#@9$f&3IkZHxw!(3c8CKJ6j@PJ zJ49u92w+hO&V+OEcsdxJ4<^`1JPNrdl87Cioe#$1Y$!RuR|xLqxxL3n1M|l@rPDup z&`5U8FON-RXBJ0u9X$)(7usis`uV|l&&a@N`)GS^d2wb;3MR)-#43FZ7_!K6f?Sz6 z${@U;vK;*3Z~w5;MD8H0ItL%Wzr`pBTw~q!t|hxl-GTxIR^WM_+YEBJlq<{R90~@z zV<)>p3zD9jA3MI>9$oD1i!6-CCk~F!ouBKC@dJimAM414hL_mErM}rYHhf`xr3saD z_^}w|SzY5~L9Z}Pp?nr0yc2`Nf`5WbMvl%baqWq&LI1I1V!|KJg#wv*Q9U10k0+M- zfpE|H@q-=dY$Dvj`ZqOy?m6lm z_r6j4TwRxMo9_p76qA_DZ>fJ`^{GL0m&*m+j|OZ?$h$H+R^7O37rN{=UmHcK{O6(S z#pY+tfl>4a<~PPrt91W(bz@T#y4;_&ig&3eDE%vR40ZZPI++oFdv7PRXYJRfKZz96 zJ&793&j!d{)n~!op={=ZRXeLQxljli2>5xI`QjvbfMh1jn`7uN(8>Inx+lGt=sXx4l(jBcQ)IU9ky*lOKb zbQeN%tNUhA1M*(-ovUu#w+~%DX&#B9lsPs@?l7N@qDv@lsxkDo=Tq}V)n9u>|CnR2+J#JddC z2qn!&;^;R(?BRKo_bi?->buiyO`yb1z`cioRxK0_ruRcCX*s~`u^K4zm02|RND9?n zuN`>58ES4lfuF+DxE}n7#KsA#hTsbsq_5D-4czYK7>5k6vAQ5@dSwQK=qy1_kQ?H2 zs3n@gYMh|)PM|f&323V~V9+6pX{@YCg5*#-N)Vs#S)$4}Q7F8=i7NUh^fJ8@baBLY zcAD}K#30NUe*f@N26|{Vnai@NG_(^VgzltS5)p~~tar)c&x38ZvrRzzjmy$J=QLK@kTgsO6yR#}q@ z(rBD0OX9R^6A~2^q;>i-iW8B_D!dF1Ws?u25LH>!#3^XRi9xtNhDjWpNM%Ki=k02m zJ0xl>G-#48O`(rZ!NK96a`S3ouB+(ufPf?ls&xIsgH%2JDZ)i_1kK^k(LbXf19xL+ zBMxm6L5w1gr^)XhiAI<{7_FH8nK>xmke#e?1Dd{>2oq!$V~Ip0y{%N(ZTb=x4AzH?8vRKp+f>VA=?|f!@89^yJdKSx`nKm|0@hsM!M* zsEL{&i1xGt)O3+o6(#BdBHfilBp_mBz_;RYODY>FN5KS97I?eo04Y`DB}JJb*W@Y0 zY)OB@I(f>pXUyB35Hc80Q5}gu#PS+Hi`L{>M}#jLsa%{gN{)n-W>wH+ySsxpf+i{) z_hgD>w)*e_;idxw9l+NyPrph3CHP7gZS+9u*abrdgzpgSEtdF=JyK=`n92l)WGb_w z1U3>oAYTJAD>@6v?2igEtHX-ww)Ty(-BJnE0V%m0i(QF;MdNuzcgU6{NC(uxawPUR z0wjvC2e3GF0v5=EfGGEXi|dm;ki*N>By6T8*g-fMM3h-c7C{;x{Y#jeuMqg_^cCC% zcDO_bCt<150k-hK>Y!Au`<9qY1Qu3drnKj3aXUCP&q_K6bC=Bvp#s5xDC$93qs5fflNqLw2?XI!ROIld!t67Kk30Sj$8>8%t-hMdUiH z>RQ}(K6zGzfE4Yxp#bTkq-ol<0atwuNk2>A)AX~Tv2W4F3PavSG=XRsF8KKU`|eC< z!^O>+aMnf)#z#$t#=~B)??4W(E#Ate$C>fL-dMIz=Lh}la$vY8W{8mBYK7#{B&>Pg0i+Sy)??TV~0=p%XL9eGqZk+*hP6%`qHEJFAZ2PU;hmzE1= zW5LG@LeJw3W&!ivZLXdrN}`cqmCE%Ua-Y^3;z@b zyjQWh1=gKHIeN05+6RMSnO2G_FMM0x)e6^sc==6y^%YkQiGN)f7~vQHjkmif0+AF& zc&vp7Nxw$mIr=p);Xi;08_1nRLjenX`Tb3I3^?Mq`?DajqM~b>y-M7H9L@&IthN~F z9UYt*9SnB*=Y)|&s^>^9kYX>)9|;HM$5^8~C-VIHxpsZ<kuTWLTW zvt>`TK%5s<1xljLS|tcy!B%G|(K$46=-kmjZwEgcTROOyJ2u-NA09ZKJRvR&E%XZ9 z@?5;LdoGsr4WKNT)j}zhqpV2AhP5!WT1|?3TI~$ zXcZyA-4I;)ZS_5maHQKqzfRyMa6A1vsO2@Qu zJK%?WT)Rn5Z$mx}+iB>cH+UO*GY+PaO80=bixBX6&-w-a?^U@xsI;i!C3?8eI&OffTNq!gLndb91_+u|nTN5|o&i83FlDN$0M68z-%{^4j=2CY zDn`^u0k7n8D5@N*>$){>S4ssKWm$(|=$Lhsvks9+IVhKdq6RHkDGDa-tC>&1e5D}8*Fp2}tB4iLEVq=_k!@`Ta zAnFdi)oq9s1iq%a8w9?AFXF?Ppl{F@>BBVPyWzX&JM1IsZh(p&t25esR%?W@-=DQt zd=bu6WKDBe`am1c={l5`wz|#V*R1usgC{}U$*?asq_*145kRU^;c(98iaa#iiX^LT z-p${K^A1(EhqnZsqs+;MAhvl*2+n40WIzJ~r}3a`2L^yTcwSr0=I?W0eW#JjYA+Q7 zMxnOq%@Dw(DT7PeQw&JJ19?$ytJ?g1O@MUis6mc1cwLj*+?yj%bWU`bM_dS zxk~Rl`49}|u*GpQA;&6)rofJ;4OXQ^Cv-A_V6A&Za3h-uAoW2Ih*BG@MmKh1m^eX8 zaG>e%eiQ_Q1F^QkfM7*|GXqer1&2-wGypqEP2mgSM%+uFMe=_4XWVa9UGZG?3f>Rv zT73KIo%Ai@-iQ57)Ft`;)qgxg%CO^hr3)MM%j0H45`8Hzy0@4Qog%lJ7X##u{1x{B z?}PVc3j6Day3MVFnq8;Jub|JE|9Ogh1$}n)>C@yk^#9RRI&1&{ delta 3029 zcmaJ@du&tJ8Nc5>cAV?iF;MCPOKnKf5R%;7r?0QuQUYlLNk~ixkAzj=I1YK*i68M2 zq`8KcPAl2~i=JtJw5Xl5NmC~v)x1B}G3}3a10>iqL^W-!>ZEDY=y-JNw8H4lbsEPB zVb}M5_ulh6{(X;gzVEv)e`J68to`KLmCQ+oVMKb(9}}nQrKjjzG94CEPn zAAjaBou4{_D>h21T1&^=JE(Xv;Gh!W8w{QCH+*AuMex@+cf-?QMfkcgb{+qfj(vc0 z*Bcx2rgQKR+drlAFERKM{tNz)Vn4;I9Z&@%lBt16G?_qlggo3>B%DmeBk_cdMe86O zOT`nBgoWyIa9>WG{i4h4U1@P#Veor+0K1*PbWS@rI9bgwhBYj#Vw##- z=z2WPI!PCG|FV1qqzwwz75HfI#Bf5i_#a0m_%v$5a%6MJ zg|jvnaCBSV#<}|!Il7H+8{7C__;!AU0Ds06hy!F|sbmo#j)p~8)2XYXHhxxi7NJQXxwIAn6YV+wl90Iz27YPwr(IFlU$H&aci7{-W7W!A_& zXln9!I=;*UZ%;ZF9BN)-xE>HR-lzLyK`J6XuOI~!Eg%WJPu5kRluXCA(2Ebp#;c@I zl_*rH{#b0Xb-F7ajC3Ws$HJMG-TND-d2yzHMoaE&*{OGm(VgkZ!PHnhbT}1BBt{0t zN7_xxtMKcpyaX{4iB}cBDr=&o@dEvc#Rnr|fbTN&oIhsQ25(}I6IF60w$9Caz~Bco zCJeKZ2JjX(A;fSOf+p9dm2i%Mb8IF1F8hUP*nFw%cb0UymlL^PSkKrt*#2SvzGJK7 z56<6X_SEUk&PlMi8yg|JA{pu*nfl(7;m&bumBlT~@cOgHTO_x>d=IdO_uqFSSL0AjWl)rTtR)IB}-fD5z)WER@ z!VSX&`Svgzg>7Wz2;AkE=0Y5f9VGTq*iWJ{aFI7h;WRh+qQzZN0k3+9J_fJXCsN@s z-E#*+$z)`FBAM9W9gZd=ha>TN?}ow9@EC0iMT|rnQ5Cs22FIa=Opn9o&`Od~$Z_HA z7WcY!aIAv3Vh|;#sjy~~I|}|E(@1tbIz#MHc#=G~0d0L_0&GB2ktTgfh8kHqYYIN_ zoW5oQPbo@A!OJ=JGWcny?$}Fnc)KH$J%lP2tr9~sxu%fGoRP`J9MQZI?F({1l6l>) zDZYi&Ek$%ilEp#V_qG_KBzZ>$#NN)1xI7tc(zK@VOt?3c_NCe~dv0a_A=;m}6l95;gNeiGexZ4)PvyItbbX+skq>X^UG_|WM!e`7lJ&m-$07q6(6z(;ZZkBigHoQT<G-MQ2_W2gt zvgQ@VfT9Fcji)u(r^vBrWDC7YT%3x>rnjf}wZ>Yba=0(wX$9pqj$dJ`Wv z@0=^6;-WH|SD+e From e68d529634ece0df490c782cf26780f7c1c3b543 Mon Sep 17 00:00:00 2001 From: Linsara Date: Mon, 21 Apr 2014 20:53:36 +0200 Subject: [PATCH 239/938] Issue #182 Minor changes --- tutor/app/controllers/topics_controller.rb | 8 ++++++-- tutor/app/views/topics/show.html.erb | 13 +++++-------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/tutor/app/controllers/topics_controller.rb b/tutor/app/controllers/topics_controller.rb index 94623895..9ebb2bcb 100644 --- a/tutor/app/controllers/topics_controller.rb +++ b/tutor/app/controllers/topics_controller.rb @@ -99,6 +99,10 @@ def course_params params.permit(:course_id ) end + def track_params + params.permit(:difficulty) + end + end def edit @@ -109,9 +113,9 @@ def edit def sort id = params[:id] @topic = Topic.find_by_id(id) - @tracks = @topic.tracks #get the tracks of a certain topic + @tracks = @topic.tracks #get all the tracks of a certain topic - #men hena not sure what I should do + #from here not sure what I should do new_Order_Array = params[:methodParam] #now we we can use the array passed by Ajax @tracks.each do |track| track.difficulty = params[:methodParam].index(track.id) + 1 #track.id.to_s I removed.to_s part diff --git a/tutor/app/views/topics/show.html.erb b/tutor/app/views/topics/show.html.erb index c0326cb9..aad1fa31 100644 --- a/tutor/app/views/topics/show.html.erb +++ b/tutor/app/views/topics/show.html.erb @@ -26,19 +26,16 @@ $(document).ready(function() { Done: function(){ //call the ajax function here var array = $("#list-of-tracks").sortable('toArray') ; - $.ajax({ - type: 'POST', - dataType: 'javascript', - //should the url be "/tracks/sort" - //or "/tracks" + topic_id + "/sort" + //should the url be "/topics/sort" + //or "/topics" + topic_id + "/sort" //or "sort" only // should I include ROOT_PATH at the begining - url: 'topics/sort', - traditional: true, - //dataType: "json", + type: 'POST', data: { methodParam : array }, //use it as a key value pair + dataType: 'script', + success: function (data) { alert("success"); }, From bd21b6b3ae0c174d26a07f164a9e7b84538afba3 Mon Sep 17 00:00:00 2001 From: serag Date: Mon, 21 Apr 2014 21:00:37 +0200 Subject: [PATCH 240/938] Issue #206 Modified Controllers and added primative views --- Coolsoft-14 | 1 - 1 file changed, 1 deletion(-) delete mode 160000 Coolsoft-14 diff --git a/Coolsoft-14 b/Coolsoft-14 deleted file mode 160000 index 37221f72..00000000 --- a/Coolsoft-14 +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 37221f725d7016bbe114f1c23f3e0d313ca01a4c From 3871cf093ae001160412ebd51c1a70ae2039e34c Mon Sep 17 00:00:00 2001 From: Mahdi Date: Mon, 21 Apr 2014 21:10:37 +0200 Subject: [PATCH 241/938] Issue #248 modifying method and creating graph --- tutor/Gemfile | 3 +++ tutor/app/assets/javascripts/students.js.coffee | 3 +++ tutor/app/assets/stylesheets/students.css.scss | 3 +++ tutor/app/controllers/students_controller.rb | 8 ++++++++ tutor/app/helpers/students_helper.rb | 2 ++ tutor/app/views/students/get_performance.html.erb | 10 ++++++++++ tutor/config/routes.rb | 1 + tutor/test/controllers/students_controller_test.rb | 7 +++++++ tutor/test/helpers/students_helper_test.rb | 4 ++++ 9 files changed, 41 insertions(+) create mode 100644 tutor/app/assets/javascripts/students.js.coffee create mode 100644 tutor/app/assets/stylesheets/students.css.scss create mode 100644 tutor/app/controllers/students_controller.rb create mode 100644 tutor/app/helpers/students_helper.rb create mode 100644 tutor/app/views/students/get_performance.html.erb create mode 100644 tutor/test/controllers/students_controller_test.rb create mode 100644 tutor/test/helpers/students_helper_test.rb diff --git a/tutor/Gemfile b/tutor/Gemfile index 7382b0e9..acd95eed 100644 --- a/tutor/Gemfile +++ b/tutor/Gemfile @@ -23,6 +23,9 @@ gem 'coffee-rails', '~> 4.0.0' # Use jquery as the JavaScript library gem 'jquery-rails', '~> 3.1.0' +# +gem "chartkick" + # Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks gem 'turbolinks' diff --git a/tutor/app/assets/javascripts/students.js.coffee b/tutor/app/assets/javascripts/students.js.coffee new file mode 100644 index 00000000..24f83d18 --- /dev/null +++ b/tutor/app/assets/javascripts/students.js.coffee @@ -0,0 +1,3 @@ +# Place all the behaviors and hooks related to the matching controller here. +# All this logic will automatically be available in application.js. +# You can use CoffeeScript in this file: http://coffeescript.org/ diff --git a/tutor/app/assets/stylesheets/students.css.scss b/tutor/app/assets/stylesheets/students.css.scss new file mode 100644 index 00000000..322a6202 --- /dev/null +++ b/tutor/app/assets/stylesheets/students.css.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the students controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/tutor/app/controllers/students_controller.rb b/tutor/app/controllers/students_controller.rb new file mode 100644 index 00000000..03504200 --- /dev/null +++ b/tutor/app/controllers/students_controller.rb @@ -0,0 +1,8 @@ +class StudentsController < ApplicationController + + def get_performance + @solved = Attempt.count(:conditions => { :success => true, :student_id => current_student.id }) + @failed = Attempt.count(:conditions => { :failure => true, :student_id => current_student.id }) + end + +end \ No newline at end of file diff --git a/tutor/app/helpers/students_helper.rb b/tutor/app/helpers/students_helper.rb new file mode 100644 index 00000000..6191d9eb --- /dev/null +++ b/tutor/app/helpers/students_helper.rb @@ -0,0 +1,2 @@ +module StudentsHelper +end diff --git a/tutor/app/views/students/get_performance.html.erb b/tutor/app/views/students/get_performance.html.erb new file mode 100644 index 00000000..c9264602 --- /dev/null +++ b/tutor/app/views/students/get_performance.html.erb @@ -0,0 +1,10 @@ +<%= javascript_include_tag "//www.google.com/jsapi", "chartkick" %> +<%= column_chart [ + [ "Solved ones", @solved ], + [ "Wrong answers", @failed ], + [ "Attempted ones", '8'] + ], + + library: {bar: {groupWidth: "10%"}}, +colors: ["lightblue","grey","darkgrey"] + %> \ No newline at end of file diff --git a/tutor/config/routes.rb b/tutor/config/routes.rb index e9d7079c..f174e605 100644 --- a/tutor/config/routes.rb +++ b/tutor/config/routes.rb @@ -12,6 +12,7 @@ # get 'products/index' post 'courses/new' => 'courses#new' get 'courses/sign_up' + get 'students/get_performance' => 'students#get_performance' # You can have the root of your site routed with "root" diff --git a/tutor/test/controllers/students_controller_test.rb b/tutor/test/controllers/students_controller_test.rb new file mode 100644 index 00000000..0d88f7dd --- /dev/null +++ b/tutor/test/controllers/students_controller_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class StudentsControllerTest < ActionController::TestCase + # test "the truth" do + # assert true + # end +end diff --git a/tutor/test/helpers/students_helper_test.rb b/tutor/test/helpers/students_helper_test.rb new file mode 100644 index 00000000..54210367 --- /dev/null +++ b/tutor/test/helpers/students_helper_test.rb @@ -0,0 +1,4 @@ +require 'test_helper' + +class StudentsHelperTest < ActionView::TestCase +end From 9b973dfcf541ff74b1bcd7ee135f477cc1d10286 Mon Sep 17 00:00:00 2001 From: serag Date: Mon, 21 Apr 2014 21:15:52 +0200 Subject: [PATCH 242/938] Issue #206 Modified Controllers and added primative views --- tutor/app/controllers/lecturers_controller.rb | 4 ++-- tutor/app/controllers/students_controller.rb | 4 ++-- tutor/app/controllers/teaching_assistants_controller.rb | 4 ++-- tutor/app/views/lecturers/show.html.erb | 2 +- tutor/app/views/students/show.html.erb | 2 +- tutor/app/views/teaching_assistants/show.html.erb | 2 +- tutor/config/routes.rb | 4 ++-- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/tutor/app/controllers/lecturers_controller.rb b/tutor/app/controllers/lecturers_controller.rb index 096e7bdd..a64d7975 100644 --- a/tutor/app/controllers/lecturers_controller.rb +++ b/tutor/app/controllers/lecturers_controller.rb @@ -1,7 +1,7 @@ class LecturersController < ApplicationController - def index - end def show @lecturer = Lecturer.find(params[:id]) end + def index + end end \ No newline at end of file diff --git a/tutor/app/controllers/students_controller.rb b/tutor/app/controllers/students_controller.rb index bd7f3e35..84bf342d 100644 --- a/tutor/app/controllers/students_controller.rb +++ b/tutor/app/controllers/students_controller.rb @@ -1,7 +1,7 @@ class StudentsController < ApplicationController - def index - end def show @student = Student.find(params[:id]) end + def index + end end \ No newline at end of file diff --git a/tutor/app/controllers/teaching_assistants_controller.rb b/tutor/app/controllers/teaching_assistants_controller.rb index f07c2afe..10e2e7c9 100644 --- a/tutor/app/controllers/teaching_assistants_controller.rb +++ b/tutor/app/controllers/teaching_assistants_controller.rb @@ -1,7 +1,7 @@ class TeachingAssistantsController < ApplicationController - def index - end def show @teaching_assistant = TeachingAssistant.find(params[:id]) end + def index + end end \ No newline at end of file diff --git a/tutor/app/views/lecturers/show.html.erb b/tutor/app/views/lecturers/show.html.erb index b5386660..256accc2 100644 --- a/tutor/app/views/lecturers/show.html.erb +++ b/tutor/app/views/lecturers/show.html.erb @@ -1,7 +1,7 @@ - CoolSoft - Java Tutor + CoolSoft - Java Tutor | <%= @lecturer.id%>'s Profile

    I am <%= @lecturer.email%>

    diff --git a/tutor/app/views/students/show.html.erb b/tutor/app/views/students/show.html.erb index 298eccd4..5d06eaf6 100644 --- a/tutor/app/views/students/show.html.erb +++ b/tutor/app/views/students/show.html.erb @@ -1,7 +1,7 @@ - CoolSoft - Java Tutor + CoolSoft - Java tutor | <%= @student.id%>'s Profile

    I am <%= @student.email%>

    diff --git a/tutor/app/views/teaching_assistants/show.html.erb b/tutor/app/views/teaching_assistants/show.html.erb index c0cb5ab1..e87bb1db 100644 --- a/tutor/app/views/teaching_assistants/show.html.erb +++ b/tutor/app/views/teaching_assistants/show.html.erb @@ -1,7 +1,7 @@ - CoolSoft - Java Tutor + CoolSoft - Java Tutor | <%= @teaching_assistant.id%>'s Profile

    I am <%= @teaching_assistant.email%>

    diff --git a/tutor/config/routes.rb b/tutor/config/routes.rb index dd86ad5c..e6f43c82 100644 --- a/tutor/config/routes.rb +++ b/tutor/config/routes.rb @@ -28,9 +28,9 @@ resources :solutions resources :problems resources :topics - resources :students - resources :teaching_assistants resources :lecturers + resources :teaching_assistants + resources :students # Example resource route with options: # resources :products do From d3f2e5b1101c8932b3b52d1fa9af72fced74aaab Mon Sep 17 00:00:00 2001 From: Ahmed Moataz Date: Mon, 21 Apr 2014 21:18:39 +0200 Subject: [PATCH 243/938] Fixing issues --- tutor/app/controllers/solutions_controller.rb | 5 +++-- tutor/app/models/compiler.rb | 2 +- tutor/app/views/solutions/_new.html.erb | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/tutor/app/controllers/solutions_controller.rb b/tutor/app/controllers/solutions_controller.rb index 3302a35b..30202125 100644 --- a/tutor/app/controllers/solutions_controller.rb +++ b/tutor/app/controllers/solutions_controller.rb @@ -2,9 +2,9 @@ class SolutionsController < ApplicationController # [Code Editor: Write Code - Story 3.3] # Creates a solution for a problem that the student chose - # and outputs 2 flush messages for success and failure scenarios + # and outputs 2 flush messages for success and failure scenarios # Parameters: - # solution_params: submitted from the form_for + # solution_params: submitted from the form_for # Returns: none # Author: MOHAMEDSAEED def create @@ -49,6 +49,7 @@ def compile_solution flash[:compiler_fail] = "Compilation Failed!" flash[:compiler_feedback] = compiler_feedback[:errors] end + @solution.save redirect_to :back else flash[:alert] = "You did not write any code!" diff --git a/tutor/app/models/compiler.rb b/tutor/app/models/compiler.rb index a763d29e..3baee69c 100644 --- a/tutor/app/models/compiler.rb +++ b/tutor/app/models/compiler.rb @@ -81,7 +81,7 @@ def self.change_class_name(student_id, problem_id, solution_id, code) # Author: Ahmed Moataz def self.change_error_headers(student_id, problem_id, solution_id, feedback) header = 'st' + student_id.to_s + 'pr' + problem_id.to_s + 'so' + solution_id.to_s - return feedback.gsub(header, 'CoolSoft') + return feedback.gsub('students_solutions/Java/' + header, 'CoolSoft') end end \ No newline at end of file diff --git a/tutor/app/views/solutions/_new.html.erb b/tutor/app/views/solutions/_new.html.erb index 86956c71..229b8bd6 100644 --- a/tutor/app/views/solutions/_new.html.erb +++ b/tutor/app/views/solutions/_new.html.erb @@ -49,7 +49,8 @@ Console:
    + border-width: thin; max-height: 150px; min-height: 150px; background: #3d1451; overflow: scroll; + overflow-y: scroll; overflow-x: scroll; max-width: 750px; min-width: 750px;">

    <%= flash[:compiler_success] %>

    <%= flash[:compiler_fail] %>

    <%= flash[:compiler_feedback] %>

    From 268bff7c17d0defd8e6aaa6ac284fff8f63bcb70 Mon Sep 17 00:00:00 2001 From: MussabElDash Date: Mon, 21 Apr 2014 21:21:23 +0200 Subject: [PATCH 244/938] #250 Editing regex of getline --- tutor/app/models/debugger.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tutor/app/models/debugger.rb b/tutor/app/models/debugger.rb index 2245b4f3..a40fc221 100644 --- a/tutor/app/models/debugger.rb +++ b/tutor/app/models/debugger.rb @@ -124,9 +124,10 @@ def debug # Author: Mussab ElDash def get_line out_stream = buffer_until_complete + puts out_stream list_of_lines = out_stream.split(/\n+/) last_line = list_of_lines[-2] - /\d+/=~ last_line + /^\d+/=~ last_line regex_capture = $& if regex_capture return regex_capture.to_i From 3eeb862f40840cace4ae4c68f749d8cafe3bd083 Mon Sep 17 00:00:00 2001 From: Ahmed Atef Date: Mon, 21 Apr 2014 21:23:35 +0200 Subject: [PATCH 245/938] giving the current user the post created --- tutor/app/controllers/posts_controller.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tutor/app/controllers/posts_controller.rb b/tutor/app/controllers/posts_controller.rb index b2ac6773..f12c0bc5 100644 --- a/tutor/app/controllers/posts_controller.rb +++ b/tutor/app/controllers/posts_controller.rb @@ -42,12 +42,15 @@ def create if lecturer_signed_in? @new_post.owner_id = current_lecturer.id @new_post.owner_type = "lecturer" + current_lecturer.posts << @new_post elsif teaching_assistant_signed_in? @new_post.owner_id = current_teaching_assistant.id @new_post.owner_type = "teaching assistant" + current_teaching_assistant << @new_post elsif student_signed_in? @new_post.owner_id = current_student.id @new_post.owner_type = "student" + current_student.posts << @new_post end if @new_post.save flash[:notice] = "Post successfully created" From 233d86a655d3158d4b62fbffdaa00e7944e927fb Mon Sep 17 00:00:00 2001 From: Mussab ElDash Date: Mon, 21 Apr 2014 21:24:34 +0200 Subject: [PATCH 246/938] Update debugger.rb --- tutor/app/models/debugger.rb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tutor/app/models/debugger.rb b/tutor/app/models/debugger.rb index a40fc221..9379ea25 100644 --- a/tutor/app/models/debugger.rb +++ b/tutor/app/models/debugger.rb @@ -30,7 +30,7 @@ def buffer_until regex # [Debugger: Debug - Story 3.6] # Gets the output from the output stream of the debugger # until the below regex is encountered - # Parameters: None + # Parameters: none # Returns: A String of the buffer # Author: Rami Khalil def buffer_until_ready @@ -40,7 +40,7 @@ def buffer_until_ready # [Debugger: Debug - Story 3.6] # Gets the output from the output stream of the debugger # until the below regex is encountered - # Parameters: None + # Parameters: none # Returns: A String of the buffer # Author: Rami Khalil def buffer_until_complete @@ -51,14 +51,14 @@ def buffer_until_complete # Inputs an input to the input stream of the debugger JDB # Parameters: # input : The input to be written in the sub stream - # Returns: None + # Returns: none # Author: Rami Khalil def input input $input.puts input end # [Debugger: Debug - Story 3.6] - # Starts the debugging session and return all variables and there values + # Starts the debugging session and return all variables and their values # 100 steps ahead # Parameters: # file_path : The path of the file to debugged @@ -96,8 +96,8 @@ def start(file_path, input) # [Debugger: Debug - Story 3.6] # Iterates 100 times to get the value of all local variables in each step - # Parameters: None - # Returns: None + # Parameters: none + # Returns: none # Author: Mussab ElDash def debug counter = 0 @@ -119,7 +119,7 @@ def debug # [Debugger: Debug - Story 3.6] # Gets the number of the line to be executed - # Parameters: None + # Parameters: none # Returns: The number of the line to be executed # Author: Mussab ElDash def get_line From 6ec574d625b2b7de2211f0e41a3374772247f003 Mon Sep 17 00:00:00 2001 From: Ahmed Atef Date: Mon, 21 Apr 2014 21:24:49 +0200 Subject: [PATCH 247/938] Fixed indentation in show view of posts --- tutor/app/views/posts/show.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tutor/app/views/posts/show.html.erb b/tutor/app/views/posts/show.html.erb index 00d70d9d..858f2b82 100644 --- a/tutor/app/views/posts/show.html.erb +++ b/tutor/app/views/posts/show.html.erb @@ -6,7 +6,7 @@ <% unless @replies.blank? %> <% @replies.each do |reply| %>
    - <%= reply.content %>
    + <%= reply.content %>

    <% end %> From 78e79470b4fb0ea4823bcc34f5cae0341ee93602 Mon Sep 17 00:00:00 2001 From: Mussab ElDash Date: Mon, 21 Apr 2014 21:27:51 +0200 Subject: [PATCH 248/938] Update solutions.js.coffee --- tutor/app/assets/javascripts/solutions.js.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tutor/app/assets/javascripts/solutions.js.coffee b/tutor/app/assets/javascripts/solutions.js.coffee index 19da3214..c0618bcb 100644 --- a/tutor/app/assets/javascripts/solutions.js.coffee +++ b/tutor/app/assets/javascripts/solutions.js.coffee @@ -7,7 +7,7 @@ IndexNumber = 0 # Sends the code to the server and changes the Variables to the data recieved # Parameters: # problem_id: The id of the problem being solved -# Returns: None +# Returns: none # Author: Mussab ElDash @start_debug = (problem_id) -> input = $('#solution_code').val() From 77db9f02a56c7c8f0f2be8bc420cd2c245455908 Mon Sep 17 00:00:00 2001 From: Ahmed Moataz Date: Mon, 21 Apr 2014 21:34:21 +0200 Subject: [PATCH 249/938] Placing the styling in the css file --- tutor/app/assets/stylesheets/solutions.css | 31 ++++++++++++++++++++++ tutor/app/views/solutions/_new.html.erb | 10 +++---- 2 files changed, 35 insertions(+), 6 deletions(-) diff --git a/tutor/app/assets/stylesheets/solutions.css b/tutor/app/assets/stylesheets/solutions.css index 4a3a4b5c..071e48ec 100644 --- a/tutor/app/assets/stylesheets/solutions.css +++ b/tutor/app/assets/stylesheets/solutions.css @@ -29,4 +29,35 @@ textarea { .presentation_error { display: none; color: blue; +} + +.console { + color: orange; + font-family: monospace; + border: #000000; + border-style: solid; + border-width: thin; + max-height: 150px; + min-height: 150px; + background: #3d1451; + overflow: scroll; + overflow-y: scroll; + overflow-x: scroll; + max-width: 750px; + min-width: 750px; +} + +.compilation_succeeded { + color: green; + margin: 5px; +} + +.compilation_failed { + color: red; + margin: 5px; +} + +.compilation_feedback { + white-space: pre; + margin: 5px; } \ No newline at end of file diff --git a/tutor/app/views/solutions/_new.html.erb b/tutor/app/views/solutions/_new.html.erb index 229b8bd6..4b0e1176 100644 --- a/tutor/app/views/solutions/_new.html.erb +++ b/tutor/app/views/solutions/_new.html.erb @@ -48,12 +48,10 @@ Console:
    -
    -

    <%= flash[:compiler_success] %>

    -

    <%= flash[:compiler_fail] %>

    -

    <%= flash[:compiler_feedback] %>

    +
    +

    <%= flash[:compiler_success] %>

    +

    <%= flash[:compiler_fail] %>

    +

    <%= flash[:compiler_feedback] %>

    <% end %> \ No newline at end of file From cb70679257aa26c25ab8d24a1d2a3f74d8f5c07f Mon Sep 17 00:00:00 2001 From: AmirGeorge Date: Mon, 21 Apr 2014 21:34:22 +0200 Subject: [PATCH 250/938] removed indentaion using spaces --- tutor/app/views/facebook/index.html.erb | 72 ++++++++++++------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/tutor/app/views/facebook/index.html.erb b/tutor/app/views/facebook/index.html.erb index 2e68cc39..0b2a571f 100644 --- a/tutor/app/views/facebook/index.html.erb +++ b/tutor/app/views/facebook/index.html.erb @@ -4,40 +4,40 @@
    - + (function(d, s, id){ + var js, fjs = d.getElementsByTagName(s)[0]; + if (d.getElementById(id)) {return;} + js = d.createElement(s); js.id = id; + js.src = "//connect.facebook.net/en_US/all.js"; + fjs.parentNode.insertBefore(js, fjs); + }(document, 'script', 'facebook-jssdk')); + From 4d51f4b9a7900c3511d2173b82f23de03b6c9efb Mon Sep 17 00:00:00 2001 From: AmirGeorge Date: Mon, 21 Apr 2014 21:43:45 +0200 Subject: [PATCH 251/938] removed unnecessary controller method --- tutor/app/controllers/facebook_controller.rb | 8 -------- 1 file changed, 8 deletions(-) diff --git a/tutor/app/controllers/facebook_controller.rb b/tutor/app/controllers/facebook_controller.rb index 39cab6ff..809bba26 100644 --- a/tutor/app/controllers/facebook_controller.rb +++ b/tutor/app/controllers/facebook_controller.rb @@ -1,10 +1,2 @@ class FacebookController < ApplicationController -# [Post to Facebook - Story 5.1] -# Renders the view that prompts user to post to facebook -# Parameters: None -# Returns: None -# Author: Amir George - def show - render ('index') - end end From 5f9c72cf6eff7c7cd16d0999690d7c950b90cc8a Mon Sep 17 00:00:00 2001 From: Ahmed Akram Date: Mon, 21 Apr 2014 21:55:29 +0200 Subject: [PATCH 252/938] Revert "Issue #248 modifying method and creating graph" This reverts commit 3871cf093ae001160412ebd51c1a70ae2039e34c. --- tutor/Gemfile | 3 --- tutor/app/assets/javascripts/students.js.coffee | 3 --- tutor/app/assets/stylesheets/students.css.scss | 3 --- tutor/app/controllers/students_controller.rb | 8 -------- tutor/app/helpers/students_helper.rb | 2 -- tutor/app/views/students/get_performance.html.erb | 10 ---------- tutor/config/routes.rb | 1 - tutor/test/controllers/students_controller_test.rb | 7 ------- tutor/test/helpers/students_helper_test.rb | 4 ---- 9 files changed, 41 deletions(-) delete mode 100644 tutor/app/assets/javascripts/students.js.coffee delete mode 100644 tutor/app/assets/stylesheets/students.css.scss delete mode 100644 tutor/app/controllers/students_controller.rb delete mode 100644 tutor/app/helpers/students_helper.rb delete mode 100644 tutor/app/views/students/get_performance.html.erb delete mode 100644 tutor/test/controllers/students_controller_test.rb delete mode 100644 tutor/test/helpers/students_helper_test.rb diff --git a/tutor/Gemfile b/tutor/Gemfile index acd95eed..7382b0e9 100644 --- a/tutor/Gemfile +++ b/tutor/Gemfile @@ -23,9 +23,6 @@ gem 'coffee-rails', '~> 4.0.0' # Use jquery as the JavaScript library gem 'jquery-rails', '~> 3.1.0' -# -gem "chartkick" - # Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks gem 'turbolinks' diff --git a/tutor/app/assets/javascripts/students.js.coffee b/tutor/app/assets/javascripts/students.js.coffee deleted file mode 100644 index 24f83d18..00000000 --- a/tutor/app/assets/javascripts/students.js.coffee +++ /dev/null @@ -1,3 +0,0 @@ -# Place all the behaviors and hooks related to the matching controller here. -# All this logic will automatically be available in application.js. -# You can use CoffeeScript in this file: http://coffeescript.org/ diff --git a/tutor/app/assets/stylesheets/students.css.scss b/tutor/app/assets/stylesheets/students.css.scss deleted file mode 100644 index 322a6202..00000000 --- a/tutor/app/assets/stylesheets/students.css.scss +++ /dev/null @@ -1,3 +0,0 @@ -// Place all the styles related to the students controller here. -// They will automatically be included in application.css. -// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/tutor/app/controllers/students_controller.rb b/tutor/app/controllers/students_controller.rb deleted file mode 100644 index 03504200..00000000 --- a/tutor/app/controllers/students_controller.rb +++ /dev/null @@ -1,8 +0,0 @@ -class StudentsController < ApplicationController - - def get_performance - @solved = Attempt.count(:conditions => { :success => true, :student_id => current_student.id }) - @failed = Attempt.count(:conditions => { :failure => true, :student_id => current_student.id }) - end - -end \ No newline at end of file diff --git a/tutor/app/helpers/students_helper.rb b/tutor/app/helpers/students_helper.rb deleted file mode 100644 index 6191d9eb..00000000 --- a/tutor/app/helpers/students_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module StudentsHelper -end diff --git a/tutor/app/views/students/get_performance.html.erb b/tutor/app/views/students/get_performance.html.erb deleted file mode 100644 index c9264602..00000000 --- a/tutor/app/views/students/get_performance.html.erb +++ /dev/null @@ -1,10 +0,0 @@ -<%= javascript_include_tag "//www.google.com/jsapi", "chartkick" %> -<%= column_chart [ - [ "Solved ones", @solved ], - [ "Wrong answers", @failed ], - [ "Attempted ones", '8'] - ], - - library: {bar: {groupWidth: "10%"}}, -colors: ["lightblue","grey","darkgrey"] - %> \ No newline at end of file diff --git a/tutor/config/routes.rb b/tutor/config/routes.rb index f174e605..e9d7079c 100644 --- a/tutor/config/routes.rb +++ b/tutor/config/routes.rb @@ -12,7 +12,6 @@ # get 'products/index' post 'courses/new' => 'courses#new' get 'courses/sign_up' - get 'students/get_performance' => 'students#get_performance' # You can have the root of your site routed with "root" diff --git a/tutor/test/controllers/students_controller_test.rb b/tutor/test/controllers/students_controller_test.rb deleted file mode 100644 index 0d88f7dd..00000000 --- a/tutor/test/controllers/students_controller_test.rb +++ /dev/null @@ -1,7 +0,0 @@ -require 'test_helper' - -class StudentsControllerTest < ActionController::TestCase - # test "the truth" do - # assert true - # end -end diff --git a/tutor/test/helpers/students_helper_test.rb b/tutor/test/helpers/students_helper_test.rb deleted file mode 100644 index 54210367..00000000 --- a/tutor/test/helpers/students_helper_test.rb +++ /dev/null @@ -1,4 +0,0 @@ -require 'test_helper' - -class StudentsHelperTest < ActionView::TestCase -end From 7f98b365a4b4c57bd3ee54fc85bc35f574acfc05 Mon Sep 17 00:00:00 2001 From: Ahmed Moataz Date: Mon, 21 Apr 2014 22:04:50 +0200 Subject: [PATCH 253/938] Issue: #240 - Fixing issue --- tutor/app/models/compiler.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tutor/app/models/compiler.rb b/tutor/app/models/compiler.rb index 3baee69c..de0722cc 100644 --- a/tutor/app/models/compiler.rb +++ b/tutor/app/models/compiler.rb @@ -21,9 +21,11 @@ class Compiler < ActiveRecord::Base # Author: Ahmed Moataz def self.compile(student_id, problem_id, solution_id, code) java_path = 'students_solutions/Java/' + %x[ #{'mkdir' + '-p' + java_path} ] file_name = java_path + 'st' + student_id.to_s + 'pr' + problem_id.to_s + 'so' + solution_id.to_s + '.java' File.open(file_name, 'w') { |file| file.write(code) } class_path = 'students_solutions/Class' + %x[ #{'mkdir' + '-p' + class_path} ] return %x[ #{'javac -g -d ' + class_path + ' ' + file_name + ' 2>&1'} ] end From 77a411dec47f6626e36eb7052f53bdf7fbc60a16 Mon Sep 17 00:00:00 2001 From: metawaa Date: Mon, 21 Apr 2014 22:07:56 +0200 Subject: [PATCH 254/938] Adding the edit form --- tutor/app/controllers/courses_controller.rb | 21 +++++++++++-- tutor/app/views/courses/edit.html.erb | 34 ++++++++++++++++++++- 2 files changed, 51 insertions(+), 4 deletions(-) diff --git a/tutor/app/controllers/courses_controller.rb b/tutor/app/controllers/courses_controller.rb index 5bd5e1f9..1f795a1f 100644 --- a/tutor/app/controllers/courses_controller.rb +++ b/tutor/app/controllers/courses_controller.rb @@ -142,9 +142,24 @@ def show def manage end + # [Edit a course - story 1.17] + #Description: This action is resposible for editing a specific course. + #Parameters: + # id: Course id + # Returns: + # null + # Author: Mohamed Metawaa + def update + @course = Course.find_by_id(params[:id]) + if @course.update(course_params) + redirect_to @course + else + render 'edit' + end + end + end + private def course_params params.require(:course).permit(:name,:code,:year,:semester,:description) - end - -end \ No newline at end of file + end \ No newline at end of file diff --git a/tutor/app/views/courses/edit.html.erb b/tutor/app/views/courses/edit.html.erb index 2a259c5f..9a3cb8bd 100644 --- a/tutor/app/views/courses/edit.html.erb +++ b/tutor/app/views/courses/edit.html.erb @@ -30,8 +30,40 @@ <%= button_to str, {:controller => :discussion_boards, :action => 'toggle', :id => @discussionBoard.id}, class: "btn btn-success", style: "float: left; margin-left: 15px" %>
    -
    +
    +
    + <%= form_for :course, url: course_path(@course), method: :patch do |c| %> +

    +

    <%= c.label :name %>
    + <%= c.text_field :name %> +

    + +

    + <%= c.label :code %>
    + <%= c.text_area :code %> +

    + +

    + <%= c.label :year %>
    + <%= c.text_area :year %> +

    + +

    + <%= c.label :semester %>
    + <%= c.text_area :semester %> +

    +

    + <%= c.label :description %>
    + <%= c.text_area :description %> +

    + +

    + <%= c.submit %> +

    + <% end %> + <%= link_to 'Back', courses_path %> +
    <%= button_to "Delete Course", {:action => "destroy"}, class: "btn btn-danger" , style: "margin-top: 100px; float: right", method: :delete %> From c3f1847120e19720abd321be67690d80051b92e4 Mon Sep 17 00:00:00 2001 From: Mohab Date: Mon, 21 Apr 2014 22:12:19 +0200 Subject: [PATCH 255/938] Adding recommend dialog --- tutor/app/assets/javascripts/tracks.js | 53 +++++++++++++++++----- tutor/app/assets/stylesheets/tracks.css | 2 +- tutor/app/controllers/tracks_controller.rb | 17 +++++++ tutor/config/routes.rb | 1 + 4 files changed, 60 insertions(+), 13 deletions(-) diff --git a/tutor/app/assets/javascripts/tracks.js b/tutor/app/assets/javascripts/tracks.js index 5fe1949c..d37a2209 100644 --- a/tutor/app/assets/javascripts/tracks.js +++ b/tutor/app/assets/javascripts/tracks.js @@ -1,15 +1,44 @@ // Semicolon (;) to ensure closing of earlier scripting // Encapsulation // $ is assigned to jQuery -; -(function ($) { - // DOM Ready - $(function () { - // Binding a click event - // From jQuery v.1.7.0 use .on() instead of .bind() - $('#my-button1').bind('click', function (e) { - e.preventDefault(); - $('#element_to_pop_up').bPopup(); - }); - }); -})(jQuery); + +function showdialog(id){ + + $.ajax({ + type: "GET", + url: '/tracks/recommend_problem/' + id, + datatype: 'json', + success: fill + }); +} + +function fill(data){ + elem = $('#container'); + elem.html(""); + if(Object.keys(data).length == 0){ + elem.html("
    Empty
    "); + $('.classmates_list').bPopup(); + return; + } + elem.html("
      "); + $.each(data, function (i , datum){ + datum = data[i]; + temp = "
    • " + datum + " " + i + "
      • " + elem.append(temp); + }); + elem.append("
    "); + $('.classmates_list').bPopup(); +} +// ; +// (function ($) { +// // DOM Ready +// $(function () { +// // Binding a click event +// // From jQuery v.1.7.0 use .on() instead of .bind() +// $('.recommend').bind('click', function (e) { +// e.preventDefault(); + +// $('.classmates_list').bPopup(); +// }); +// }); +// })(jQuery); diff --git a/tutor/app/assets/stylesheets/tracks.css b/tutor/app/assets/stylesheets/tracks.css index cd66111d..446ede9a 100644 --- a/tutor/app/assets/stylesheets/tracks.css +++ b/tutor/app/assets/stylesheets/tracks.css @@ -1,4 +1,4 @@ -#element_to_pop_up { +.classmates_list { background-color:#fff; border-radius:10px; color:#000; diff --git a/tutor/app/controllers/tracks_controller.rb b/tutor/app/controllers/tracks_controller.rb index 51287bdc..8e525e52 100644 --- a/tutor/app/controllers/tracks_controller.rb +++ b/tutor/app/controllers/tracks_controller.rb @@ -68,6 +68,23 @@ def create end end + def recommend_problem + problem = Problem.find_by_id(params[:id]) + track = problem.track + topic = problem.track.topic + course = problem.track.topic.course + students_enrolled = course.students + students_receiving_recommendation = Hash.new + + students_enrolled.each do |student| + student_level = TrackProgression.get_progress(student.id,topic.id) + if (student_level == track.difficulty) + students_receiving_recommendation[student.id] = student.name + end + end + render json: students_receiving_recommendation + end + # [Create Track - Story 4.1] # permits the passed parameters # Parameters: diff --git a/tutor/config/routes.rb b/tutor/config/routes.rb index e9d7079c..59a145d8 100644 --- a/tutor/config/routes.rb +++ b/tutor/config/routes.rb @@ -12,6 +12,7 @@ # get 'products/index' post 'courses/new' => 'courses#new' get 'courses/sign_up' + get 'tracks/recommend_problem/:id' => 'tracks#recommend_problem' # You can have the root of your site routed with "root" From 7b48a8645ee41144addea4d770cbc58f92129a5c Mon Sep 17 00:00:00 2001 From: Khaled Date: Mon, 21 Apr 2014 22:14:00 +0200 Subject: [PATCH 256/938] Issue #193 Added method for getting field variables and Added documentation --- tutor/app/models/debugger.rb | 60 +++++++++++++++++++++++++++++++++--- 1 file changed, 56 insertions(+), 4 deletions(-) diff --git a/tutor/app/models/debugger.rb b/tutor/app/models/debugger.rb index fb48ce17..7acbcf4d 100644 --- a/tutor/app/models/debugger.rb +++ b/tutor/app/models/debugger.rb @@ -9,10 +9,16 @@ class Debugger < ActiveRecord::Base #Methods + # [Debugger: View Variables - Story 3.7] + # Returns a list of all variables in the class with + # their values + # Parameters: None + # Returns: An Array + # Author: Khaled Helmy def get_variables method_arguments = [] local_variables = [] - instance_variables = get_instance_variables + class_variables = get_class_variables flag = 0 input "locals" output_buffer = buffer_until_complete @@ -32,13 +38,52 @@ def get_variables local_variables = local_variables + variable_value end end - return method_arguments + local_variables + instance_variables + return method_arguments + local_variables + class_variables end - def get_instance_variables - input "dump this" + # [Debugger: View Variables - Story 3.7] + # Return the list of instance and static variables from within + # static methods + # Parameters: None + # Returns: An Array + # Author: Khaled Helmy + def get_class_variables + result = [] + input "print this.getClass().getName()" + flag = 0 + output_buffer = buffer_until_complete + output_buffer.each_line do |line| + if flag == 1 + class_name = output_buffer.split(" = ").last + input "fields " + class_name + fields_list = buffer_until_complete + fields_list.each_line do |line| + if line.match("fields list") + next + else + field_name = line.split(" ").last + input "print this." + field_name + field_result = buffer_until_complete + field_result = field_result.split(".").last + result << field_result + end + end + else + if line.match("Exception") + break + else + flag = 1 + end + end + return result end + # [Debugger: View Variables - Story 3.7] + # Takes a variable and evaluates its value + # Parameters: + # variable: A String containing a variable assignment + # Returns: An Array + # Author: Khaled Helmy def get_value variable result = [] if variable.match("instance") @@ -56,6 +101,13 @@ def get_value variable return result end + # [Debugger: View Variables - Story 3.7] + # Takes a line containing an object assignment and extracts + # the object name + # Parameters: + # variable: A String containing an object assignment + # Returns: A String + # Author: Khaled Helmy def get_name variable name = variable.split(" = ").first return name From a2df1b20cf48bbb180072ba5b71ffa54c76c1954 Mon Sep 17 00:00:00 2001 From: Ahmed Atef Date: Mon, 21 Apr 2014 22:14:43 +0200 Subject: [PATCH 257/938] installed missing gems and changed in the edit post view --- tutor/Gemfile.lock | 2 ++ tutor/app/views/posts/edit.html.erb | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/tutor/Gemfile.lock b/tutor/Gemfile.lock index fa0d2aac..43582f98 100644 --- a/tutor/Gemfile.lock +++ b/tutor/Gemfile.lock @@ -29,6 +29,7 @@ GEM atomic (1.1.16) bcrypt (3.1.7) builder (3.1.4) + chartkick (1.2.4) coffee-rails (4.0.1) coffee-script (>= 2.2.0) railties (>= 4.0.0, < 5.0) @@ -131,6 +132,7 @@ PLATFORMS ruby DEPENDENCIES + chartkick coffee-rails (~> 4.0.0) composite_primary_keys (~> 6.0.1) devise diff --git a/tutor/app/views/posts/edit.html.erb b/tutor/app/views/posts/edit.html.erb index 5f646fbe..2b66ea55 100644 --- a/tutor/app/views/posts/edit.html.erb +++ b/tutor/app/views/posts/edit.html.erb @@ -18,7 +18,6 @@ <%= f.label :content %>
    <%= f.text_area :content, class:"form-control", style: "margin-left:auto; margin-right:auto;height:200px;width:500px;resize:none", placeholder: "Enter your post"%> - <%= f.hidden_field :discussion_board_id, value: params[:discussion_board_id] %>

    <%= f.submit "Update Post", class: "btn btn-success"%> From 2d24d8b359a5c73248f99d438fa977879d63d665 Mon Sep 17 00:00:00 2001 From: Ahmed Moataz Date: Mon, 21 Apr 2014 22:15:03 +0200 Subject: [PATCH 258/938] Issue: #240 - Removing extra files --- tutor/testfile_testfile.txt | 1 - 1 file changed, 1 deletion(-) delete mode 100644 tutor/testfile_testfile.txt diff --git a/tutor/testfile_testfile.txt b/tutor/testfile_testfile.txt deleted file mode 100644 index 3310abc9..00000000 --- a/tutor/testfile_testfile.txt +++ /dev/null @@ -1 +0,0 @@ -Hi! Hi! \ No newline at end of file From 4f0762a78e5c0b7851a02438149cc07e20542004 Mon Sep 17 00:00:00 2001 From: AmirGeorge Date: Mon, 21 Apr 2014 22:16:16 +0200 Subject: [PATCH 259/938] fixed scenario error when post text could be empty --- tutor/app/views/facebook/index.html.erb | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/tutor/app/views/facebook/index.html.erb b/tutor/app/views/facebook/index.html.erb index 0b2a571f..bd8f6c5c 100644 --- a/tutor/app/views/facebook/index.html.erb +++ b/tutor/app/views/facebook/index.html.erb @@ -12,25 +12,8 @@ xfbml : true }); FB.ui({ - method: 'feed', - name: 'The Facebook SDK for Javascript', - caption: 'Bringing Facebook to the desktop and mobile web', - description: ( - 'A small JavaScript library that allows you to harness ' + - 'the power of Facebook, bringing the user\'s identity, ' + - 'social graph and distribution power to your site.' - ), - link: 'https://developers.facebook.com/docs/reference/javascript/', - picture: 'http://www.fbrell.com/public/f8.jpg' - }, - function(response) { - if (response && response.post_id) { - alert('Post was published.'); - } else { - alert('Post was not published.'); - } - } - ); + method: 'feed' + }); }; (function(d, s, id){ From 739da5926a8ff67599d5cd3e40e0ff1077bb5aab Mon Sep 17 00:00:00 2001 From: metawaa Date: Mon, 21 Apr 2014 22:23:14 +0200 Subject: [PATCH 260/938] fixing implementation 3 --- tutor/app/views/courses/show.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tutor/app/views/courses/show.html.erb b/tutor/app/views/courses/show.html.erb index baf5afb5..a50f2758 100644 --- a/tutor/app/views/courses/show.html.erb +++ b/tutor/app/views/courses/show.html.erb @@ -36,7 +36,7 @@

      <% t.tracks.each do |tt|%> - <% color = "label label-default" %> + <% color = "label label-default" %>
    • <%= link_to tt.title , tt , class: color %> From 279c1655c796a6fe44425f1ad47112162eb3a0aa Mon Sep 17 00:00:00 2001 From: Ahmed Moataz Date: Mon, 21 Apr 2014 22:44:10 +0200 Subject: [PATCH 261/938] Issue: #240 - Fixing bug --- tutor/app/models/compiler.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tutor/app/models/compiler.rb b/tutor/app/models/compiler.rb index de0722cc..9233a04c 100644 --- a/tutor/app/models/compiler.rb +++ b/tutor/app/models/compiler.rb @@ -21,11 +21,11 @@ class Compiler < ActiveRecord::Base # Author: Ahmed Moataz def self.compile(student_id, problem_id, solution_id, code) java_path = 'students_solutions/Java/' - %x[ #{'mkdir' + '-p' + java_path} ] + %x[ #{'mkdir' + ' -p ' + java_path} ] file_name = java_path + 'st' + student_id.to_s + 'pr' + problem_id.to_s + 'so' + solution_id.to_s + '.java' File.open(file_name, 'w') { |file| file.write(code) } class_path = 'students_solutions/Class' - %x[ #{'mkdir' + '-p' + class_path} ] + %x[ #{'mkdir' + ' -p ' + class_path} ] return %x[ #{'javac -g -d ' + class_path + ' ' + file_name + ' 2>&1'} ] end From 0aff335248753c9138f773b700e008f77365a506 Mon Sep 17 00:00:00 2001 From: Ahmed Moataz Date: Mon, 21 Apr 2014 22:47:43 +0200 Subject: [PATCH 262/938] Issue: #240 - Fixing bug modification --- tutor/app/models/compiler.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tutor/app/models/compiler.rb b/tutor/app/models/compiler.rb index 9233a04c..6717f68d 100644 --- a/tutor/app/models/compiler.rb +++ b/tutor/app/models/compiler.rb @@ -21,11 +21,11 @@ class Compiler < ActiveRecord::Base # Author: Ahmed Moataz def self.compile(student_id, problem_id, solution_id, code) java_path = 'students_solutions/Java/' - %x[ #{'mkdir' + ' -p ' + java_path} ] + %x[ #{'mkdir -p ' + java_path} ] file_name = java_path + 'st' + student_id.to_s + 'pr' + problem_id.to_s + 'so' + solution_id.to_s + '.java' File.open(file_name, 'w') { |file| file.write(code) } class_path = 'students_solutions/Class' - %x[ #{'mkdir' + ' -p ' + class_path} ] + %x[ #{'mkdir -p ' + class_path} ] return %x[ #{'javac -g -d ' + class_path + ' ' + file_name + ' 2>&1'} ] end From 51719ff028ef52e38fd7a4c5908be60aa2110301 Mon Sep 17 00:00:00 2001 From: AmirGeorge Date: Mon, 21 Apr 2014 23:11:30 +0200 Subject: [PATCH 263/938] added post published/not published message --- tutor/app/views/facebook/index.html.erb | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/tutor/app/views/facebook/index.html.erb b/tutor/app/views/facebook/index.html.erb index bd8f6c5c..3e00b102 100644 --- a/tutor/app/views/facebook/index.html.erb +++ b/tutor/app/views/facebook/index.html.erb @@ -11,11 +11,19 @@ status : true, xfbml : true }); - FB.ui({ - method: 'feed' - }); + FB.ui( + { + method: 'feed' + }, + function(response) { + if (response && response.post_id) { + alert('Post was published.'); + } else { + alert('Post was not published.'); + } + } + ); }; - (function(d, s, id){ var js, fjs = d.getElementsByTagName(s)[0]; if (d.getElementById(id)) {return;} @@ -23,4 +31,4 @@ js.src = "//connect.facebook.net/en_US/all.js"; fjs.parentNode.insertBefore(js, fjs); }(document, 'script', 'facebook-jssdk')); - + \ No newline at end of file From e629c815f2802ed311bf8120cdc26c87d1462e01 Mon Sep 17 00:00:00 2001 From: Mimi Date: Mon, 21 Apr 2014 23:45:23 +0200 Subject: [PATCH 264/938] addin hints controller and its view --- tutor/app/controllers/hints_controller.rb | 45 +++++++++++++++++++++++ tutor/app/views/hints/show.html.erb | 19 ++++++++++ tutor/config/routes.rb | 1 + 3 files changed, 65 insertions(+) create mode 100644 tutor/app/controllers/hints_controller.rb create mode 100644 tutor/app/views/hints/show.html.erb diff --git a/tutor/app/controllers/hints_controller.rb b/tutor/app/controllers/hints_controller.rb new file mode 100644 index 00000000..e36e12a5 --- /dev/null +++ b/tutor/app/controllers/hints_controller.rb @@ -0,0 +1,45 @@ +class HintsController < ApplicationController + #t.text "message" + #t.boolean "category" + #t.integer "submission_counter" + #t.integer "model_answer_id" + #t.integer "owner_id" + #t.string "owner_type" + + + def show + @new_Tip = Problem.find_by_id(params[:id]) + end + + # [Edit helping hints - Story 4.13 ] + # Description: This action takes the passed parameters from + # the creation form, creates a new Hint record + # and assigns it to the respective problem. If the + # creation fails the user is redirected to the form + # with a "Failed" message. + # Parameters: + # hint_params[]: A list that has all fields entered by the user to in the + # create_topic_form + # Returns: + # flash[:notice]: A message indicating the success or failure of the creation + # Author: Mimi + def create + @new_Tip = Hint.new(hint_params) + bool = @new_Tip.save + if bool == true + flash[:notice] = "Hint successfully created" + #redirect_to :action => 'create' + redirect_to :back + else + if @new_Tip.errors.any? + flash[:notice] = @new_Tip.errors.full_messages.first + end + redirect_to :back + end + end + + private + def hint_params + params.require(:hint).permit(:message,:submission_counter) + end +end diff --git a/tutor/app/views/hints/show.html.erb b/tutor/app/views/hints/show.html.erb new file mode 100644 index 00000000..b38a2bb6 --- /dev/null +++ b/tutor/app/views/hints/show.html.erb @@ -0,0 +1,19 @@ +<% if flash[:notice] -%> +
      <%= flash[:notice] %>
      + <% end %> +


      + + <%= form_for :hint, url: { :controller => "hints",action: "create"} do |f| %> +

      + <%= f.label "text" %>
      + <%= f.text_field :message, autofocus: true, class:"form-control", style: "width:300px", placeholder: "text", value: params[:message] %> +

      +

      + <%= f.label :"The number of wrong submissions that hint appears after" %>
      + <%= f.text_area :submission_counter, class:"form-control", style: "margin-left:auto; + margin-right:auto;height:50px;width:500px;resize:none", value:params[:submission_counter] %> +

      +

      + <%= f.submit "Save", class: "btn btn-success"%> +

      +<% end %> \ No newline at end of file diff --git a/tutor/config/routes.rb b/tutor/config/routes.rb index e9d7079c..ee73ee70 100644 --- a/tutor/config/routes.rb +++ b/tutor/config/routes.rb @@ -29,6 +29,7 @@ resources :solutions resources :problems resources :topics + resources :hints # Example resource route with options: # resources :products do From 470dd204211b56a198863ac6b06bdac50345a654 Mon Sep 17 00:00:00 2001 From: Mimi Date: Tue, 22 Apr 2014 00:02:59 +0200 Subject: [PATCH 265/938] Adding validations for the hint model --- tutor/app/controllers/hints_controller.rb | 2 ++ tutor/app/models/hint.rb | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/tutor/app/controllers/hints_controller.rb b/tutor/app/controllers/hints_controller.rb index e36e12a5..be440573 100644 --- a/tutor/app/controllers/hints_controller.rb +++ b/tutor/app/controllers/hints_controller.rb @@ -25,6 +25,7 @@ def show # Author: Mimi def create @new_Tip = Hint.new(hint_params) + @new_Tip.category = false bool = @new_Tip.save if bool == true flash[:notice] = "Hint successfully created" @@ -34,6 +35,7 @@ def create if @new_Tip.errors.any? flash[:notice] = @new_Tip.errors.full_messages.first end + #render "create" redirect_to :back end end diff --git a/tutor/app/models/hint.rb b/tutor/app/models/hint.rb index 660b3fb9..2716fbc5 100644 --- a/tutor/app/models/hint.rb +++ b/tutor/app/models/hint.rb @@ -1,11 +1,14 @@ class Hint < ActiveRecord::Base #Validations + validates :message, presence: true + validates :submission_counter, presence: true, numericality: {only_integer: true, greater_than_or_equal_to: 0, + message: "is not valid"} #Relations belongs_to :model_answer belongs_to :owner, polymorphic: true - + #Scoops #Methods From 5a58e0f8f39ff7284b6f77fa38d1ccae0013ca8e Mon Sep 17 00:00:00 2001 From: Muhammad Mamdouh Date: Tue, 22 Apr 2014 01:26:01 +0200 Subject: [PATCH 266/938] fixed logic for the insertion --- tutor/app/controllers/teaching_assistants_controller.rb | 8 +++++--- tutor/app/views/teaching_assistants/index.html.erb | 6 +++--- tutor/app/views/teaching_assistants/new.html.erb | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/tutor/app/controllers/teaching_assistants_controller.rb b/tutor/app/controllers/teaching_assistants_controller.rb index 72b51bcb..f1fdfa59 100644 --- a/tutor/app/controllers/teaching_assistants_controller.rb +++ b/tutor/app/controllers/teaching_assistants_controller.rb @@ -5,14 +5,16 @@ def new end def create - @teaching_assistant = teaching_assistants.where(email: params[:email]) - @course = courses.find_by_id(params[:course_id]) + @teaching_assistant = TeachingAssistant.find_by_id(params[:teaching_assistant][:id]) + @course = Course.find_by_id(params[:course_id]) + @course.TAs << @teaching_assistant + redirect_to :action => 'index' end def index @course = Course.find(params[:course_id]) - @teaching_assistants = @course.TAs.order('name') + @course_teaching_assistants = @course.TAs.order('name') end diff --git a/tutor/app/views/teaching_assistants/index.html.erb b/tutor/app/views/teaching_assistants/index.html.erb index 3b5396f4..e12efa22 100644 --- a/tutor/app/views/teaching_assistants/index.html.erb +++ b/tutor/app/views/teaching_assistants/index.html.erb @@ -8,12 +8,12 @@ - - + + - <% @teaching_assistants.each do |teacing_assistant| %> + <% @course_teaching_assistants.each do |teaching_assistant| %> diff --git a/tutor/app/views/teaching_assistants/new.html.erb b/tutor/app/views/teaching_assistants/new.html.erb index 644b0d70..d93e6201 100644 --- a/tutor/app/views/teaching_assistants/new.html.erb +++ b/tutor/app/views/teaching_assistants/new.html.erb @@ -2,7 +2,7 @@ <%= form_for :teaching_assistant, url: {action: "create"} do |f| %>

      - <%= select("teaching_assistant", "email", TeachingAssistant.find(:all).collect {|p| [ p.name ] }, {:prompt => 'Select'}) %> + <%= select("teaching_assistant", "id", TeachingAssistant.find(:all).collect {|p| [p.name ,p.id ] }, {:prompt => 'Select'}) %>

      From b39f50c0d74d840cbee3e61a9d4842c0ac605a72 Mon Sep 17 00:00:00 2001 From: Ahmed Atef Date: Tue, 22 Apr 2014 01:44:29 +0200 Subject: [PATCH 267/938] fixed saving fields when leaving one of the fields empty and added values to the form fields to be given at rendering --- tutor/app/controllers/posts_controller.rb | 5 +++-- tutor/app/views/posts/new.html.erb | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/tutor/app/controllers/posts_controller.rb b/tutor/app/controllers/posts_controller.rb index f12c0bc5..138158dc 100644 --- a/tutor/app/controllers/posts_controller.rb +++ b/tutor/app/controllers/posts_controller.rb @@ -52,16 +52,17 @@ def create @new_post.owner_type = "student" current_student.posts << @new_post end + @discussion_board = DiscussionBoard.find(discussion_board_params[:discussion_board_id]) if @new_post.save flash[:notice] = "Post successfully created" - @discussion_board = DiscussionBoard.find(discussion_board_params[:discussion_board_id]) @discussion_board.posts << @new_post redirect_to :controller => 'posts', :action => 'show', :id => @new_post.id else if @new_post.errors.any? flash[:notice] = @new_post.errors.full_messages.first end - render :action => 'new' + #redirect_to :controller => 'posts', :action => 'new',:discussion_board_id => @discussion_board.id + render :action => 'new' end end diff --git a/tutor/app/views/posts/new.html.erb b/tutor/app/views/posts/new.html.erb index af096d8a..b984fd1e 100644 --- a/tutor/app/views/posts/new.html.erb +++ b/tutor/app/views/posts/new.html.erb @@ -12,13 +12,13 @@ <%= form_for :post, url: {action: "create"} do |f| %>

      <%= f.label "Title" %>
      - <%= f.text_field :title, autofocus: true, class:"form-control", style: "width:300px", placeholder: "Title"%> + <%= f.text_field :title, autofocus: true, class:"form-control", style: "width:300px", placeholder: "Title",:value => @new_post.title%>

      <%= f.label :content %>
      <%= f.text_area :content, class:"form-control", style: "margin-left:auto; - margin-right:auto;height:200px;width:500px;resize:none", placeholder: "Enter your post"%> - <%= f.hidden_field :discussion_board_id, value: params[:discussion_board_id] %> + margin-right:auto;height:200px;width:500px;resize:none", placeholder: "Enter your post",:value => @new_post.content%> + <%= f.hidden_field :discussion_board_id, value: params[:discussion_board_id], :value => @discussion_board.id%>

      <%= f.submit "Save", class: "btn btn-success"%> From 793c19bcc30fb2fcbdf556bc445e34194f5b9887 Mon Sep 17 00:00:00 2001 From: Mohab Date: Tue, 22 Apr 2014 02:22:10 +0200 Subject: [PATCH 268/938] Inserting recommendation in database --- tutor/app/assets/javascripts/tracks.js | 33 +++++++++++++++++----- tutor/app/assets/stylesheets/tracks.css | 14 +++++++-- tutor/app/controllers/tracks_controller.rb | 16 ++++++++++- tutor/app/views/tracks/show.html.erb | 18 ++++-------- tutor/config/routes.rb | 4 +-- 5 files changed, 59 insertions(+), 26 deletions(-) diff --git a/tutor/app/assets/javascripts/tracks.js b/tutor/app/assets/javascripts/tracks.js index d37a2209..3dce4149 100644 --- a/tutor/app/assets/javascripts/tracks.js +++ b/tutor/app/assets/javascripts/tracks.js @@ -2,17 +2,17 @@ // Encapsulation // $ is assigned to jQuery -function showdialog(id){ - +function showdialog(problem_id, recommender_id){ $.ajax({ type: "GET", - url: '/tracks/recommend_problem/' + id, + url: '/tracks/show_classmates/' + problem_id, datatype: 'json', - success: fill + success: function(json){ + fill(json, problem_id, recommender_id)} }); } -function fill(data){ +function fill(data, problem_id, recommender_id){ elem = $('#container'); elem.html(""); if(Object.keys(data).length == 0){ @@ -20,15 +20,34 @@ function fill(data){ $('.classmates_list').bPopup(); return; } - elem.html("

        "); + elem.html("

        Recommend this problem to

        ") + elem.append("
          "); $.each(data, function (i , datum){ datum = data[i]; - temp = "
        • " + datum + " " + i + "
          • " + temp = "
        • " + datum + + "" + + "
          • " elem.append(temp); }); elem.append("
        "); $('.classmates_list').bPopup(); } + +function recommend(problem_id, recommender_id, student_id){ + + $.ajax({ + type: "POST", + url: '/tracks/insert_recommendation/', + data: { p_id : problem_id, + r_id : recommender_id, + s_id : student_id + } + }); + +} // ; // (function ($) { // // DOM Ready diff --git a/tutor/app/assets/stylesheets/tracks.css b/tutor/app/assets/stylesheets/tracks.css index 446ede9a..768b794d 100644 --- a/tutor/app/assets/stylesheets/tracks.css +++ b/tutor/app/assets/stylesheets/tracks.css @@ -4,6 +4,14 @@ color:#000; display:none; padding:10px; - min-width:100px; - min-height: 100px; - } \ No newline at end of file + min-width:400px; + min-height: 600px; + } +#container li{ + padding: 10px; + list-style: none; +} + +.recommend { + float: right; +} \ No newline at end of file diff --git a/tutor/app/controllers/tracks_controller.rb b/tutor/app/controllers/tracks_controller.rb index 8e525e52..c7ec1279 100644 --- a/tutor/app/controllers/tracks_controller.rb +++ b/tutor/app/controllers/tracks_controller.rb @@ -68,7 +68,7 @@ def create end end - def recommend_problem + def show_classmates problem = Problem.find_by_id(params[:id]) track = problem.track topic = problem.track.topic @@ -85,6 +85,20 @@ def recommend_problem render json: students_receiving_recommendation end + def insert_recommendation + problem_id = params[:p_id] + student_id = params[:s_id] + recommender_id = params[:r_id] + + recommendation = Recommendation.new + recommendation.problem_id = problem_id + recommendation.student_id = student_id + recommendation.recommender_id = recommender_id + recommendation.save + + render :nothing => true + end + # [Create Track - Story 4.1] # permits the passed parameters # Parameters: diff --git a/tutor/app/views/tracks/show.html.erb b/tutor/app/views/tracks/show.html.erb index bbe5182d..9b980bf4 100644 --- a/tutor/app/views/tracks/show.html.erb +++ b/tutor/app/views/tracks/show.html.erb @@ -32,7 +32,7 @@ <%= link_to p.title , p , style: 'color:#003366;' , class: color %> -
        Click me!
        +
        Recommend to classmates
        @@ -40,18 +40,10 @@
        <% end %> - -
        -
        -
          -
        • kdj ie Lorem ipsum dolor sit amet
          • -
        • consectetur adipisicing elit, sed do eiusmod
          • -
        • labore et dolore magna aliqua. Ut enim ad minim veniam
          • -
        • quis nostrud exercitation ullamco laboris nisi
          • -
        • ut aliquip ex ea commodo consequat. Duis aute irure dolor in
          • -
        • cillum dolore eu fugiat nulla pariatur. Excepteur
          • -
        -
        +
        +
        +
        +
        <% if @can_edit %> diff --git a/tutor/config/routes.rb b/tutor/config/routes.rb index 59a145d8..22eef24b 100644 --- a/tutor/config/routes.rb +++ b/tutor/config/routes.rb @@ -12,8 +12,8 @@ # get 'products/index' post 'courses/new' => 'courses#new' get 'courses/sign_up' - get 'tracks/recommend_problem/:id' => 'tracks#recommend_problem' - + get 'tracks/show_classmates/:id' => 'tracks#show_classmates' + post 'tracks/insert_recommendation' => 'tracks#insert_recommendation' # You can have the root of your site routed with "root" root 'site#index' From 5abb1c3da7b30937c7b9d2715a1f9bb051d8c6e8 Mon Sep 17 00:00:00 2001 From: Mohab Date: Tue, 22 Apr 2014 02:40:24 +0200 Subject: [PATCH 269/938] Preventing duplicate recommendations --- tutor/app/assets/javascripts/tracks.js | 3 ++- tutor/app/controllers/tracks_controller.rb | 7 ++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/tutor/app/assets/javascripts/tracks.js b/tutor/app/assets/javascripts/tracks.js index 3dce4149..fedf2dad 100644 --- a/tutor/app/assets/javascripts/tracks.js +++ b/tutor/app/assets/javascripts/tracks.js @@ -16,7 +16,7 @@ function fill(data, problem_id, recommender_id){ elem = $('#container'); elem.html(""); if(Object.keys(data).length == 0){ - elem.html("
        Empty
        "); + elem.html("
        No classmates to recommend this problem to
        "); $('.classmates_list').bPopup(); return; } @@ -46,6 +46,7 @@ function recommend(problem_id, recommender_id, student_id){ s_id : student_id } }); + showdialog(problem_id, recommender_id); } // ; diff --git a/tutor/app/controllers/tracks_controller.rb b/tutor/app/controllers/tracks_controller.rb index c7ec1279..6ab291dc 100644 --- a/tutor/app/controllers/tracks_controller.rb +++ b/tutor/app/controllers/tracks_controller.rb @@ -79,7 +79,12 @@ def show_classmates students_enrolled.each do |student| student_level = TrackProgression.get_progress(student.id,topic.id) if (student_level == track.difficulty) - students_receiving_recommendation[student.id] = student.name + if (!Recommendation.where( + :problem_id => problem.id, + :recommender_id => current_student.id, + :student_id => student.id).present?) + students_receiving_recommendation[student.id] = student.name + end end end render json: students_receiving_recommendation From 3ee0b20472448c7a501b46cccf21c4493abd0bfe Mon Sep 17 00:00:00 2001 From: Muhammad Mamdouh Date: Tue, 22 Apr 2014 04:44:55 +0200 Subject: [PATCH 270/938] added flash , catching exceptions when trying to add TA twice --- .../teaching_assistants_controller.rb | 19 ++++++++++++++----- tutor/app/models/teaching_assistant.rb | 2 ++ .../views/teaching_assistants/new.html.erb | 8 +++++++- 3 files changed, 23 insertions(+), 6 deletions(-) diff --git a/tutor/app/controllers/teaching_assistants_controller.rb b/tutor/app/controllers/teaching_assistants_controller.rb index f1fdfa59..1408558f 100644 --- a/tutor/app/controllers/teaching_assistants_controller.rb +++ b/tutor/app/controllers/teaching_assistants_controller.rb @@ -1,14 +1,23 @@ class TeachingAssistantsController < ApplicationController def new - + @course = Course.find_by_id(params[:course_id]) end def create - @teaching_assistant = TeachingAssistant.find_by_id(params[:teaching_assistant][:id]) - @course = Course.find_by_id(params[:course_id]) - @course.TAs << @teaching_assistant - redirect_to :action => 'index' + begin + @teaching_assistant = TeachingAssistant.find_by_id(params[:teaching_assistant][:id]) + @course = Course.find_by_id(params[:course_id]) + @course.TAs << @teaching_assistant + current_lecturer.worked_with << @teaching_assistant + flash[:notice]='TA added!' + redirect_to :action => 'index' + rescue + flash[:notice]='TA is already added to the course' + redirect_to :action => 'new' + end + + end diff --git a/tutor/app/models/teaching_assistant.rb b/tutor/app/models/teaching_assistant.rb index 541e789e..7b8fb18c 100644 --- a/tutor/app/models/teaching_assistant.rb +++ b/tutor/app/models/teaching_assistant.rb @@ -5,6 +5,8 @@ class TeachingAssistant < ActiveRecord::Base :recoverable, :rememberable, :trackable, :validatable #Validations + validates :id, uniqueness: true + #Relations has_many :posts, as: :owner, dependent: :destroy diff --git a/tutor/app/views/teaching_assistants/new.html.erb b/tutor/app/views/teaching_assistants/new.html.erb index d93e6201..7995dcc7 100644 --- a/tutor/app/views/teaching_assistants/new.html.erb +++ b/tutor/app/views/teaching_assistants/new.html.erb @@ -1,10 +1,16 @@

        Add a Teaching Assistant

        - +
        +<% if flash[:notice] -%> +
        <%= flash[:notice] %>
        +<% end %> +
        <%= form_for :teaching_assistant, url: {action: "create"} do |f| %>

        <%= select("teaching_assistant", "id", TeachingAssistant.find(:all).collect {|p| [p.name ,p.id ] }, {:prompt => 'Select'}) %>

        + +

        <%= f.submit "Add TA", class: "btn btn-success"%>

        From 77db7e75c2b82ff6eaaf58d4c913dcd1ba71a927 Mon Sep 17 00:00:00 2001 From: MussabElDash Date: Tue, 22 Apr 2014 05:43:30 +0200 Subject: [PATCH 271/938] #250 adding spinner --- .../assets/javascripts/solutions.js.coffee | 17 +++++- tutor/app/assets/stylesheets/spinner.css | 54 +++++++++++++++++++ tutor/app/views/solutions/_new.html.erb | 6 +-- tutor/app/views/tracks/show.html.erb | 2 +- 4 files changed, 73 insertions(+), 6 deletions(-) create mode 100644 tutor/app/assets/stylesheets/spinner.css diff --git a/tutor/app/assets/javascripts/solutions.js.coffee b/tutor/app/assets/javascripts/solutions.js.coffee index 19da3214..e44db47e 100644 --- a/tutor/app/assets/javascripts/solutions.js.coffee +++ b/tutor/app/assets/javascripts/solutions.js.coffee @@ -14,19 +14,32 @@ IndexNumber = 0 test = $('#testcases').val() alert input alert test + start_spin() $.ajax type: "POST" url: '/debug/' + problem_id - data: {id : problem_id , code : input , case : test} + data: {code : input , case : test} datatype: 'json' success: (data) -> $('#nextButton').attr "disabled", false $('#previousButton').attr "disabled", true toggleDebug() Variables = data + stop_spin() $.each data, (ia, da) -> - alert da["line"] + "=>" + da["locals"] + "da[locals] is Empty for now" + alert da["line"] + "=>" + da["locals"] + "locals is Empty for now" return + error: -> + stop_spin() + return + return + +@start_spin = -> + $('#spinner').attr "class" , "spinner" + return + +@stop_spin = -> + $('#spinner').attr "class" , "" return # [Execute Line By Line - Story 3.8] diff --git a/tutor/app/assets/stylesheets/spinner.css b/tutor/app/assets/stylesheets/spinner.css new file mode 100644 index 00000000..87a87e56 --- /dev/null +++ b/tutor/app/assets/stylesheets/spinner.css @@ -0,0 +1,54 @@ +.spinner { + display: inline-block; + width: 15px; + height: 15px; + position: relative; + border: 2px solid rgba(0,0,0,0.5); + border-top-color: transparent; + border-radius: 100%; + + -webkit-animation: spin 1s infinite linear; + -moz-animation: spin 1s infinite linear; + -ms-animation: spin 1s infinite linear; + -o-animation: spin 1s infinite linear; + animation: spin 1s infinite linear; + } + +.spinner:after { + content: ''; + display: block; + width: 0; + height: 0; + position: absolute; + top: -5px; + left: 0px; + + border: 4px solid transparent; + border-bottom-color: rgba(0,0,0,0.5); + + -webkit-transform: rotate(45deg); + -moz-transform: rotate(45deg); + -ms-transform: rotate(45deg); + -o-transform: rotate(45deg); + transform: rotate(45deg); +} + +@-webkit-keyframes spin { + to { -webkit-transform: rotate(360deg); } +} + +@-moz-keyframes spin { + to { -moz-transform: rotate(360deg); } +} + +@-ms-keyframes spin { + to { -ms-transform: rotate(360deg); } +} + +@-o-keyframes spin { + to { -o-transform: rotate(360deg); } +} + +@keyframes spin { + to { transform: rotate(360deg); } +} \ No newline at end of file diff --git a/tutor/app/views/solutions/_new.html.erb b/tutor/app/views/solutions/_new.html.erb index 2ea3351a..a4ba2c15 100644 --- a/tutor/app/views/solutions/_new.html.erb +++ b/tutor/app/views/solutions/_new.html.erb @@ -1,7 +1,6 @@

        <%= flash[:success] %>

        <%= flash[:alert] %>

        - Time spent: 0:00 @@ -19,7 +18,7 @@ id: 'compileButton', onClick: 'compile()' %> <%= button_tag 'Test', type: 'Button', id: 'testButton', onClick: 'test()' %> - <%= button_tag 'Start Debugging', id: 'debug', type: 'button', + <%= button_tag 'Start Debugging', id: 'debugButton', type: 'button', onclick: "start_debug(#{params[:id]})" %> <%= button_tag 'Previous', type: 'Button', id: 'previousButton', onClick: 'previous()', hidden: true %> @@ -27,6 +26,7 @@ id: 'nextButton', onClick: 'next()', hidden: true %> <%= button_tag 'Stop Debugging', type: 'Button', id: 'stopButton', onClick: 'stop()', hidden: true %> +
      TitleDescriptionNameEmail
      <%= teaching_assistant.name %> Accepted @@ -40,7 +40,7 @@



      Output:
      -

      +

      Output response

      <% end %> \ No newline at end of file diff --git a/tutor/app/views/tracks/show.html.erb b/tutor/app/views/tracks/show.html.erb index 25a67437..597c43f2 100644 --- a/tutor/app/views/tracks/show.html.erb +++ b/tutor/app/views/tracks/show.html.erb @@ -31,7 +31,7 @@ <%= link_to p.title , p , style: 'color:#003366;' , class: color %> - <%= p.success_attempts %> +
      <%= p.description %> From cea62f7575961e4ba64caef1c5f5401e0ceaa4ab Mon Sep 17 00:00:00 2001 From: MussabElDash Date: Tue, 22 Apr 2014 05:54:40 +0200 Subject: [PATCH 272/938] #250 Fixing Controller Name --- tutor/app/assets/javascripts/debuggers.js.coffee | 3 +++ tutor/app/assets/javascripts/solutions.js.coffee | 2 +- tutor/app/assets/stylesheets/debuggers.css.scss | 3 +++ .../{debug_controller.rb => debuggers_controller.rb} | 5 +++-- tutor/app/helpers/debug_helper.rb | 2 -- tutor/app/helpers/debuggers_helper.rb | 2 ++ tutor/config/routes.rb | 2 +- ...debug_controller_test.rb => debuggers_controller_test.rb} | 2 +- tutor/test/helpers/debug_helper_test.rb | 4 ---- tutor/test/helpers/debuggers_helper_test.rb | 4 ++++ 10 files changed, 18 insertions(+), 11 deletions(-) create mode 100644 tutor/app/assets/javascripts/debuggers.js.coffee create mode 100644 tutor/app/assets/stylesheets/debuggers.css.scss rename tutor/app/controllers/{debug_controller.rb => debuggers_controller.rb} (92%) delete mode 100644 tutor/app/helpers/debug_helper.rb create mode 100644 tutor/app/helpers/debuggers_helper.rb rename tutor/test/controllers/{debug_controller_test.rb => debuggers_controller_test.rb} (56%) delete mode 100644 tutor/test/helpers/debug_helper_test.rb create mode 100644 tutor/test/helpers/debuggers_helper_test.rb diff --git a/tutor/app/assets/javascripts/debuggers.js.coffee b/tutor/app/assets/javascripts/debuggers.js.coffee new file mode 100644 index 00000000..24f83d18 --- /dev/null +++ b/tutor/app/assets/javascripts/debuggers.js.coffee @@ -0,0 +1,3 @@ +# Place all the behaviors and hooks related to the matching controller here. +# All this logic will automatically be available in application.js. +# You can use CoffeeScript in this file: http://coffeescript.org/ diff --git a/tutor/app/assets/javascripts/solutions.js.coffee b/tutor/app/assets/javascripts/solutions.js.coffee index 77d701b3..eeaece8d 100644 --- a/tutor/app/assets/javascripts/solutions.js.coffee +++ b/tutor/app/assets/javascripts/solutions.js.coffee @@ -17,7 +17,7 @@ IndexNumber = 0 start_spin() $.ajax type: "POST" - url: '/debug/' + problem_id + url: '/debuggers/' + problem_id data: {code : input , case : test} datatype: 'json' success: (data) -> diff --git a/tutor/app/assets/stylesheets/debuggers.css.scss b/tutor/app/assets/stylesheets/debuggers.css.scss new file mode 100644 index 00000000..fe659a25 --- /dev/null +++ b/tutor/app/assets/stylesheets/debuggers.css.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the Debuggers controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/tutor/app/controllers/debug_controller.rb b/tutor/app/controllers/debuggers_controller.rb similarity index 92% rename from tutor/app/controllers/debug_controller.rb rename to tutor/app/controllers/debuggers_controller.rb index 3babd983..8b6d374c 100644 --- a/tutor/app/controllers/debug_controller.rb +++ b/tutor/app/controllers/debuggers_controller.rb @@ -1,4 +1,4 @@ -class DebugController < ApplicationController +class DebuggersController < ApplicationController # [Debugger: Debug - Story 3.6] # Send the recieved code to be debugged @@ -21,4 +21,5 @@ def start p result render json: result end -end + +end \ No newline at end of file diff --git a/tutor/app/helpers/debug_helper.rb b/tutor/app/helpers/debug_helper.rb deleted file mode 100644 index 51e8d113..00000000 --- a/tutor/app/helpers/debug_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module DebugHelper -end diff --git a/tutor/app/helpers/debuggers_helper.rb b/tutor/app/helpers/debuggers_helper.rb new file mode 100644 index 00000000..7587444f --- /dev/null +++ b/tutor/app/helpers/debuggers_helper.rb @@ -0,0 +1,2 @@ +module DebuggersHelper +end diff --git a/tutor/config/routes.rb b/tutor/config/routes.rb index a701b591..fea6953b 100644 --- a/tutor/config/routes.rb +++ b/tutor/config/routes.rb @@ -12,7 +12,7 @@ # get 'products/index' post 'courses/new' => 'courses#new' get 'courses/sign_up' - post 'debug/:id' => 'debug#start' + post 'debuggers/:id' => 'debuggers#start' # You can have the root of your site routed with "root" diff --git a/tutor/test/controllers/debug_controller_test.rb b/tutor/test/controllers/debuggers_controller_test.rb similarity index 56% rename from tutor/test/controllers/debug_controller_test.rb rename to tutor/test/controllers/debuggers_controller_test.rb index 0cf2ddd3..7a3a9371 100644 --- a/tutor/test/controllers/debug_controller_test.rb +++ b/tutor/test/controllers/debuggers_controller_test.rb @@ -1,6 +1,6 @@ require 'test_helper' -class DebugControllerTest < ActionController::TestCase +class DebuggersControllerTest < ActionController::TestCase # test "the truth" do # assert true # end diff --git a/tutor/test/helpers/debug_helper_test.rb b/tutor/test/helpers/debug_helper_test.rb deleted file mode 100644 index 29c59e1e..00000000 --- a/tutor/test/helpers/debug_helper_test.rb +++ /dev/null @@ -1,4 +0,0 @@ -require 'test_helper' - -class DebugHelperTest < ActionView::TestCase -end diff --git a/tutor/test/helpers/debuggers_helper_test.rb b/tutor/test/helpers/debuggers_helper_test.rb new file mode 100644 index 00000000..2f6ac501 --- /dev/null +++ b/tutor/test/helpers/debuggers_helper_test.rb @@ -0,0 +1,4 @@ +require 'test_helper' + +class DebuggersHelperTest < ActionView::TestCase +end From b9dad8cf9945cae1f345bf1136bf015405c052d9 Mon Sep 17 00:00:00 2001 From: Mohamed Saeed Date: Tue, 22 Apr 2014 06:35:56 +0200 Subject: [PATCH 273/938] Issue #194, submitting using Ajax --- tutor/.gitignore | 2 +- .../assets/javascripts/solutions.js.coffee | 33 +++++++++++++++++- tutor/app/controllers/solutions_controller.rb | 34 ++++++++----------- tutor/app/models/solution.rb | 8 +++-- tutor/app/views/solutions/_new.html.erb | 7 +++- tutor/app/views/solutions/alert.js.erb | 8 ----- 6 files changed, 60 insertions(+), 32 deletions(-) delete mode 100644 tutor/app/views/solutions/alert.js.erb diff --git a/tutor/.gitignore b/tutor/.gitignore index 7e2d3651..4786acfb 100644 --- a/tutor/.gitignore +++ b/tutor/.gitignore @@ -38,6 +38,6 @@ Gemfile.lock, .ruby-version, .ruby-gemset # Ignoring generated model diagram models.svg -# Ignoring Java files and class files +# Ignoring .java files and .class files *.java *.class diff --git a/tutor/app/assets/javascripts/solutions.js.coffee b/tutor/app/assets/javascripts/solutions.js.coffee index ca51b435..69cabf82 100644 --- a/tutor/app/assets/javascripts/solutions.js.coffee +++ b/tutor/app/assets/javascripts/solutions.js.coffee @@ -69,4 +69,35 @@ root.previous = () -> # Returns: none # Author: Rami Khalil (Temporary) root.stop = () -> - toggleDebug() \ No newline at end of file + toggleDebug() + +@validate_code = (problem_id) -> + code = $('#solution_code').val() + mins = parseInt($('#mins').text()) + secs = parseInt($('#secs').text()) + time = mins*60 + secs + #start_spin() + $.ajax + type: "POST" + url: '/solutions' + data: {problem_id: problem_id, code: code, time: time} + datatype: 'json' + success: (data) -> + #stop_spin() + success = $('#validate_success') + errors = $('#validate_error') + success.html("") + for i in data["success"] + success.append("#{i}
      ") + errors.html("") + for i in data["failure"] + errors.append("#{i}
      ") + if code.length isnt 0 + alert 'Solution has been submitted successfully' + else + alert 'Blank submissions are not allowed' + return + error: (data) -> + #stop_spin() + return + return \ No newline at end of file diff --git a/tutor/app/controllers/solutions_controller.rb b/tutor/app/controllers/solutions_controller.rb index 7726b3d8..2c7b3235 100644 --- a/tutor/app/controllers/solutions_controller.rb +++ b/tutor/app/controllers/solutions_controller.rb @@ -8,21 +8,17 @@ class SolutionsController < ApplicationController # Returns: none # Author: MOHAMEDSAEED def create - @solution = Solution.new(solution_params) - @solution.student_id = current_student.id - @solution.status = 0 - @solution.length = @solution.code.length - testcases = @solution.problem.test_cases - file = "st[" + current_student.id.to_s + "]pr[" + @solution.problem_id.to_s + "]so[" - #+ Solution_id - response_message = Solution.validate(@solution.code , testcases , file) - @solution.status = response_message[:status] - errors = response_message[:failure] - success = response_message[:success] - respond_to do |format| - format.html { redirect_to :back } - format.js { render 'alert.js.erb' } - end + solution = Solution.new({problem_id: params[:problem_id], code: params[:code], + time: params[:time]}) + solution.student_id = current_student.id + solution.length = solution.code.length + testcases = solution.problem.test_cases + #response_message = Solution.validate(solution.code , testcases , file) + response_message = {:success => ["Success"], :failure => ["Failure"]} + #solution.status = response_message[:status] + solution.save + render json: response_message + #end end # [Code Editor: Write Code - Story 3.3] @@ -32,9 +28,9 @@ def create # problem_id: Hidden field for problem id # Returns: none # Author: MOHAMEDSAEED - private - def solution_params - params.require(:solution).permit(:code , :problem_id) - end + # private + # def solution_params + # params.require(:solution).permit(:code , :problem_id) + # end end \ No newline at end of file diff --git a/tutor/app/models/solution.rb b/tutor/app/models/solution.rb index b30a8aa1..6214992a 100644 --- a/tutor/app/models/solution.rb +++ b/tutor/app/models/solution.rb @@ -38,10 +38,14 @@ def self.validate(code, testcases, file) response[:failure] << "Logic error: for input: " + input +" , expected output: " + expected_output +" but your output was: " + output - response[:status] = 5 + unless response[:status] == 4 + response[:status] = 5 + end else response[:success] << "Your Solution is correct , Passed" - response[:status] = 1 + unless(response[:status] == 4 | 5) + response[:status] = 1 + end end else runtime_error = Executer.get_runtime_error() diff --git a/tutor/app/views/solutions/_new.html.erb b/tutor/app/views/solutions/_new.html.erb index 3c737a24..96c2565a 100644 --- a/tutor/app/views/solutions/_new.html.erb +++ b/tutor/app/views/solutions/_new.html.erb @@ -34,7 +34,8 @@ Wrong Answer Runtime Error Compilation Error - <%= f.submit "Submit", confirm: 'Are you sure you want to submit your solution?' %> + <%= button_tag 'Submit', type: 'Button', + id: 'submitButton', onClick: "validate_code(#{params[:id]})" %>
      @@ -43,5 +44,9 @@ Output:

      Output response +

      +
      +
      +

      <% end %> \ No newline at end of file diff --git a/tutor/app/views/solutions/alert.js.erb b/tutor/app/views/solutions/alert.js.erb deleted file mode 100644 index 31d535dc..00000000 --- a/tutor/app/views/solutions/alert.js.erb +++ /dev/null @@ -1,8 +0,0 @@ -<% if @solution.save %> - alert('Your Solution has been submitted successfully'); -<% end %> -<% if !@solution.save %> - alert('Blank submissions are not allowed'); -<% end %> - - From 2089475ae79e8215712778fb90e71ffe1acf9f6e Mon Sep 17 00:00:00 2001 From: Khaled Date: Tue, 22 Apr 2014 07:19:21 +0200 Subject: [PATCH 274/938] Issue #193 Fixed documentation --- tutor/app/models/debugger.rb | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/tutor/app/models/debugger.rb b/tutor/app/models/debugger.rb index 7acbcf4d..0435b37f 100644 --- a/tutor/app/models/debugger.rb +++ b/tutor/app/models/debugger.rb @@ -10,10 +10,12 @@ class Debugger < ActiveRecord::Base #Methods # [Debugger: View Variables - Story 3.7] - # Returns a list of all variables in the class with - # their values + # Fetches the variables found in the class and returns + # a list of all variables in the class with their + # associated values # Parameters: None - # Returns: An Array + # Returns: + # An array. It contains the list of variables and their values # Author: Khaled Helmy def get_variables method_arguments = [] @@ -42,10 +44,12 @@ def get_variables end # [Debugger: View Variables - Story 3.7] - # Return the list of instance and static variables from within - # static methods + # Return the list of instance and static variables of the + # class from within static methods # Parameters: None - # Returns: An Array + # Returns: + # An array. It contains the list of instance and static + # variables and their associated values # Author: Khaled Helmy def get_class_variables result = [] @@ -79,10 +83,11 @@ def get_class_variables end # [Debugger: View Variables - Story 3.7] - # Takes a variable and evaluates its value + # Takes an object and evaluates its value # Parameters: - # variable: A String containing a variable assignment - # Returns: An Array + # variable: a string containing an instance object + # Returns: + # An array. It contains the values inside an object # Author: Khaled Helmy def get_value variable result = [] @@ -105,8 +110,9 @@ def get_value variable # Takes a line containing an object assignment and extracts # the object name # Parameters: - # variable: A String containing an object assignment - # Returns: A String + # variable: A string containing an object assignment + # Returns: + # A string. It contains the object name # Author: Khaled Helmy def get_name variable name = variable.split(" = ").first From 6fc6bdb27c030f85805f51fd8ce10e1f3fb5df02 Mon Sep 17 00:00:00 2001 From: Ahmed Moataz Date: Tue, 22 Apr 2014 08:50:48 +0200 Subject: [PATCH 275/938] Issue: #240 - Fixing issues --- tutor/app/controllers/courses_controller.rb | 15 ++++++++------- tutor/app/controllers/solutions_controller.rb | 16 ++++++---------- tutor/app/models/compiler.rb | 5 +++-- tutor/db/schema.rb | 5 ----- 4 files changed, 17 insertions(+), 24 deletions(-) diff --git a/tutor/app/controllers/courses_controller.rb b/tutor/app/controllers/courses_controller.rb index 7ed2f0b4..3c4beb9c 100644 --- a/tutor/app/controllers/courses_controller.rb +++ b/tutor/app/controllers/courses_controller.rb @@ -14,16 +14,18 @@ class CoursesController < ApplicationController # @lecturer: The chosen lecturer # Author: Ahmed Moataz def sign_up - @status = params[:status] + @status = params[:status] if student_signed_in? case params[:status] when nil @courses = Course.select(:university).distinct @status = "1" when "2" - @courses = Course.where("university= " + "\"" + params[:university] + "\"").select(:semester).distinct + @courses = Course.where("university= " + "\"" + params[:university] + + "\"").select(:semester).distinct when "3" - @courses = Course.where("semester= " + params[:semester] + " AND university = " + "\"" + params[:university] + "\"") + @courses = Course.where("semester= " + params[:semester] + + " AND university = " + "\"" + params[:university] + "\"") when "4" @course = Course.find(params[:id]) when "5" @@ -32,17 +34,16 @@ def sign_up when "6" @course = Course.find(params[:id]) @lecturer = Lecturer.find(params[:lecturer]) - #Insertion in the DB student = Student.find(current_student.id) if student.courses.find_by_id(@course.id) == nil student.courses << @course else @status = "7" - end + end end else - @status = "0" - end + @status = "0" + end end # [View Courses - Stroy 1.11] diff --git a/tutor/app/controllers/solutions_controller.rb b/tutor/app/controllers/solutions_controller.rb index 30202125..d0ac28a6 100644 --- a/tutor/app/controllers/solutions_controller.rb +++ b/tutor/app/controllers/solutions_controller.rb @@ -14,12 +14,11 @@ def create @solution.status = 0 @solution.length = @solution.code.length if @solution.save - flash[:success] = "Your Solution has been submitted successfully" - redirect_to :back + flash[:success] = "Your solution has been submitted successfully" else - flash[:alert] = "Blank Submissions are not allowed !!!" - redirect_to :back + flash[:alert] = "Blank submissions are not allowed!!!" end + redirect_to :back elsif params[:commit] == 'Compile' compile_solution end @@ -38,23 +37,20 @@ def compile_solution @solution.length = @solution.code.length if @solution.save compiler_feedback = Compiler.compiler_feedback(current_student.id, - solution_params[:problem_id],@solution.id.to_s, solution_params[:code]) + solution_params[:problem_id], @solution.id.to_s, solution_params[:code]) if compiler_feedback[:success] - #compiled successfully @solution.status = 3 flash[:compiler_success] = "Compilation Succeeded!" else - #failed to compile @solution.status = 2 flash[:compiler_fail] = "Compilation Failed!" flash[:compiler_feedback] = compiler_feedback[:errors] end @solution.save - redirect_to :back else flash[:alert] = "You did not write any code!" - redirect_to :back end + redirect_to :back end # [Code Editor: Write Code - Story 3.3] @@ -66,7 +62,7 @@ def compile_solution # Author: MOHAMEDSAEED private def solution_params - params.require(:solution).permit(:code , :problem_id) + params.require(:solution).permit(:code, :problem_id) end end \ No newline at end of file diff --git a/tutor/app/models/compiler.rb b/tutor/app/models/compiler.rb index 6717f68d..d96c716a 100644 --- a/tutor/app/models/compiler.rb +++ b/tutor/app/models/compiler.rb @@ -22,7 +22,8 @@ class Compiler < ActiveRecord::Base def self.compile(student_id, problem_id, solution_id, code) java_path = 'students_solutions/Java/' %x[ #{'mkdir -p ' + java_path} ] - file_name = java_path + 'st' + student_id.to_s + 'pr' + problem_id.to_s + 'so' + solution_id.to_s + '.java' + file_name = java_path + 'st' + student_id.to_s + 'pr' + + problem_id.to_s + 'so' + solution_id.to_s + '.java' File.open(file_name, 'w') { |file| file.write(code) } class_path = 'students_solutions/Class' %x[ #{'mkdir -p ' + class_path} ] @@ -43,7 +44,7 @@ def self.compile(student_id, problem_id, solution_id, code) # Author: Ahmed Moataz def self.compiler_feedback(student_id, problem_id, solution_id, code) new_code = change_class_name(student_id, problem_id, solution_id, code) - feedback = compile(student_id,problem_id, solution_id, new_code) + feedback = compile(student_id, problem_id, solution_id, new_code) if feedback == "" return { success: true, errors: nil } else diff --git a/tutor/db/schema.rb b/tutor/db/schema.rb index e5b78c5e..5581d48e 100644 --- a/tutor/db/schema.rb +++ b/tutor/db/schema.rb @@ -41,11 +41,6 @@ t.datetime "updated_at" end - create_table "compilers", force: true do |t| - t.datetime "created_at" - t.datetime "updated_at" - end - create_table "courses", force: true do |t| t.string "name" t.string "code" From 3464b92721a1b139ec8725067b4994080b5c3207 Mon Sep 17 00:00:00 2001 From: Mohab Date: Tue, 22 Apr 2014 08:58:19 +0200 Subject: [PATCH 276/938] Issue #203 Editing duplicate recommendation --- tutor/app/assets/javascripts/tracks.js | 13 +++++++++---- tutor/app/controllers/tracks_controller.rb | 7 +++++-- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/tutor/app/assets/javascripts/tracks.js b/tutor/app/assets/javascripts/tracks.js index fedf2dad..ac2d5643 100644 --- a/tutor/app/assets/javascripts/tracks.js +++ b/tutor/app/assets/javascripts/tracks.js @@ -24,11 +24,16 @@ function fill(data, problem_id, recommender_id){ elem.append("
        "); $.each(data, function (i , datum){ datum = data[i]; - temp = "
      • " + datum + + temp = "
      • " + datum['student_name'] + "" + + "onclick='recommend(" + problem_id + "," + recommender_id + "," + i + ")'"; + if (datum['recommended_before'] == 'true' ){ + temp += "disabled"; + temp += ">recommended before" + }else { + temp += ">recommend"; + } + temp += "" + "
        • " elem.append(temp); }); diff --git a/tutor/app/controllers/tracks_controller.rb b/tutor/app/controllers/tracks_controller.rb index 6ab291dc..c355fe04 100644 --- a/tutor/app/controllers/tracks_controller.rb +++ b/tutor/app/controllers/tracks_controller.rb @@ -79,11 +79,14 @@ def show_classmates students_enrolled.each do |student| student_level = TrackProgression.get_progress(student.id,topic.id) if (student_level == track.difficulty) - if (!Recommendation.where( + students_receiving_recommendation[student.id] = Hash.new + students_receiving_recommendation[student.id]['student_name'] = student.name + students_receiving_recommendation[student.id]['recommended_before'] = 'false' + if (Recommendation.where( :problem_id => problem.id, :recommender_id => current_student.id, :student_id => student.id).present?) - students_receiving_recommendation[student.id] = student.name + students_receiving_recommendation[student.id]['recommended_before'] = 'true' end end end From 5f7523da7d18912eecdcc1e8a89d1ed1cad569df Mon Sep 17 00:00:00 2001 From: metawaa Date: Tue, 22 Apr 2014 09:20:03 +0200 Subject: [PATCH 277/938] fixing implementation 4 --- tutor/app/views/courses/show.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tutor/app/views/courses/show.html.erb b/tutor/app/views/courses/show.html.erb index a50f2758..62b688ff 100644 --- a/tutor/app/views/courses/show.html.erb +++ b/tutor/app/views/courses/show.html.erb @@ -30,7 +30,7 @@ data-toggle="collapse" data-parent="#accordion" href="#<%= t.id.to_s %>"> - <%= link_to t.title , t , style: 'color:#003366;'%> + <%= link_to t.title, t, style: 'color:#003366;'%>         <%= t.tracks.count %>
    @@ -39,7 +39,7 @@ <% color = "label label-default" %>
  • - <%= link_to tt.title , tt , class: color %> + <%= link_to tt.title, tt, class: color %>
    • <% end %>
From 3634fa718f44159a09d7ebaee581978a2e7fee17 Mon Sep 17 00:00:00 2001 From: metawaa Date: Tue, 22 Apr 2014 09:42:16 +0200 Subject: [PATCH 278/938] fixing scenario --- tutor/app/controllers/courses_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tutor/app/controllers/courses_controller.rb b/tutor/app/controllers/courses_controller.rb index 1f795a1f..bd2b7b7e 100644 --- a/tutor/app/controllers/courses_controller.rb +++ b/tutor/app/controllers/courses_controller.rb @@ -152,7 +152,7 @@ def manage def update @course = Course.find_by_id(params[:id]) if @course.update(course_params) - redirect_to @course + render 'show' else render 'edit' end From d5e45f641ac1ce7af54486f25eedf19f37795bb0 Mon Sep 17 00:00:00 2001 From: metawaa Date: Tue, 22 Apr 2014 09:56:23 +0200 Subject: [PATCH 279/938] fixing implementation --- tutor/app/views/courses/edit.html.erb | 36 +++++++++++++-------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/tutor/app/views/courses/edit.html.erb b/tutor/app/views/courses/edit.html.erb index 9a3cb8bd..bfdf5a7b 100644 --- a/tutor/app/views/courses/edit.html.erb +++ b/tutor/app/views/courses/edit.html.erb @@ -35,29 +35,29 @@ <%= form_for :course, url: course_path(@course), method: :patch do |c| %>



<%= c.label :name %>
- <%= c.text_field :name %> -

- -

- <%= c.label :code %>
- <%= c.text_area :code %> -

+ <%= c.text_field :name %> +

- <%= c.label :year %>
- <%= c.text_area :year %> -

+ <%= c.label :code %>
+ <%= c.text_area :code %> +

-

- <%= c.label :semester %>
- <%= c.text_area :semester %> -

+

+ <%= c.label :year %>
+ <%= c.text_area :year %> +

-

- <%= c.label :description %>
- <%= c.text_area :description %> +

+ <%= c.label :semester %>
+ <%= c.text_area :semester %>

- + +

+ <%= c.label :description %>
+ <%= c.text_area :description %> +

+

<%= c.submit %>

From 61cba4b0330cd1c6fbc37d84f6213ae6f6255f56 Mon Sep 17 00:00:00 2001 From: metawaa Date: Tue, 22 Apr 2014 10:15:52 +0200 Subject: [PATCH 280/938] fixing routes --- tutor/app/views/courses/index.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tutor/app/views/courses/index.html.erb b/tutor/app/views/courses/index.html.erb index e30f1f36..1e90367d 100644 --- a/tutor/app/views/courses/index.html.erb +++ b/tutor/app/views/courses/index.html.erb @@ -19,7 +19,7 @@ <% @courses.each do |c| %> - <%= link_to c.name, :controller => 'courses', :action => 'show', :id => c.id, + <%= link_to c.name, {:controller => 'courses', :action => 'show', :id => c.id }, :method => :get, class: "btn btn-success" %> <%= c.code %> From a5883c7a5baa979df170b5ef6e9cd0634a91673c Mon Sep 17 00:00:00 2001 From: Mussab ElDash Date: Tue, 22 Apr 2014 10:29:26 +0200 Subject: [PATCH 281/938] Removing java and class from gitignore --- tutor/.gitignore | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tutor/.gitignore b/tutor/.gitignore index e4e59d11..4ea75899 100644 --- a/tutor/.gitignore +++ b/tutor/.gitignore @@ -37,7 +37,3 @@ Gemfile.lock, .ruby-version, .ruby-gemset # Ignoring generated model diagram models.svg - -# Ignoring Java files and class files -*.java -*.class \ No newline at end of file From 72f87e24ee497f72118ae8a98d3932c02ac7e9be Mon Sep 17 00:00:00 2001 From: Mussab ElDash Date: Tue, 22 Apr 2014 10:31:58 +0200 Subject: [PATCH 282/938] Update _new.html.erb --- tutor/app/views/solutions/_new.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tutor/app/views/solutions/_new.html.erb b/tutor/app/views/solutions/_new.html.erb index a4ba2c15..0aa497ff 100644 --- a/tutor/app/views/solutions/_new.html.erb +++ b/tutor/app/views/solutions/_new.html.erb @@ -40,7 +40,7 @@



Output:
-

+

Output response

-<% end %> \ No newline at end of file +<% end %> From 7d3481433c49c22af8709196f4c7e5e7ea96c923 Mon Sep 17 00:00:00 2001 From: Mussab ElDash Date: Tue, 22 Apr 2014 10:40:49 +0200 Subject: [PATCH 283/938] Update show.html.erb --- tutor/app/views/tracks/show.html.erb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tutor/app/views/tracks/show.html.erb b/tutor/app/views/tracks/show.html.erb index 597c43f2..8f677aaf 100644 --- a/tutor/app/views/tracks/show.html.erb +++ b/tutor/app/views/tracks/show.html.erb @@ -32,6 +32,8 @@ <%= link_to p.title , p , style: 'color:#003366;' , class: color %> +
<%= p.description %> @@ -42,4 +44,4 @@ <% if @can_edit %> <%= link_to "New" , '/problems/new', class: "label label-default" %> -<% end %> \ No newline at end of file +<% end %> From 900b018f499c229f2d4588d9dcaa4f3ce0187e42 Mon Sep 17 00:00:00 2001 From: Mussab ElDash Date: Tue, 22 Apr 2014 10:41:45 +0200 Subject: [PATCH 284/938] Update routes.rb --- tutor/config/routes.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tutor/config/routes.rb b/tutor/config/routes.rb index fea6953b..ad7c7bdd 100644 --- a/tutor/config/routes.rb +++ b/tutor/config/routes.rb @@ -14,7 +14,6 @@ get 'courses/sign_up' post 'debuggers/:id' => 'debuggers#start' - # You can have the root of your site routed with "root" root 'site#index' @@ -87,4 +86,4 @@ # resources :products # end -end \ No newline at end of file +end From 923f451935ab6c2c9deb69e2307fa780d1e67ed7 Mon Sep 17 00:00:00 2001 From: MussabElDash Date: Tue, 22 Apr 2014 10:55:50 +0200 Subject: [PATCH 285/938] #250 Fixing Variables to be more descriptive --- tutor/app/assets/javascripts/solutions.js.coffee | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tutor/app/assets/javascripts/solutions.js.coffee b/tutor/app/assets/javascripts/solutions.js.coffee index eeaece8d..4032d6d9 100644 --- a/tutor/app/assets/javascripts/solutions.js.coffee +++ b/tutor/app/assets/javascripts/solutions.js.coffee @@ -26,8 +26,8 @@ IndexNumber = 0 toggleDebug() Variables = data stop_spin() - $.each data, (ia, da) -> - alert da["line"] + "=>" + da["locals"] + "locals is Empty for now" + for datum in data + alert "#{datum['line']}=>#{datum['locals']}locals is Empty for now" return error: -> stop_spin() From c62705a855f866a7bc1024e441d2b15b30c99522 Mon Sep 17 00:00:00 2001 From: Mussab ElDash Date: Tue, 22 Apr 2014 10:59:24 +0200 Subject: [PATCH 286/938] Update show.html.erb --- tutor/app/views/tracks/show.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tutor/app/views/tracks/show.html.erb b/tutor/app/views/tracks/show.html.erb index 8f677aaf..68a11dbf 100644 --- a/tutor/app/views/tracks/show.html.erb +++ b/tutor/app/views/tracks/show.html.erb @@ -33,7 +33,7 @@ class: color %> + when it is supported again in the database -->
<%= p.description %> From a725f38750aa9374b09bade7d012007c69c75b8a Mon Sep 17 00:00:00 2001 From: Rami Khalil Date: Tue, 22 Apr 2014 10:59:44 +0200 Subject: [PATCH 287/938] Fixed seeds bug + Implementation conventions. --- tutor/app/views/layouts/application.html.erb | 2 +- tutor/db/seeds.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tutor/app/views/layouts/application.html.erb b/tutor/app/views/layouts/application.html.erb index 27cd9a3b..feee850c 100644 --- a/tutor/app/views/layouts/application.html.erb +++ b/tutor/app/views/layouts/application.html.erb @@ -50,7 +50,7 @@
<%= render "layouts/right_side_bar"%>
- <%= render "problems/system_recommendation" if student_signed_in?%> + <%= render "problems/system_recommendation" if student_signed_in? %> <%= yield %>
diff --git a/tutor/db/seeds.rb b/tutor/db/seeds.rb index d1afbf65..9b042216 100644 --- a/tutor/db/seeds.rb +++ b/tutor/db/seeds.rb @@ -100,8 +100,8 @@ Solution.create(code:"println(My third solution)", length:5, status:3) puts("# -----------------------TrackProgression---------------------------") - TrackProgression.create(level: 2, student_id: 1, topic_id: 1) - TrackProgression.create(level: 0, student_id: 1, topic_id: 2) + TrackProgression.create(level: 0, student_id: 1, topic_id: 1) + TrackProgression.create(level: 2, student_id: 1, topic_id: 2) puts("# -----------------------Attempts---------------------------") Attempt.create(success: true) From 0eecaecee3b4212deb552acaa3c6b1c72453df9a Mon Sep 17 00:00:00 2001 From: Rami Khalil Date: Tue, 22 Apr 2014 11:01:54 +0200 Subject: [PATCH 288/938] Implementation convention fixes. --- tutor/db/seeds.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tutor/db/seeds.rb b/tutor/db/seeds.rb index 9b042216..89c4cbcb 100644 --- a/tutor/db/seeds.rb +++ b/tutor/db/seeds.rb @@ -100,8 +100,8 @@ Solution.create(code:"println(My third solution)", length:5, status:3) puts("# -----------------------TrackProgression---------------------------") - TrackProgression.create(level: 0, student_id: 1, topic_id: 1) - TrackProgression.create(level: 2, student_id: 1, topic_id: 2) + TrackProgression.create(level: 0, student_id: 1, topic_id: 1) + TrackProgression.create(level: 2, student_id: 1, topic_id: 2) puts("# -----------------------Attempts---------------------------") Attempt.create(success: true) From 9b6e42d5dd562269fc815a2d5666b11f8423fe4a Mon Sep 17 00:00:00 2001 From: MussabElDash Date: Tue, 22 Apr 2014 11:09:09 +0200 Subject: [PATCH 289/938] #250 Spaces and indentation --- .../assets/javascripts/solutions.js.coffee | 2 +- tutor/app/assets/stylesheets/spinner.css | 72 +++++++++---------- tutor/app/controllers/debuggers_controller.rb | 4 +- tutor/app/models/debugger.rb | 14 ++-- 4 files changed, 46 insertions(+), 46 deletions(-) diff --git a/tutor/app/assets/javascripts/solutions.js.coffee b/tutor/app/assets/javascripts/solutions.js.coffee index 4032d6d9..09ab84de 100644 --- a/tutor/app/assets/javascripts/solutions.js.coffee +++ b/tutor/app/assets/javascripts/solutions.js.coffee @@ -5,7 +5,7 @@ IndexNumber = 0 # [Debugger: Debug - Story 3.6] # Sends the code to the server and changes the Variables to the data recieved -# Parameters: +# Parameters: # problem_id: The id of the problem being solved # Returns: none # Author: Mussab ElDash diff --git a/tutor/app/assets/stylesheets/spinner.css b/tutor/app/assets/stylesheets/spinner.css index 87a87e56..4fed75b4 100644 --- a/tutor/app/assets/stylesheets/spinner.css +++ b/tutor/app/assets/stylesheets/spinner.css @@ -1,54 +1,54 @@ .spinner { - display: inline-block; - width: 15px; - height: 15px; - position: relative; - border: 2px solid rgba(0,0,0,0.5); - border-top-color: transparent; - border-radius: 100%; - - -webkit-animation: spin 1s infinite linear; - -moz-animation: spin 1s infinite linear; - -ms-animation: spin 1s infinite linear; - -o-animation: spin 1s infinite linear; - animation: spin 1s infinite linear; - } - + display: inline-block; + width: 15px; + height: 15px; + position: relative; + border: 2px solid rgba(0,0,0,0.5); + border-top-color: transparent; + border-radius: 100%; + + -webkit-animation: spin 1s infinite linear; + -moz-animation: spin 1s infinite linear; + -ms-animation: spin 1s infinite linear; + -o-animation: spin 1s infinite linear; + animation: spin 1s infinite linear; +} + .spinner:after { - content: ''; - display: block; - width: 0; - height: 0; - position: absolute; - top: -5px; - left: 0px; - - border: 4px solid transparent; - border-bottom-color: rgba(0,0,0,0.5); - - -webkit-transform: rotate(45deg); - -moz-transform: rotate(45deg); - -ms-transform: rotate(45deg); - -o-transform: rotate(45deg); - transform: rotate(45deg); + content: ''; + display: block; + width: 0; + height: 0; + position: absolute; + top: -5px; + left: 0px; + + border: 4px solid transparent; + border-bottom-color: rgba(0,0,0,0.5); + + -webkit-transform: rotate(45deg); + -moz-transform: rotate(45deg); + -ms-transform: rotate(45deg); + -o-transform: rotate(45deg); + transform: rotate(45deg); } @-webkit-keyframes spin { - to { -webkit-transform: rotate(360deg); } + to { -webkit-transform: rotate(360deg); } } @-moz-keyframes spin { - to { -moz-transform: rotate(360deg); } + to { -moz-transform: rotate(360deg); } } @-ms-keyframes spin { - to { -ms-transform: rotate(360deg); } + to { -ms-transform: rotate(360deg); } } @-o-keyframes spin { - to { -o-transform: rotate(360deg); } + to { -o-transform: rotate(360deg); } } @keyframes spin { - to { transform: rotate(360deg); } + to { transform: rotate(360deg); } } \ No newline at end of file diff --git a/tutor/app/controllers/debuggers_controller.rb b/tutor/app/controllers/debuggers_controller.rb index 8b6d374c..35fd7f70 100644 --- a/tutor/app/controllers/debuggers_controller.rb +++ b/tutor/app/controllers/debuggers_controller.rb @@ -1,9 +1,9 @@ class DebuggersController < ApplicationController # [Debugger: Debug - Story 3.6] - # Send the recieved code to be debugged + # Send the recieved code to be debugged # and return the result to the user as a json object - # Parameters: + # Parameters: # id: The id of the problem being solved # code: The code to be debugged # case: Test case to be debugged against diff --git a/tutor/app/models/debugger.rb b/tutor/app/models/debugger.rb index 9379ea25..062e21bf 100644 --- a/tutor/app/models/debugger.rb +++ b/tutor/app/models/debugger.rb @@ -24,7 +24,7 @@ def buffer_until regex rescue end end - return buffer + return buffer end # [Debugger: Debug - Story 3.6] @@ -46,7 +46,7 @@ def buffer_until_ready def buffer_until_complete (buffer_until [/\[\d\] $/m]) + "\n" end - + # [Debugger: Debug - Story 3.6] # Inputs an input to the input stream of the debugger JDB # Parameters: @@ -93,7 +93,7 @@ def start(file_path, input) end return $all end - + # [Debugger: Debug - Story 3.6] # Iterates 100 times to get the value of all local variables in each step # Parameters: none @@ -116,7 +116,7 @@ def debug end end end - + # [Debugger: Debug - Story 3.6] # Gets the number of the line to be executed # Parameters: none @@ -138,7 +138,7 @@ def get_line # [Debugger: Debug - Story 3.6] # Create a java file and start debugging - # Parameters: + # Parameters: # Student_id: The id of the current signed in student # problem_id: The id of the problem being solved # code: The code to be debugged @@ -156,7 +156,7 @@ def self.debug(student_id, problem_id, code, input) # [Debugger: Debug - Story 3.6] # Renames the class name to be compiled and debugged correctly - # Parameters: + # Parameters: # Student_id: The id of the current signed in student # problem_id: The id of the problem being solved # code: The code to be debugged @@ -164,7 +164,7 @@ def self.debug(student_id, problem_id, code, input) # Author: Mussab ElDash def self.change_class_name(student_id, problem_id, code) name = 'st' + student_id.to_s + 'pr' + problem_id.to_s - return code.sub(code[0..code.index('{')], 'public class ' + name + ' {') + return code.sub(code[0..code.index('{')], 'public class ' + name + ' {') end end From 0a7b1e751928d7e0b9c23507680a73ff1be6fa4e Mon Sep 17 00:00:00 2001 From: Rania Abdel Fattah Date: Tue, 22 Apr 2014 11:18:30 +0200 Subject: [PATCH 290/938] Issue 163 fixing create from existing --- tutor/app/controllers/courses_controller.rb | 25 ++++++++++----------- tutor/app/views/courses/existing.html.erb | 2 +- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/tutor/app/controllers/courses_controller.rb b/tutor/app/controllers/courses_controller.rb index c6c21bb2..46dfad9e 100644 --- a/tutor/app/controllers/courses_controller.rb +++ b/tutor/app/controllers/courses_controller.rb @@ -92,11 +92,6 @@ def show def manage end - private - def course_params - params.require(:course).permit(:name,:code,:year,:semester,:description) - end - # [Create from Existant Course - Story 2.5] # Return the courses # Parameters: @@ -104,9 +99,6 @@ def course_params # Author: Rania Abdel Fattah def existing @courses = Course.all - if @courses.nil? - redirect_to :new - end end # [Create from Existant Course - Story 2.5] # Duplicate the courses that it is found and save them in a new course @@ -114,10 +106,10 @@ def existing # id: The course id # Author: Rania Abdel Fattah def duplicate - course = Course.find_by_id(permitd_up[:id]) - new_course = course.dup + @course = Course.find_by_id(permitd_up[:id]) + new_course = @course.dup if new_course.save - redirect_to :back + redirect_to :action => 'index' else redirect_to :back end @@ -126,7 +118,7 @@ def duplicate # Choose which parameter should be listed # Parameters: # id: The course id - # Author: Rania Abdel Fattah + # Author: Rania A0bdel Fattah private def permitd_up params.require(:course).permit(:id) @@ -134,4 +126,11 @@ def permitd_up def choose end -end \ No newline at end of file + + + private + def course_params + params.require(:course).permit(:name,:code,:year,:semester,:description) + end + + end diff --git a/tutor/app/views/courses/existing.html.erb b/tutor/app/views/courses/existing.html.erb index d17cb336..69992309 100644 --- a/tutor/app/views/courses/existing.html.erb +++ b/tutor/app/views/courses/existing.html.erb @@ -3,7 +3,7 @@ <%= form_for :course , url: {:action => "duplicate" , method: "post"} do |f|%> - <%= f.select :id , @courses.collect{|c| [c.id , c.name]} %> + <%= f.select :id , @courses.collect{|c| [c.name , c.id]} %>

<%= f.submit%> From 63a578cab3c557fb5406427b429e073dac1dbf27 Mon Sep 17 00:00:00 2001 From: Linsara Date: Tue, 22 Apr 2014 11:28:47 +0200 Subject: [PATCH 291/938] Issue #182 modifing Ajax call --- tutor/app/controllers/topics_controller.rb | 40 +++++++++++++++------- tutor/app/views/topics/show.html.erb | 33 +++++++++--------- tutor/config/routes.rb | 2 +- 3 files changed, 46 insertions(+), 29 deletions(-) diff --git a/tutor/app/controllers/topics_controller.rb b/tutor/app/controllers/topics_controller.rb index 9ebb2bcb..0296407d 100644 --- a/tutor/app/controllers/topics_controller.rb +++ b/tutor/app/controllers/topics_controller.rb @@ -90,6 +90,34 @@ def create end end + + def sort + puts "%%%%%%%%%%%%%%" + puts params[:methodParam] + + #id = params[:id] mafesh 7aga esmaha kedda + #@topic = Track.find_by_id(params[:methodParam][0]) + #@topic = (params[:methodParam][0]).topic + + @track = Track.find_by_id(params[:methodParam][0]) #this will get me the track + @topic = @track.topic #get the topic + @tracks = @topic.tracks #get all the tracks of a certain topic + + #from here not sure what I should do + new_Order_Array = params[:methodParam] #now we we can use the array passed by Ajax + ##this is a hash and so we can't use it directly + + + @tracks.each do |track| + track.difficulty = (params[:methodParam]).index(track.id.to_s) + 1 #track.id.to_s I removed.to_s part + puts(track.save) + + end + + render :nothing => true + + end + private def topic_params params.require(:topic).permit(:title,:description) @@ -110,15 +138,3 @@ def edit @topic = Topic.find_by_id(id) end - def sort - id = params[:id] - @topic = Topic.find_by_id(id) - @tracks = @topic.tracks #get all the tracks of a certain topic - - #from here not sure what I should do - new_Order_Array = params[:methodParam] #now we we can use the array passed by Ajax - @tracks.each do |track| - track.difficulty = params[:methodParam].index(track.id) + 1 #track.id.to_s I removed.to_s part - track.save - end - end diff --git a/tutor/app/views/topics/show.html.erb b/tutor/app/views/topics/show.html.erb index aad1fa31..2378fad1 100644 --- a/tutor/app/views/topics/show.html.erb +++ b/tutor/app/views/topics/show.html.erb @@ -1,5 +1,4 @@ - - + @@ -11,7 +10,14 @@ $(document).ready(function() { - $("#list-of-tracks").sortable(); + $("#list-of-tracks").sortable({ + placeholder: "ui-state-highlight" , + axis :"y", + tolerance: 'pointer', + forcePlaceholderSize: true, + cursor: "move", + containment: "parent" //not sure if this is nice or good ==> to restric the movement of the topics + }); $( "#edit_track_rating_dialog" ).dialog({ autoOpen: false, @@ -26,16 +32,17 @@ $(document).ready(function() { Done: function(){ //call the ajax function here var array = $("#list-of-tracks").sortable('toArray') ; + //alert(JSON.stringify(array)); $.ajax({ //should the url be "/topics/sort" //or "/topics" + topic_id + "/sort" //or "sort" only - // should I include ROOT_PATH at the begining - url: 'topics/sort', + // should I include ROOT_PATH at the begining + //{controller: "topics" , action: "sort"} this did not work also + url: '/topics/sort', type: 'POST', - data: { methodParam : array }, //use it as a key value pair - dataType: 'script', - + beforeSend: function(xhr) {xhr.setRequestHeader('X-CSRF-Token', $('meta[name="csrf-token"]').attr('content'))}, + data: { 'methodParam' : array }, //use it as a key value pair success: function (data) { alert("success"); }, @@ -55,11 +62,10 @@ $(document).ready(function() { }).disableSelection(); }); - - - + +

<%= link_to @course.name , @course %> <%= link_to @topic.title , @topic %>

@@ -133,7 +139,6 @@ $(document).ready(function() { -