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'; --- .../jquery-ui/tests/unit/selectable/all.html | 30 ------ .../tests/unit/selectable/selectable.html | 51 ---------- .../tests/unit/selectable/selectable_common.js | 21 ----- .../tests/unit/selectable/selectable_core.js | 3 - .../tests/unit/selectable/selectable_events.js | 69 -------------- .../tests/unit/selectable/selectable_methods.js | 104 --------------------- .../tests/unit/selectable/selectable_options.js | 65 ------------- 7 files changed, 343 deletions(-) delete mode 100644 97suifangqa/apps/indicator/static/plugins/jquery-ui/tests/unit/selectable/all.html delete mode 100644 97suifangqa/apps/indicator/static/plugins/jquery-ui/tests/unit/selectable/selectable.html delete mode 100644 97suifangqa/apps/indicator/static/plugins/jquery-ui/tests/unit/selectable/selectable_common.js delete mode 100644 97suifangqa/apps/indicator/static/plugins/jquery-ui/tests/unit/selectable/selectable_core.js delete mode 100644 97suifangqa/apps/indicator/static/plugins/jquery-ui/tests/unit/selectable/selectable_events.js delete mode 100644 97suifangqa/apps/indicator/static/plugins/jquery-ui/tests/unit/selectable/selectable_methods.js delete mode 100644 97suifangqa/apps/indicator/static/plugins/jquery-ui/tests/unit/selectable/selectable_options.js (limited to '97suifangqa/apps/indicator/static/plugins/jquery-ui/tests/unit/selectable') diff --git a/97suifangqa/apps/indicator/static/plugins/jquery-ui/tests/unit/selectable/all.html b/97suifangqa/apps/indicator/static/plugins/jquery-ui/tests/unit/selectable/all.html deleted file mode 100644 index e517ef3..0000000 --- a/97suifangqa/apps/indicator/static/plugins/jquery-ui/tests/unit/selectable/all.html +++ /dev/null @@ -1,30 +0,0 @@ - - - - - jQuery UI Selectable Test Suite - - - - - - - - - - - - - -

jQuery UI Selectable Test Suite

-

-
-

-
    -
    - -
    - - diff --git a/97suifangqa/apps/indicator/static/plugins/jquery-ui/tests/unit/selectable/selectable.html b/97suifangqa/apps/indicator/static/plugins/jquery-ui/tests/unit/selectable/selectable.html deleted file mode 100644 index 18ffc6e..0000000 --- a/97suifangqa/apps/indicator/static/plugins/jquery-ui/tests/unit/selectable/selectable.html +++ /dev/null @@ -1,51 +0,0 @@ - - - - - jQuery UI Selectable Test Suite - - - - - - - - - - - - - - - - - - -

    jQuery UI Selectable Test Suite

    -

    -
    -

    -
      -
      - - - -
      - - diff --git a/97suifangqa/apps/indicator/static/plugins/jquery-ui/tests/unit/selectable/selectable_common.js b/97suifangqa/apps/indicator/static/plugins/jquery-ui/tests/unit/selectable/selectable_common.js deleted file mode 100644 index d00a47b..0000000 --- a/97suifangqa/apps/indicator/static/plugins/jquery-ui/tests/unit/selectable/selectable_common.js +++ /dev/null @@ -1,21 +0,0 @@ -TestHelpers.commonWidgetTests("selectable", { - defaults: { - appendTo: "body", - autoRefresh: true, - cancel: "input,textarea,button,select,option", - delay: 0, - disabled: false, - distance: 0, - filter: "*", - tolerance: "touch", - - // callbacks - create: null, - selected: null, - selecting: null, - start: null, - stop: null, - unselected: null, - unselecting: null - } -}); diff --git a/97suifangqa/apps/indicator/static/plugins/jquery-ui/tests/unit/selectable/selectable_core.js b/97suifangqa/apps/indicator/static/plugins/jquery-ui/tests/unit/selectable/selectable_core.js deleted file mode 100644 index 9953b6c..0000000 --- a/97suifangqa/apps/indicator/static/plugins/jquery-ui/tests/unit/selectable/selectable_core.js +++ /dev/null @@ -1,3 +0,0 @@ -/* - * selectable_core.js - */ \ No newline at end of file diff --git a/97suifangqa/apps/indicator/static/plugins/jquery-ui/tests/unit/selectable/selectable_events.js b/97suifangqa/apps/indicator/static/plugins/jquery-ui/tests/unit/selectable/selectable_events.js deleted file mode 100644 index ae35fa3..0000000 --- a/97suifangqa/apps/indicator/static/plugins/jquery-ui/tests/unit/selectable/selectable_events.js +++ /dev/null @@ -1,69 +0,0 @@ -/* - * selectable_events.js - */ -(function( $ ) { - -module("selectable: events"); - -test( "start", function() { - expect( 2 ); - var el = $("#selectable1"); - el.selectable({ - start: function() { - ok( true, "drag fired start callback" ); - equal( this, el[0], "context of callback" ); - } - }); - el.simulate( "drag", { - dx: 20, - dy: 20 - }); -}); - -test( "stop", function() { - expect( 2 ); - var el = $("#selectable1"); - el.selectable({ - start: function() { - ok( true, "drag fired stop callback" ); - equal( this, el[0], "context of callback" ); - } - }); - el.simulate( "drag", { - dx: 20, - dy: 20 - }); -}); - -test( "mousedown: initial position of helper", function() { - expect( 2 ); - - var helperOffset, - element = $( "#selectable1" ).selectable(), - contentToForceScroll = $( "
      " ).css({ - height: "10000px", - width: "10000px" - }); - - contentToForceScroll.appendTo( "body" ); - $( window ).scrollTop( 100 ).scrollLeft( 100 ); - - element.simulate( "mousedown", { - clientX: 10, - clientY: 10 - }); - - // we do a GTE comparison here because IE7 erroneously subtracts - // 2 pixels from a simulated mousedown for clientX/Y - // Support: IE7 - helperOffset = $( ".ui-selectable-helper" ).offset(); - ok( helperOffset.top >= 99, "Scroll top should be accounted for." ); - ok( helperOffset.left >= 99, "Scroll left should be accounted for." ); - - // Cleanup - element.simulate( "mouseup" ); - contentToForceScroll.remove(); - $( window ).scrollTop( 0 ).scrollLeft( 0 ); -}); - -})( jQuery ); diff --git a/97suifangqa/apps/indicator/static/plugins/jquery-ui/tests/unit/selectable/selectable_methods.js b/97suifangqa/apps/indicator/static/plugins/jquery-ui/tests/unit/selectable/selectable_methods.js deleted file mode 100644 index 72f9bb2..0000000 --- a/97suifangqa/apps/indicator/static/plugins/jquery-ui/tests/unit/selectable/selectable_methods.js +++ /dev/null @@ -1,104 +0,0 @@ -/* - * selectable_methods.js - */ -(function($) { - -module("selectable: methods"); - -test("init", function() { - expect( 5 ); - - $("
      ").appendTo("body").selectable().remove(); - ok(true, ".selectable() called on element"); - - $([]).selectable().remove(); - ok(true, ".selectable() called on empty collection"); - - $("
      ").selectable().remove(); - ok(true, ".selectable() called on disconnected DOMElement"); - - var el = $("
      ").selectable(); - el.selectable("option", "foo"); - el.remove(); - ok(true, "arbitrary option getter after init"); - - $("
      ").selectable().selectable("option", "foo", "bar").remove(); - ok(true, "arbitrary option setter after init"); -}); - -test("destroy", function() { - expect( 4 ); - - $("
      ").appendTo("body").selectable().selectable("destroy").remove(); - ok(true, ".selectable('destroy') called on element"); - - $([]).selectable().selectable("destroy").remove(); - ok(true, ".selectable('destroy') called on empty collection"); - - $("
      ").selectable().selectable("destroy").remove(); - ok(true, ".selectable('destroy') called on disconnected DOMElement"); - - var expected = $("
      ").selectable(), - actual = expected.selectable("destroy"); - equal(actual, expected, "destroy is chainable"); -}); - -test("enable", function() { - expect(3); - var expected, actual, - fired = false, - el = $("#selectable1"); - - el.selectable({ - disabled: true, - start: function() { fired = true; } - }); - el.simulate( "drag", { - dx: 20, - dy: 20 - }); - equal(fired, false, "start fired"); - el.selectable("enable"); - el.simulate( "drag", { - dx: 20, - dy: 20 - }); - equal(fired, true, "start fired"); - el.selectable("destroy"); - - expected = $("
      ").selectable(); - actual = expected.selectable("enable"); - equal(actual, expected, "enable is chainable"); -}); - -test("disable", function() { - expect(3); - var expected, actual, - fired = false, - el = $("#selectable1"); - - el.selectable({ - disabled: false, - start: function() { fired = true; } - }); - el.simulate( "drag", { - dx: 20, - dy: 20 - }); - equal(fired, true, "start fired"); - el.selectable("disable"); - fired = false; - - el.simulate( "drag", { - dx: 20, - dy: 20 - }); - equal(fired, false, "start fired"); - el.selectable("destroy"); - - expected = $("
      ").selectable(); - actual = expected.selectable("disable"); - equal(actual, expected, "disable is chainable"); -}); - -})(jQuery); diff --git a/97suifangqa/apps/indicator/static/plugins/jquery-ui/tests/unit/selectable/selectable_options.js b/97suifangqa/apps/indicator/static/plugins/jquery-ui/tests/unit/selectable/selectable_options.js deleted file mode 100644 index 973247f..0000000 --- a/97suifangqa/apps/indicator/static/plugins/jquery-ui/tests/unit/selectable/selectable_options.js +++ /dev/null @@ -1,65 +0,0 @@ -/* - * selectable_options.js - */ -(function($) { - -module("selectable: options"); - -test("autoRefresh", function() { - expect(3); - - var actual = 0, - el = $("#selectable1"), - sel = $("*", el), - selected = function() { actual += 1; }; - - el = $("#selectable1").selectable({ autoRefresh: false, selected: selected }); - sel.hide(); - el.simulate( "drag", { - dx: 1000, - dy: 1000 - }); - equal(actual, sel.length); - el.selectable("destroy"); - - actual = 0; - sel.show(); - el = $("#selectable1").selectable({ autoRefresh: true, selected: selected }); - sel.hide(); - el.simulate( "drag", { - dx: 1000, - dy: 1000 - }); - equal(actual, 0); - - sel.show(); - $( sel[ 0 ] ).simulate( "drag", { - dx: 1000, - dy: 1000 - }); - equal(actual, sel.length); - - el.selectable("destroy"); - sel.show(); -}); - -test("filter", function() { - expect(2); - - var actual =0, - el = $("#selectable1"), - sel = $("*", el), - selected = function() { actual += 1; }; - - - el = $("#selectable1").selectable({ filter: ".special", selected: selected }); - el.simulate( "drag", { - dx: 1000, - dy: 1000 - }); - ok(sel.length !== 1, "this test assumes more than 1 selectee"); - equal(actual, 1); - el.selectable("destroy"); -}); - -})(jQuery); -- cgit v1.2.2