Что-то пошло не так.
+Мы были уведомлены об этом
+и скоро посмотрим что случилось.
+
+ Попробуйте открыть другие страницы.
+
+
+ Или воспользуйтесь поиском.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/doc/design/abf-503.html b/doc/design/abf-503.html
new file mode 100644
index 000000000..2fd2a65e9
--- /dev/null
+++ b/doc/design/abf-503.html
@@ -0,0 +1,62 @@
+
+
+
+
+ Сборочная среда
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Ведутся работы
+
Мы обновляем сайт, это займет еще некоторое время.
+Нажмите F5, если это не помогло, значит,
+нужно еще чуточку подождать.
+
+Мы правда пытаемся сделать это быстро и
+приносим свои извинения за возможные неудобства.
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/doc/design/abf-tracker.html b/doc/design/abf-tracker.html
index 84147a9b2..c65e8de99 100644
--- a/doc/design/abf-tracker.html
+++ b/doc/design/abf-tracker.html
@@ -21,9 +21,12 @@
We update the site, it will take some time.
+Press F5, if this does not help, it means,
+need to wait a little bit more.
+
+We are really trying to do it fast.
+We apologize for any inconvenience.
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/public/pics/logo-mini.png b/public/pics/logo-mini.png
new file mode 100644
index 000000000..3175f3b21
Binary files /dev/null and b/public/pics/logo-mini.png differ
diff --git a/spec/controllers/activity_feeds_controller_spec.rb b/spec/controllers/activity_feeds_controller_spec.rb
index 54ce3026a..8c9773ab7 100644
--- a/spec/controllers/activity_feeds_controller_spec.rb
+++ b/spec/controllers/activity_feeds_controller_spec.rb
@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
require 'spec_helper'
describe ActivityFeedsController do
diff --git a/spec/controllers/collaborators_controller_spec.rb b/spec/controllers/collaborators_controller_spec.rb
index 858bd3c05..02383d998 100644
--- a/spec/controllers/collaborators_controller_spec.rb
+++ b/spec/controllers/collaborators_controller_spec.rb
@@ -9,7 +9,7 @@ shared_examples_for 'project admin user' do
it 'should be able to perform update action' do
post :update, {:project_id => @project.id}.merge(@update_params)
- response.should redirect_to(project_path(@project))
+ response.should redirect_to(edit_project_collaborators_path(@project))
end
it 'should be able to set reader role for any user' do
@@ -26,7 +26,7 @@ shared_examples_for 'user with no rights for this project' do
it 'should not be able to perform update action' do
post :update, {:project_id => @project.id}.merge(@update_params)
- response.should redirect_to(project_path(@project))
+ response.should redirect_to(edit_project_collaborators_path(@project))
end
it 'should not be able to set reader role for any user' do
@@ -40,7 +40,7 @@ describe CollaboratorsController do
stub_rsync_methods
@project = Factory(:project)
@another_user = Factory(:user)
- @update_params = {:user => {:read => {@another_user.id => '1'}}}
+ @update_params = {:user => {@another_user.id => :reader}}
end
context 'for guest' do
diff --git a/spec/controllers/personal_repositories_controller_spec.rb b/spec/controllers/personal_repositories_controller_spec.rb
index 6e020d61e..b413f28fd 100644
--- a/spec/controllers/personal_repositories_controller_spec.rb
+++ b/spec/controllers/personal_repositories_controller_spec.rb
@@ -11,19 +11,19 @@ end
shared_examples_for 'personal repository owner' do
it_should_behave_like 'personal repository viewer'
- it 'should be able to perform add_project action' do
+ it 'should not be able to perform add_project action' do
get :add_project, :id => @repository.id
- response.should render_template(:projects_list)
+ response.should redirect_to(forbidden_path)
end
- it 'should be able to add project personal repository with project_id param' do
+ it 'should not be able to add project personal repository with project_id param' do
get :add_project, :id => @repository.id, :project_id => @project.id
- response.should redirect_to(personal_repository_path(@repository))
+ response.should redirect_to(forbidden_path)
end
- it 'should be able to perform remove_project action' do
+ it 'should not be able to perform remove_project action' do
get :remove_project, :id => @repository.id, :project_id => @project.id
- response.should redirect_to(personal_repository_path(@repository))
+ response.should redirect_to(forbidden_path)
end
@@ -64,12 +64,11 @@ describe PersonalRepositoriesController do
end
end
- context 'for admin' do
+ context 'for global admin' do
before(:each) do
@admin = Factory(:admin)
- set_session_for(@admin)
-
@project.update_attribute(:owner, @admin)
+ set_session_for(@admin)
end
it_should_behave_like 'personal repository owner'
@@ -77,7 +76,7 @@ describe PersonalRepositoriesController do
it_should_behave_like 'repository user with remove project rights'
end
- context 'for anyone except admin' do
+ pending 'for anyone except admin' do
before(:each) do
@user = Factory(:user)
set_session_for(@user)
@@ -88,12 +87,13 @@ describe PersonalRepositoriesController do
context 'for owner user' do
before(:each) do
@user = Factory(:user)
- set_session_for(@user)
@project.update_attribute(:owner, @user)
@repository.platform.update_attribute(:owner, @user)
@repository.platform.relations.create!(:object_type => 'User', :object_id => @user.id, :role => 'admin')
+
+ set_session_for(@user)
end
it_should_behave_like 'personal repository owner'
@@ -104,8 +104,8 @@ describe PersonalRepositoriesController do
context 'for reader user' do
before(:each) do
@user = Factory(:user)
- set_session_for(@user)
@repository.platform.relations.create!(:object_type => 'User', :object_id => @user.id, :role => 'reader')
+ set_session_for(@user)
end
it_should_behave_like 'personal repository viewer'
diff --git a/spec/controllers/platforms_controller_spec.rb b/spec/controllers/platforms_controller_spec.rb
index 1f42bcdc1..2514fe136 100644
--- a/spec/controllers/platforms_controller_spec.rb
+++ b/spec/controllers/platforms_controller_spec.rb
@@ -15,7 +15,7 @@ shared_examples_for 'platform owner' do
it 'should be able to perform destroy action' do
delete :destroy, :id => @platform.id
- response.should redirect_to(root_path)
+ response.should redirect_to(platforms_path)
end
end
@@ -61,7 +61,7 @@ describe PlatformsController do
end
end
- [:show, :new, :edit, :freeze, :unfreeze, :clone, :destroy].each do |action|
+ [:show, :new, :edit, :clone, :destroy].each do |action|
it "should not be able to perform #{ action } action" do
get action, :id => @platform
response.should redirect_to(new_user_session_path)
diff --git a/spec/controllers/products_controller_spec.rb b/spec/controllers/products_controller_spec.rb
index 7184e039c..6f57b2b45 100644
--- a/spec/controllers/products_controller_spec.rb
+++ b/spec/controllers/products_controller_spec.rb
@@ -36,7 +36,7 @@ describe ProductsController do
it 'should be able to perform create action' do
post :create, @create_params
- response.should redirect_to(platform_path( Product.last.platform.id ))
+ response.should redirect_to(platform_product_path( Product.last.platform.id, Product.last ))
end
it 'should change objects count on create' do
@@ -54,7 +54,7 @@ describe ProductsController do
it 'should be able to perform destroy action' do
delete :destroy, :platform_id => @platform.id, :id => @product.id
- response.should redirect_to(platform_path(@platform))
+ response.should redirect_to(platform_products_path(@platform))
end
end
@@ -67,7 +67,7 @@ describe ProductsController do
it 'should be able to perform create action' do
post :create, @create_params
- response.should redirect_to(platform_path( Product.last.platform.id ))
+ response.should redirect_to(platform_product_path( Product.last.platform.id, Product.last ))
end
it 'should change objects count on create' do
@@ -85,7 +85,7 @@ describe ProductsController do
it 'should be able to perform destroy action' do
delete :destroy, :platform_id => @platform.id, :id => @product.id
- response.should redirect_to(platform_path(@platform))
+ response.should redirect_to(platform_products_path(@platform))
end
end
diff --git a/spec/controllers/projects_controller_spec.rb b/spec/controllers/projects_controller_spec.rb
index 497c08695..6598ee7e6 100644
--- a/spec/controllers/projects_controller_spec.rb
+++ b/spec/controllers/projects_controller_spec.rb
@@ -76,12 +76,6 @@ describe ProjectsController do
end
it_should_behave_like 'projects user with reader rights'
-
- pending 'should be able to perform show action' do
- get :show, :id => @project.id
- response.should render_template(:show)
- end
-
end
context 'for writer user' do
diff --git a/spec/controllers/users_controller_spec.rb b/spec/controllers/users_controller_spec.rb
index a5a714873..7a15ae171 100644
--- a/spec/controllers/users_controller_spec.rb
+++ b/spec/controllers/users_controller_spec.rb
@@ -1,52 +1,30 @@
# -*- encoding : utf-8 -*-
require 'spec_helper'
-shared_examples_for 'user with users list viewer rights' do
- it 'should be able to perform index action' do
- get :index
- response.should render_template(:index)
- end
-
- it 'should assigns 5 users without filter params' do
- get :index
- assigns[:users].count.should == 5
- end
-
- it 'should find one user' do
- get :index, :filter => {:email => "user1@nonexistanceserver.com"}
- assigns[:users].size == 1
- end
-
- it 'should find user with searchable email' do
- get :index, :filter => {:email => "user1@nonexistanceserver.com"}
- assigns[:users].first.email.should == "user1@nonexistanceserver.com"
- end
-end
-
describe UsersController do
before(:each) do
stub_rsync_methods
@simple_user = Factory(:user)
+ @other_user = Factory(:user)
@admin = Factory(:admin)
%w[user1 user2 user3].each do |uname|
Factory(:user, :uname => uname, :email => "#{ uname }@nonexistanceserver.com")
end
- end
-
- context 'for global admin' do
- before(:each) do
- set_session_for(@admin)
- end
-
- it_should_behave_like 'user with users list viewer rights'
+ @update_params = {:email => 'new_email@test.com'}
end
context 'for guest' do
- it 'should not be able to perform index action' do
- get :index
+ it 'should not be able to view profile' do
+ get :profile
response.should redirect_to(new_user_session_path)
end
+
+ it 'should not be able to update other profile' do
+ get :update, {:id => @other_user.id}.merge(@update_params)
+ response.should redirect_to(new_user_session_path)
+ @other_user.reload.email.should_not == @update_params[:email]
+ end
end
context 'for simple user' do
@@ -54,9 +32,23 @@ describe UsersController do
set_session_for(@simple_user)
end
- it 'should not be able to perform index action' do
- get :index
- response.should redirect_to(forbidden_path)
+ it 'should be able to view profile' do
+ get :profile
+ response.code.should eq('200')
+ end
+
+ context 'with mass assignment' do
+ it 'should not be able to update uname' do
+ @simple_user.should_not allow_mass_assignment_of :uname
+ end
+
+ it 'should not be able to update role' do
+ @simple_user.should_not allow_mass_assignment_of :role
+ end
+
+ it 'should not be able to update other user' do
+ @simple_user.should_not allow_mass_assignment_of :id
+ end
end
end
end
diff --git a/spec/factories/activity_feeds.rb b/spec/factories/activity_feeds.rb
index d0e1984cc..a1d3273a1 100644
--- a/spec/factories/activity_feeds.rb
+++ b/spec/factories/activity_feeds.rb
@@ -1,6 +1,7 @@
+# -*- encoding : utf-8 -*-
# Read about factories at http://github.com/thoughtbot/factory_girl
FactoryGirl.define do
factory :activity_feed do
end
-end
\ No newline at end of file
+end
diff --git a/spec/factories/issues.rb b/spec/factories/issues.rb
index 63a0c6682..dba0b93ab 100644
--- a/spec/factories/issues.rb
+++ b/spec/factories/issues.rb
@@ -4,5 +4,6 @@ Factory.define(:issue) do |p|
p.body { Factory.next(:string) }
p.association :project, :factory => :project
p.association :user, :factory => :user
+ p.association :creator, :factory => :user
p.status "open"
end
diff --git a/spec/helpers/activity_feeds_helper_spec.rb b/spec/helpers/activity_feeds_helper_spec.rb
index 623c526ec..ce14e82ce 100644
--- a/spec/helpers/activity_feeds_helper_spec.rb
+++ b/spec/helpers/activity_feeds_helper_spec.rb
@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
require 'spec_helper'
# Specs in this file have access to a helper object that includes
diff --git a/spec/helpers/build_lists_helper_spec.rb b/spec/helpers/build_lists_helper_spec.rb
index bda7a8ffb..ceea3a40f 100644
--- a/spec/helpers/build_lists_helper_spec.rb
+++ b/spec/helpers/build_lists_helper_spec.rb
@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
require 'spec_helper'
# Specs in this file have access to a helper object that includes
diff --git a/spec/models/activity_feed_observer_spec.rb b/spec/models/activity_feed_observer_spec.rb
index 378ee2377..f008468e9 100644
--- a/spec/models/activity_feed_observer_spec.rb
+++ b/spec/models/activity_feed_observer_spec.rb
@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
require 'spec_helper'
describe ActivityFeedObserver do
diff --git a/spec/models/activity_feed_spec.rb b/spec/models/activity_feed_spec.rb
index c77e1d83a..cc55d6c65 100644
--- a/spec/models/activity_feed_spec.rb
+++ b/spec/models/activity_feed_spec.rb
@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
require 'spec_helper'
describe ActivityFeed do
diff --git a/spec/models/cancan_spec.rb b/spec/models/cancan_spec.rb
index 248a502d6..5928659d4 100644
--- a/spec/models/cancan_spec.rb
+++ b/spec/models/cancan_spec.rb
@@ -253,7 +253,7 @@ describe CanCan do
@platform.update_attribute(:owner, @user)
end
- [:read, :update, :destroy, :freeze, :unfreeze].each do |action|
+ [:read, :update, :destroy].each do |action|
it "should be able to #{action} platform" do
@ability.should be_able_to(action, @platform)
end
diff --git a/spec/models/comment_for_commit_spec.rb b/spec/models/comment_for_commit_spec.rb
index d2b6a61da..66c17ec05 100644
--- a/spec/models/comment_for_commit_spec.rb
+++ b/spec/models/comment_for_commit_spec.rb
@@ -9,8 +9,13 @@ def set_comments_data_for_commit
%x(cp -Rf #{Rails.root}/spec/tests.git/* #{@project.git_repository.path}) # maybe FIXME ?
@commit = @project.git_repository.commits.first
- @comment = Factory(:comment, :user => @user)
- @comment.update_attributes(:commentable_type => @commit.class.name, :commentable_id => @commit.id)
+ #@comment = Factory(:comment, :user => @user, :commentable_type => @commit.class.name, :commentable_id => @commit.id, :project => @project)
+ @comment = Factory.build(:comment, :user => @user, :project => @project)
+ @comment.commentable_type = @commit.class.name
+ @comment.commentable_id = @commit.id.hex
+ puts @comment.inspect
+ @comment.save
+ #@comment.update_attributes(:commentable_type => @commit.class.name, :commentable_id => @commit.id)
@stranger_comment = Factory(:comment, :user => @stranger)
@stranger_comment.update_attributes(:commentable_type => @commit.class.name, :commentable_id => @commit.id, :project => @project)
diff --git a/spec/models/labels_spec.rb b/spec/models/labels_spec.rb
index dd72c1f9f..8bfa08304 100644
--- a/spec/models/labels_spec.rb
+++ b/spec/models/labels_spec.rb
@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
require 'spec_helper'
describe Label do
diff --git a/spec/support/shared_examples/personal_repositories_controller.rb b/spec/support/shared_examples/personal_repositories_controller.rb
index 7830abab2..d3aa5c969 100644
--- a/spec/support/shared_examples/personal_repositories_controller.rb
+++ b/spec/support/shared_examples/personal_repositories_controller.rb
@@ -9,6 +9,6 @@ end
shared_examples_for 'destroy personal repository' do
it 'should be able to perform destroy action' do
delete :destroy, :id => @repository.id
- response.should redirect_to(platform_path(@repository.platform.id))
+ response.should redirect_to(platform_repositories_path(@repository.platform.id))
end
end
diff --git a/spec/support/shared_examples/repositories_controller.rb b/spec/support/shared_examples/repositories_controller.rb
index 5debef465..adb222544 100644
--- a/spec/support/shared_examples/repositories_controller.rb
+++ b/spec/support/shared_examples/repositories_controller.rb
@@ -19,21 +19,21 @@ shared_examples_for 'repository user with owner rights' do
it 'should be able to perform add_project action with project_id param' do
get :add_project, :id => @repository.id, :project_id => @project.id
- response.should redirect_to(repository_path(@repository))
+ response.should redirect_to(platform_repository_path(@repository.platform, @repository))
end
it_should_behave_like 'repository user with add project rights'
it 'should be able to perform remove_project action' do
get :remove_project, :id => @repository.id, :project_id => @project.id
- response.should redirect_to(repository_path(@repository))
+ response.should redirect_to(platform_repository_path(@repository.platform, @repository))
end
it_should_behave_like 'repository user with remove project rights'
it 'should be able to perform destroy action' do
delete :destroy, :id => @repository.id
- response.should redirect_to(platform_path(@repository.platform.id))
+ response.should redirect_to(platform_repositories_path(@repository.platform))
end
it 'should change objects count after destroy action' do
diff --git a/vendor/assets/javascripts/codemirror.js b/vendor/assets/javascripts/codemirror.js
index 9c6e65e41..7bd580f4a 100644
--- a/vendor/assets/javascripts/codemirror.js
+++ b/vendor/assets/javascripts/codemirror.js
@@ -1,5 +1,3 @@
-// CodeMirror version 2.22
-//
// All functions that need access to the editor's state live inside
// the CodeMirror function. Below that, at the bottom of the file,
// some utilities are defined.
@@ -15,9 +13,8 @@ var CodeMirror = (function() {
if (defaults.hasOwnProperty(opt))
options[opt] = (givenOptions && givenOptions.hasOwnProperty(opt) ? givenOptions : defaults)[opt];
- var targetDocument = options["document"];
// The element in which the editor lives.
- var wrapper = targetDocument.createElement("div");
+ var wrapper = document.createElement("div");
wrapper.className = "CodeMirror" + (options.lineWrapping ? " CodeMirror-wrap" : "");
// This mess creates the base DOM structure for the editor.
wrapper.innerHTML =
@@ -48,7 +45,10 @@ var CodeMirror = (function() {
if (!webkit) lineSpace.draggable = true;
lineSpace.style.outline = "none";
if (options.tabindex != null) input.tabIndex = options.tabindex;
+ if (options.autofocus) focusInput();
if (!options.gutter && !options.lineNumbers) gutter.style.display = "none";
+ // Needed to handle Tab key in KHTML
+ if (khtml) inputDiv.style.height = "1px", inputDiv.style.position = "absolute";
// Check for problem with IE innerHTML not working when we have a
// P (or similar) parent node.
@@ -81,12 +81,13 @@ var CodeMirror = (function() {
gutterDirty, callbacks;
// Current visible range (may be bigger than the view window).
var displayOffset = 0, showingFrom = 0, showingTo = 0, lastSizeC = 0;
- // bracketHighlighted is used to remember that a backet has been
+ // bracketHighlighted is used to remember that a bracket has been
// marked.
var bracketHighlighted;
// Tracks the maximum line length so that the horizontal scrollbar
// can be kept static when scrolling.
var maxLine = "", maxWidth;
+ var tabCache = {};
// Initialize the content.
operation(function(){setValue(options.value || ""); updateInput = false;})();
@@ -124,10 +125,16 @@ var CodeMirror = (function() {
if (!options.readOnly) replaceSelection("");
}));
+ // Needed to handle Tab key in KHTML
+ if (khtml) connect(code, "mouseup", function() {
+ if (document.activeElement == input) input.blur();
+ focusInput();
+ });
+
// IE throws unspecified error in certain cases, when
// trying to access activeElement before onload
- var hasFocus; try { hasFocus = (targetDocument.activeElement == input); } catch(e) { }
- if (hasFocus) setTimeout(onFocus, 20);
+ var hasFocus; try { hasFocus = (document.activeElement == input); } catch(e) { }
+ if (hasFocus || options.autofocus) setTimeout(onFocus, 20);
else onBlur();
function isLine(l) {return l >= 0 && l < doc.size;}
@@ -178,17 +185,23 @@ var CodeMirror = (function() {
line = clipLine(line == null ? doc.size - 1: line);
return getStateBefore(line + 1);
},
- cursorCoords: function(start){
+ cursorCoords: function(start, mode) {
if (start == null) start = sel.inverted;
- return pageCoords(start ? sel.from : sel.to);
+ return this.charCoords(start ? sel.from : sel.to, mode);
+ },
+ charCoords: function(pos, mode) {
+ pos = clipPos(pos);
+ if (mode == "local") return localCoords(pos, false);
+ if (mode == "div") return localCoords(pos, true);
+ return pageCoords(pos);
},
- charCoords: function(pos){return pageCoords(clipPos(pos));},
coordsChar: function(coords) {
var off = eltOffset(lineSpace);
return coordsChar(coords.x - off.left, coords.y - off.top);
},
markText: operation(markText),
setBookmark: setBookmark,
+ findMarksAt: findMarksAt,
setMarker: operation(addGutterMarker),
clearMarker: operation(removeGutterMarker),
setLineClass: operation(setLineClass),
@@ -256,6 +269,7 @@ var CodeMirror = (function() {
replaceRange: operation(replaceRange),
getRange: function(from, to) {return getRange(clipPos(from), clipPos(to));},
+ triggerOnKeyDown: operation(onKeyDown),
execCommand: function(cmd) {return commands[cmd](instance);},
// Stuff used by commands, probably not much use to outside code.
moveH: operation(moveH),
@@ -373,7 +387,7 @@ var CodeMirror = (function() {
!posLess(start, sel.from) && !posLess(sel.to, start)) {
// Let the drag handler handle this.
if (webkit) lineSpace.draggable = true;
- var up = connect(targetDocument, "mouseup", operation(function(e2) {
+ var up = connect(document, "mouseup", operation(function(e2) {
if (webkit) lineSpace.draggable = false;
draggingText = false;
up();
@@ -384,6 +398,8 @@ var CodeMirror = (function() {
}
}), true);
draggingText = true;
+ // IE's approach to draggable
+ if (lineSpace.dragDrop) lineSpace.dragDrop();
return;
}
e_preventDefault(e);
@@ -402,12 +418,7 @@ var CodeMirror = (function() {
}
}
- var move = connect(targetDocument, "mousemove", operation(function(e) {
- clearTimeout(going);
- e_preventDefault(e);
- extend(e);
- }), true);
- var up = connect(targetDocument, "mouseup", operation(function(e) {
+ function done(e) {
clearTimeout(going);
var cur = posFromMouse(e);
if (cur) setSelectionUser(start, cur);
@@ -415,7 +426,14 @@ var CodeMirror = (function() {
focusInput();
updateInput = true;
move(); up();
+ }
+ var move = connect(document, "mousemove", operation(function(e) {
+ clearTimeout(going);
+ e_preventDefault(e);
+ if (!ie && !e_button(e)) done(e);
+ else extend(e);
}), true);
+ var up = connect(document, "mouseup", operation(done), true);
}
function onDoubleClick(e) {
for (var n = e_target(e); n != wrapper; n = n.parentNode)
@@ -464,11 +482,14 @@ var CodeMirror = (function() {
}
function onDragStart(e) {
var txt = getSelection();
- // Disabled until further notice. Doesn't work on most browsers,
- // and crashes Safari (issue #332).
- //htmlEscape(txt);
- //e.dataTransfer.setDragImage(escapeElement, 0, 0);
e.dataTransfer.setData("Text", txt);
+
+ // Use dummy image instead of default browsers image.
+ if (gecko || chrome) {
+ var img = document.createElement('img');
+ img.scr = 'data:image/gif;base64,R0lGODdhAgACAIAAAAAAAP///ywAAAAAAgACAAACAoRRADs='; //1x1 image
+ e.dataTransfer.setDragImage(img, 0, 0);
+ }
}
function doHandleBinding(bound, dropShift) {
@@ -506,13 +527,19 @@ var CodeMirror = (function() {
if (e_prop(e, "ctrlKey")) name = "Ctrl-" + name;
if (e_prop(e, "metaKey")) name = "Cmd-" + name;
- if (e_prop(e, "shiftKey"))
+ if (e_prop(e, "shiftKey")) {
handled = lookupKey("Shift-" + name, options.extraKeys, options.keyMap,
- function(b) {return doHandleBinding(b, true);});
- if (!handled)
+ function(b) {return doHandleBinding(b, true);})
+ || lookupKey(name, options.extraKeys, options.keyMap, function(b) {
+ if (typeof b == "string" && /^go[A-Z]/.test(b)) return doHandleBinding(b);
+ });
+ } else {
handled = lookupKey(name, options.extraKeys, options.keyMap, doHandleBinding);
-
- if (handled) e_preventDefault(e);
+ }
+ if (handled) {
+ e_preventDefault(e);
+ if (ie) { e.oldKeyCode = e.keyCode; e.keyCode = 0; }
+ }
return handled;
}
function handleCharBinding(e, ch) {
@@ -545,7 +572,7 @@ var CodeMirror = (function() {
if (options.onKeyEvent && options.onKeyEvent(instance, addStop(e))) return;
var keyCode = e_prop(e, "keyCode"), charCode = e_prop(e, "charCode");
if (window.opera && keyCode == lastStoppedKey) {lastStoppedKey = null; e_preventDefault(e); return;}
- if (window.opera && !e.which && handleKeyBinding(e)) return;
+ if (((window.opera && !e.which) || khtml) && handleKeyBinding(e)) return;
var ch = String.fromCharCode(charCode == null ? keyCode : charCode);
if (options.electricChars && mode.electricChars && options.smartIndent && !options.readOnly) {
if (mode.electricChars.indexOf(ch) > -1)
@@ -837,11 +864,11 @@ var CodeMirror = (function() {
return scrollIntoView(x, cursor.y, x, cursor.yBot);
}
function scrollIntoView(x1, y1, x2, y2) {
- var pl = paddingLeft(), pt = paddingTop(), lh = textHeight();
+ var pl = paddingLeft(), pt = paddingTop();
y1 += pt; y2 += pt; x1 += pl; x2 += pl;
var screen = scroller.clientHeight, screentop = scroller.scrollTop, scrolled = false, result = true;
- if (y1 < screentop) {scroller.scrollTop = Math.max(0, y1 - 2*lh); scrolled = true;}
- else if (y2 > screentop + screen) {scroller.scrollTop = y2 + lh - screen; scrolled = true;}
+ if (y1 < screentop) {scroller.scrollTop = Math.max(0, y1); scrolled = true;}
+ else if (y2 > screentop + screen) {scroller.scrollTop = y2 - screen; scrolled = true;}
var screenw = scroller.clientWidth, screenleft = scroller.scrollLeft;
var gutterw = options.fixedGutter ? gutter.clientWidth : 0;
@@ -996,16 +1023,17 @@ var CodeMirror = (function() {
}
// This pass fills in the lines that actually changed.
var nextIntact = intact.shift(), curNode = lineDiv.firstChild, j = from;
- var scratch = targetDocument.createElement("div"), newElt;
+ var scratch = document.createElement("div");
doc.iter(from, to, function(line) {
if (nextIntact && nextIntact.to == j) nextIntact = intact.shift();
if (!nextIntact || nextIntact.from > j) {
if (line.hidden) var html = scratch.innerHTML = "";
else {
- var html = '
' + line.getHTML(makeTab) + '
';
+ var html = ''
+ + line.getHTML(makeTab) + '';
// Kludge to make sure the styled element lies behind the selection (by z-index)
- if (line.className)
- html = '
' + html + "
";
}
scratch.innerHTML = html;
@@ -1021,7 +1049,7 @@ var CodeMirror = (function() {
if (!options.gutter && !options.lineNumbers) return;
var hText = mover.offsetHeight, hEditor = scroller.clientHeight;
gutter.style.height = (hText - hEditor < 2 ? hEditor : hText) + "px";
- var html = [], i = showingFrom;
+ var html = [], i = showingFrom, normalNode;
doc.iter(showingFrom, Math.max(showingTo, showingFrom + 1), function(line) {
if (line.hidden) {
html.push("");
@@ -1035,14 +1063,19 @@ var CodeMirror = (function() {
html.push((marker && marker.style ? '
- 
+ 