Changeset 173

Show
Ignore:
Timestamp:
08/21/08 14:24:55 (3 months ago)
Author:
rgrp
Message:

[js/tests][m]: fair way through a new jsspec test of threadfactlets_controller.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/microfacts/public/behaviour/app/controllers/threadfactlets_controller.js

    r171 r173  
    11var ThreadFactletsController = new Class({ 
    22    Extends: Controller, 
     3 
     4//    factletSummaryTemplate = [ 
     5//'<div id="factlet-<%= c.id %>" class="factlet">', 
     6//'  <%= this.partial({url: baseurl+'/title.ejs'}) %>', 
     7//'</div>', 
     8//    ].join('\n'); 
    39     
    4     initialize: function () { 
     10    initialize: function (element) { 
    511        this.parent.apply(this, arguments); 
    612//        this.model = DomainObject.Resource('Factlet', this.id()); 
     
    915//        this.addDefaultListeners(); 
    1016        this.factlets = []; 
     17        this.selectedFactletId = null; 
     18    }, 
     19 
     20    // Name is relative to app/views directory, without an .ejs extension. 
     21    renderView: function (name, data) { 
     22        // return new EJS({url: '/app/views/'+name+'.ejs'}).render({'c': data}); 
     23    }, 
     24 
     25    generateFactletElement: function (factlet) { 
     26        // var html = this.renderView('factlet/summary', factlet.data); 
     27        html = null; 
     28        return html; 
    1129    }, 
    1230     
     
    1432        console.log("ThreadFactletsController saw factletSelect event"); 
    1533        console.log(this.factletDivsKeyedById); 
     34        this.selectedFactletId = factlet.id; 
    1635        // TODO: unselect any selected element ... 
    1736        this.factletDivsKeyedById.each(function(value, key) { 
     
    3857    }, 
    3958 
     59    onRemoveSelectedFactlet: function() { 
     60        this.thread.factlets.erase(this.selectedFactletId); 
     61        this.thread.save(); 
     62    }, 
     63 
    4064    controls: { 
    4165        '.factlet click': function (e) { 
  • trunk/microfacts/public/behaviour/load.js

    r171 r173  
    1515 
    1616loader.addModule({ 
     17    name: "ejs", 
     18    type: "js", 
     19    path: "vendor/ejs/ejs.js", 
     20    varName: "EJS" // Pick last class to be defined in Mootools Core. 
     21}); 
     22 
     23loader.addModule({ 
    1724    name: "extensions", 
    1825    type: "js", 
     
    130137    type: "js", 
    131138    path: "app/controllers/threadfactlets_controller.js?" + Math.random(), 
    132     requires: ['controller', 'thread'], 
     139    requires: ['controller', 'thread', 'ejs'], 
    133140    varName: "ThreadFactletsController" 
    134141}); 
  • trunk/microfacts/public/test/index.html

    r154 r173  
    2626      visibility: hidden; 
    2727    } 
     28 
     29    .thread-factlets { 
     30      position: absolute; 
     31      bottom: 0; 
     32    } 
    2833  </style> 
    2934 
     
    4550 
    4651  <script type="text/javascript" src="spec/model_spec.js?123"></script> 
    47  <script type="text/javascript" src="spec/controller_spec.js?123"></script> 
     52  <script type="text/javascript" src="spec/controller_spec.js?123"></script> 
    4853  <script type="text/javascript" src="spec/view_spec.js?123"></script> 
     54  <script type="text/javascript" src="spec/threadfactletscontroller_spec.js?123"></script> 
     55  <!-- 
    4956  <script type="text/javascript" src="spec/mapcontroller_spec.js?123"></script> 
    5057  <script type="text/javascript" src="spec/timelinecontroller_spec.js?123"></script> 
     58  --> 
    5159 
    5260<!-- 
     
    8189 
    8290  <div id="view"></div> 
     91 
     92  <div class="thread-factlets"> 
     93    <div id="factlet-101" class="factlet"> 
     94      <h3 class="factlet-title">My Factlet</h3> 
     95    </div> 
     96    <div id="factlet-102" class="factlet"> 
     97      <h3 class="factlet-title">Your Factlet</h3> 
     98    </div> 
     99  </div> 
    83100   
    84101</body>