From 02afd8a32edb13ea7fc2266ac80092ea15c0930c Mon Sep 17 00:00:00 2001 From: Alvin Li Date: Wed, 9 Oct 2013 15:52:53 +0800 Subject: * treat 'apps/utils' as regular django app; which used to store general tools for used in other apps * moved 'templatetags' from 'apps/indicator' to 'apps/utils' * '.gitignore' to ignore 'fixtures_bak' * moved js plugins from 'apps/indicator/static/plugins' to 'staticfiles/plugins' apps/recommend: * updated 'recommend.models'; o commented 'recommend.models.ResearchCombination' (not used) * implemented views 'add_edit_blog_info' and 'ajax_add_edit_configs'; * added pages 'templates/recommend/add_edit_blog_info.html', 'add_edit_blog_info_error.html'; o related css and javascripts files * added 'tools.py'; * added 'utils/tools.py' for placing generic functions; * deleted 'initial_data.json' (mv 'fixtures' to 'fixtures_bak'); * small fixes to 'indicator.models', 'sciblog.models' and 'sfaccount.views' * fixed automatically show 'proper_nouns' annotation in blog: recovered the line 'import signals' in 'sciblog.models' * added 'is_ok()' method for 'recommend.models.ResearchConfig'; --- .../plugins/jquery-ui/tests/unit/menu/all.html | 30 - .../plugins/jquery-ui/tests/unit/menu/menu.html | 269 --------- .../jquery-ui/tests/unit/menu/menu_common.js | 20 - .../plugins/jquery-ui/tests/unit/menu/menu_core.js | 30 - .../jquery-ui/tests/unit/menu/menu_events.js | 601 --------------------- .../jquery-ui/tests/unit/menu/menu_methods.js | 104 ---- .../jquery-ui/tests/unit/menu/menu_options.js | 115 ---- .../jquery-ui/tests/unit/menu/menu_test_helpers.js | 31 -- 8 files changed, 1200 deletions(-) delete mode 100644 97suifangqa/apps/indicator/static/plugins/jquery-ui/tests/unit/menu/all.html delete mode 100644 97suifangqa/apps/indicator/static/plugins/jquery-ui/tests/unit/menu/menu.html delete mode 100644 97suifangqa/apps/indicator/static/plugins/jquery-ui/tests/unit/menu/menu_common.js delete mode 100644 97suifangqa/apps/indicator/static/plugins/jquery-ui/tests/unit/menu/menu_core.js delete mode 100644 97suifangqa/apps/indicator/static/plugins/jquery-ui/tests/unit/menu/menu_events.js delete mode 100644 97suifangqa/apps/indicator/static/plugins/jquery-ui/tests/unit/menu/menu_methods.js delete mode 100644 97suifangqa/apps/indicator/static/plugins/jquery-ui/tests/unit/menu/menu_options.js delete mode 100644 97suifangqa/apps/indicator/static/plugins/jquery-ui/tests/unit/menu/menu_test_helpers.js (limited to '97suifangqa/apps/indicator/static/plugins/jquery-ui/tests/unit/menu') diff --git a/97suifangqa/apps/indicator/static/plugins/jquery-ui/tests/unit/menu/all.html b/97suifangqa/apps/indicator/static/plugins/jquery-ui/tests/unit/menu/all.html deleted file mode 100644 index b34fa5e..0000000 --- a/97suifangqa/apps/indicator/static/plugins/jquery-ui/tests/unit/menu/all.html +++ /dev/null @@ -1,30 +0,0 @@ - - - - - jQuery UI Menu Test Suite - - - - - - - - - - - - - -

jQuery UI Menu Test Suite

- - -

- -

- - diff --git a/97suifangqa/apps/indicator/static/plugins/jquery-ui/tests/unit/menu/menu.html b/97suifangqa/apps/indicator/static/plugins/jquery-ui/tests/unit/menu/menu.html deleted file mode 100644 index ed37623..0000000 --- a/97suifangqa/apps/indicator/static/plugins/jquery-ui/tests/unit/menu/menu.html +++ /dev/null @@ -1,269 +0,0 @@ - - - - - jQuery UI Menu Test Suite - - - - - - - - - - - - - - - - - - - - -

- -

Aberdeen
Ada
Adamsville
Addyston
- Delphi -
- Ada
- Saarland
- Salzburg
-
Saarland
- Salzburg -
- - Delphi -
  - Ada
  - Saarland
  - Salzburg
  -
- - Delphi -
  - Ada
  - -
  - Saarland
  - Salzburg
  - –
  -
- Perch
-

- -

Aberdeen
- Ada -
- Aberdeen
- Ada
- Adamsville
- Addyston
- Adelphi
- Adena
- Adrian
- Akron
- Albany
- Alexandria
- Alger
- Alledonia
- Alliance
- Alpha
- Alvada
- Alvordton
- Amanda
- Amelia
- Amesville
- Aberdeen
- Ada
- Adamsville
- Addyston
- Adelphi
- Adena
- Adrian
- Akron
- Albany
-
Adamsville
Addyston
Adelphi
Adena
Adrian
Akron
Albany
Alexandria
Alger
Alledonia
Alliance
Alpha
Alvada
Alvordton
Amanda
Amelia
Amesville
Aberdeen
Ada
Adamsville
Addyston
Adelphi
Adena
Adrian
Akron
Albany
Alexandria
Alger
Alledonia
Alliance
Alpha
Alvada
Alvordton
Amanda
Amelia
Amesville

- -

Aberdeen

Ada

Adamsville

Addyston

- Delphi -
-
Ada
-
Saarland
-
Salzburg
-
-

Saarland

- Salzburg -
-
- Delphi -
-
Ada
-
Saarland
-
Salzburg
-
-
-
- Delphi -
-
Ada
-
Saarland
-
Salzburg
-
-
-
Perch
-
-

- -

Aberdeen
Ada
Adamsville
Addyston
- Delphi -
- Ada
- Saarland
- Salzburg
-
Saarland

- -

test item

" ).menu( "refresh" ); - equal( element.find( ".ui-menu-item" ).length, 6, "Incorrect number of menu items" ); - element.find( ".ui-menu-item:last" ).remove().end().menu( "refresh" ); - equal( element.find( ".ui-menu-item" ).length, 5, "Incorrect number of menu items" ); - element.append( "

---

" ).menu( "refresh" ); - equal( element.find( ".ui-menu-item" ).length, 5, "Incorrect number of menu items" ); - element.children( ":last" ).remove().end().menu( "refresh" ); - equal( element.find( ".ui-menu-item" ).length, 5, "Incorrect number of menu items" ); -}); - -test( "refresh submenu", function() { - expect( 2 ); - var element = $( "#menu2" ).menu(); - equal( element.find( "ul:first .ui-menu-item" ).length, 3 ); - element.find( "ul" ).addBack().append( "

New Item

" ); - element.menu("refresh"); - equal( element.find( "ul:first .ui-menu-item" ).length, 4 ); -}); - -test( "widget", function() { - expect( 2 ); - var element = $( "#menu1" ).menu(), - widgetElement = element.menu( "widget" ); - equal( widgetElement.length, 1, "one element" ); - strictEqual( widgetElement[ 0 ], element[ 0 ], "same element" ); -}); - -// TODO: test focus method - -// TODO: test blur method - -// TODO: test collapseAll method - -// TODO: test collapse method - -// TODO: test expand method - -// TODO: test next method - -// TODO: test prev method - -// TODO: test isFirstItem method - -// TODO: test isLastItem method - -// TODO: test nextPage method - -// TODO: test prevPage method - -// TODO: test select method - -})( jQuery ); diff --git a/97suifangqa/apps/indicator/static/plugins/jquery-ui/tests/unit/menu/menu_options.js b/97suifangqa/apps/indicator/static/plugins/jquery-ui/tests/unit/menu/menu_options.js deleted file mode 100644 index e3977e6..0000000 --- a/97suifangqa/apps/indicator/static/plugins/jquery-ui/tests/unit/menu/menu_options.js +++ /dev/null @@ -1,115 +0,0 @@ -(function( $ ) { - -var log = TestHelpers.menu.log, - logOutput = TestHelpers.menu.logOutput, - click = TestHelpers.menu.click; - -module( "menu: options", { - setup: function() { - TestHelpers.menu.clearLog(); - } -}); - -test( "{ disabled: true }", function() { - expect( 2 ); - var element = $( "#menu1" ).menu({ - disabled: true, - select: function() { - log(); - } - }); - ok( element.hasClass( "ui-state-disabled" ), "Missing ui-state-disabled class" ); - log( "click", true ); - click( element, "1" ); - log( "afterclick" ); - equal( logOutput(), "click,afterclick", "Click order not valid." ); -}); - -test( "{ disabled: false }", function() { - expect( 2 ); - var element = $( "#menu1" ).menu({ - disabled: false, - select: function() { - log(); - } - }); - ok( !element.hasClass( "ui-state-disabled" ), "Has ui-state-disabled class" ); - log( "click", true ); - click( element, "1" ); - log( "afterclick" ); - equal( logOutput(), "click,1,afterclick", "Click order not valid." ); -}); - -test( "{ icons: default }", function() { - expect( 2 ); - var element = $( "#menu2" ).menu(); - equal( element.find( ".ui-menu-icon" ).attr( "class" ), "ui-menu-icon ui-icon ui-icon-carat-1-e" ); - - element.menu("option", "icons.submenu", "ui-icon-triangle-1-e"); - equal( element.find( ".ui-menu-icon" ).attr( "class" ), "ui-menu-icon ui-icon ui-icon-triangle-1-e" ); -}); - -test( "{ icons: { submenu: 'custom' } }", function() { - expect( 1 ); - var element = $( "#menu2" ).menu({ - icons: { - submenu: "custom-class" - } - }); - equal( element.find( ".ui-menu-icon" ).attr( "class" ), "ui-menu-icon ui-icon custom-class" ); -}); - -// TODO: test menus option - -// TODO: test position option - -test( "{ role: 'menu' } ", function() { - var element = $( "#menu1" ).menu(), - items = element.find( "li" ); - expect( 2 + 5 * items.length ); - equal( element.attr( "role" ), "menu" ); - ok( items.length > 0, "number of menu items" ); - items.each(function( item ) { - ok( $( this ).hasClass( "ui-menu-item" ), "menu item ("+ item + ") class for item" ); - equal( $( this ).attr( "role" ), "presentation", "menu item ("+ item + ") role" ); - equal( $( "a", this ).attr( "role" ), "menuitem", "menu item ("+ item + ") role" ); - ok( $( "a", this ).hasClass( "ui-corner-all" ), "a element class for menu item ("+ item + ")" ); - equal( $( "a", this ).attr( "tabindex" ), "-1", "a element tabindex for menu item ("+ item + ")" ); - }); -}); - -test( "{ role: 'listbox' } ", function() { - var element = $( "#menu1" ).menu({ - role: "listbox" - }), - items = element.find( "li" ); - expect( 2 + 5 * items.length ); - equal( element.attr( "role" ), "listbox" ); - ok( items.length > 0, "number of menu items" ); - items.each(function( item ) { - ok( $( this ).hasClass( "ui-menu-item" ), "menu item ("+ item + ") class for item" ); - equal( $( this ).attr( "role" ), "presentation", "menu item ("+ item + ") role" ); - equal( $( "a", this ).attr( "role" ), "option", "menu item ("+ item + ") role" ); - ok( $( "a", this ).hasClass( "ui-corner-all" ), "a element class for menu item ("+ item + ")" ); - equal( $( "a", this ).attr( "tabindex" ), "-1", "a element tabindex for menu item ("+ item + ")" ); - }); -}); - -test( "{ role: null }", function() { - var element = $( "#menu1" ).menu({ - role: null - }), - items = element.find( "li" ); - expect( 2 + 5 * items.length ); - strictEqual( element.attr( "role" ), undefined ); - ok( items.length > 0, "number of menu items" ); - items.each(function( item ) { - ok( $( this ).hasClass( "ui-menu-item" ), "menu item ("+ item + ") class for item" ); - equal( $( this ).attr( "role" ), "presentation", "menu item ("+ item + ") role" ); - equal( $( "a", this ).attr( "role" ), undefined, "menu item ("+ item + ") role" ); - ok( $( "a", this ).hasClass( "ui-corner-all" ), "a element class for menu item ("+ item + ")" ); - equal( $( "a", this ).attr( "tabindex" ), "-1", "a element tabindex for menu item ("+ item + ")" ); - }); -}); - -})( jQuery ); diff --git a/97suifangqa/apps/indicator/static/plugins/jquery-ui/tests/unit/menu/menu_test_helpers.js b/97suifangqa/apps/indicator/static/plugins/jquery-ui/tests/unit/menu/menu_test_helpers.js deleted file mode 100644 index b6c09ad..0000000 --- a/97suifangqa/apps/indicator/static/plugins/jquery-ui/tests/unit/menu/menu_test_helpers.js +++ /dev/null @@ -1,31 +0,0 @@ -(function() { - -var lastItem, - log = []; - -TestHelpers.menu = { - log: function( message, clear ) { - if ( clear ) { - log.length = 0; - } - if ( message === undefined ) { - message = lastItem; - } - log.push( $.trim( message ) ); - }, - - logOutput: function() { - return log.join( "," ); - }, - - clearLog: function() { - log.length = 0; - }, - - click: function( menu, item ) { - lastItem = item; - menu.children( ":eq(" + item + ")" ).find( "a:first" ).trigger( "click" ); - } -}; - -})(); -- cgit v1.2.2