[webui] some fixes for recent gems

openSUSE · Feb 13, 2013 · 0c60119 · 0c60119
1 parent 870ec33
commit 0c60119
Show file tree

Hide file tree

Showing 9 changed files with 5 additions and 314 deletions.
diff --git a/src/api/Gemfile.lock b/src/api/Gemfile.lock
@@ -58,7 +58,7 @@ GEM
     method_source (0.8.1)
     mime-types (1.21)
     minitest (4.6.0)
-    multi_json (1.5.1)
+    multi_json (1.6.0)
     mysql2 (0.3.11)
     nokogiri (1.5.6)
     pkg-config (1.1.4)

diff --git a/src/webui/Gemfile.lock b/src/webui/Gemfile.lock
@@ -49,7 +49,7 @@ GEM
     chunky_png (1.2.7)
     ci_reporter (1.8.4)
       builder (>= 2.1.2)
-    codemirror-rails (3.00)
+    codemirror-rails (3.02)
       railties (~> 3.0)
     coderay (1.0.8)
     compass (0.12.2)
@@ -99,7 +99,7 @@ GEM
     mobileesp_converted (0.2.1)
     mocha (0.13.2)
       metaclass (~> 0.0.1)
-    multi_json (1.5.1)
+    multi_json (1.6.0)
     mysql2 (0.3.11)
     nokogiri (1.5.6)
     pkg-config (1.1.4)

diff --git a/src/webui/app/assets/javascripts/application.js b/src/webui/app/assets/javascripts/application.js
@@ -17,7 +17,6 @@
 //= require jquery.expander.js
 //= require jquery.flot.js
 //= require jquery.flot.stack.js
-//= require jquery.tooltip.js
 //= require dataTables/jquery.dataTables
 //= require bento/script.js
 //= require bento/global-navigation.js

diff --git a/src/webui/app/assets/javascripts/cm2/index.js b/src/webui/app/assets/javascripts/cm2/index.js
@@ -68,7 +68,6 @@
 //= require codemirror/modes/velocity.js
 //= require codemirror/modes/verilog.js
 //= require codemirror/modes/xml.js
-//= require codemirror/modes/xmlpure.js
 //= require codemirror/modes/xquery.js
 //= require codemirror/modes/yaml.js
 

diff --git a/src/webui/app/assets/javascripts/jquery.tooltip.js b/src/webui/app/assets/javascripts/jquery.tooltip.js
diff --git a/src/webui/app/assets/javascripts/project.js b/src/webui/app/assets/javascripts/project.js
@@ -18,7 +18,7 @@ function renderPackagesTable(packages)
 function renderProjectsTable()
 {
     var projects = main_projects;
-    if ($('#excludefilter').attr('checked') != 'checked')
+    if (!$('#excludefilter').is(":checked"))
 	projects = projects.concat(excl_projects);
     var projecturl = $("#projects_table_wrapper").data("url");
     $("#projects_table_wrapper").html( '<table cellpadding="0" cellspacing="0" border="0" class="display" id="projects_table"></table>' );

diff --git a/src/webui/app/assets/stylesheets/application.scss b/src/webui/app/assets/stylesheets/application.scss
@@ -20,9 +20,7 @@
 @import "package";
 @import "project";
 @import "search";
-@import "jquery.tooltip";
 @import "codemirror";
-@import "codemirror/modes/diff";
 @import "codemirror/modes/rpm-spec";
 @import "cm2/toolbars";
 @import "cm2/suse";
diff --git a/src/webui/app/assets/stylesheets/jquery.tooltip.scss b/src/webui/app/assets/stylesheets/jquery.tooltip.scss
diff --git a/src/webui/test/functional/project_controller_test.rb b/src/webui/test/functional/project_controller_test.rb
@@ -184,7 +184,7 @@ def create_subproject
     # wait for autoload of repos
     find('#target_repo').select('pop')
 
-    assert_equal find_field('repo_name').value, 'LocalProject_pop'
+    find_field('repo_name').value.must_equal 'LocalProject_pop'
     page.wont_have_selector '#add_repository_button[disabled]'
     # somehow the autocomplete logic creates a problem - and click_button refuses to click
     page.execute_script "$('#add_repository_button').click();"