Changeset 408


Ignore:
Timestamp:
09/05/12 15:50:38 (13 years ago)
Author:
hendrikvanantwerpen
Message:

Added config/ to build. It looks like top-level JS files (like config/db.js and rft/run.js) don't use the cache correctly in a build.

Location:
Dev/branches/rest-dojo-ui
Files:
3 added
4 edited
1 moved

Legend:

Unmodified
Added
Removed

  • Dev/branches/rest-dojo-ui/build/build.sh

    r407 r408  
    11#!/bin/bash
     2
     3PROFILE=$1
     4if [ -z "$PROFILE" ]; then
     5    echo "Usage: $0 <profile.js>"
     6    exit 1
     7fi
    28
    39TIME0=$SECONDS
    … …  
    1117
    1218echo "Start Dojo build process."
    13 "$SRCDIR/util/buildscripts/build.sh" --profile rft.profile.js
     19"$SRCDIR/util/buildscripts/build.sh" --profile "$PROFILE"
    1420
    1521echo "Copying application top level resources."

  • Dev/branches/rest-dojo-ui/build/release.profile.js

    r407 r408  
    3737            'dijit',
    3838            'dojox',
    39             'rft'
     39            'rft',
     40            'config'
    4041        ],
    4142
    … …  
    4849            'rft/run' :{
    4950                include: [ 'rft/run' ]
     51            },
     52            'config/db' :{
     53                include: [ 'config/db' ]
    5054            }/*,
    5155            'rft/view' :{

  • Dev/branches/rest-dojo-ui/client/config/db.js

    r362 r408  
    66         'dojo/query',
    77         'dijit/registry',
    8          'dojo/text!./docs.json',
    9          'dojo/domReady!',
    10          'dijit/form/TextBox',
    11          'dijit/form/Button',
    12          'dijit/form/CheckBox',
    13          ],
    14     function(json,lang,xhr,parser,query,registry,docsJson){
     8         'dojo/domReady!'
     9],function(json,lang,xhr,parser,query,registry){
    1510    var logNode;
    1611    var usernameInput, passwordInput, resetInput, configButton;
    … …  
    1813    var dbUrl = "../data/";
    1914
    20     parser.parse();
     15    parser.parse()
     16    .then(function(){
     17        query("#log").forEach(function(n){logNode = n;});
     18        usernameInput = registry.byId('username');
     19        passwordInput = registry.byId('password');
     20        resetInput = registry.byId('reset');
     21        configButton = registry.byId('configure');
    2122
    22     query("#log").forEach(function(n){logNode = n;});
    23     usernameInput = registry.byId('username');
    24     passwordInput = registry.byId('password');
    25     resetInput = registry.byId('reset');
    26     configButton = registry.byId('configure');
     23        usernameInput.set('value',defaultUsername);
     24        passwordInput.set('value',defaultPassword);
     25        configButton.on('click',configure);
    2726
    28     usernameInput.set('value',defaultUsername);
    29     passwordInput.set('value',defaultPassword);
    30     configButton.on('click',configure);
     27        log("Give CouchDB admin username & password and click 'Configure' to start.\nIf the database already exists, rft_admin password will suffice.",true);
     28    });
    3129
    32     log("Give CouchDB admin username & password and click 'Configure' to start.\nIf the database already exists, rft_admin password will suffice.",true);
    33    
    3430    function configure(){
    3531        var docs;

  • Dev/branches/rest-dojo-ui/client/config/index.html

    r352 r408  
    22<html>
    33    <head>
     4        <title>Research Facilitator Tool - CouchDB Configure</title>
    45        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
    5         <title>Research Facilitator Tool - CouchDB Configure</title>
    6         <script type="text/javascript" src="../dojotoolkit/dojo/dojo.js" data-dojo-config="async: true, parseOnLoad: false, isDebug: true"></script>
    7         <script type="text/javascript" src="db.js"></script>
    8         <link rel="stylesheet" type="text/css" href="../dojotoolkit/dijit/themes/claro/claro.css" />
     6        <link rel="stylesheet" type="text/css" href="../dijit/themes/claro/claro.css" />
    97        <style>
    108            label {
    … …  
    1513    </head>
    1614    <body class="claro">
     15        <script type="text/javascript" src="../dojo/dojo.js" data-dojo-config="async: true, parseOnLoad: false, isDebug: true"></script>
     16        <script type="text/javascript" src="db.js"></script>
    1717        <h1>Configure CouchDB</h1>
    1818        <div>
    19             <label for="username">Admin username</label><input type="text" id="username" data-dojo-type="dijit.form.TextBox"/><br/>
    20             <label for="password">Admin password</label><input type="password" id="password" data-dojo-type="dijit.form.TextBox"/><br/>
    21             <label for="reset">Full reset</label><input type="checkbox" id="reset" data-dojo-type="dijit.form.CheckBox"/><br/>
    22             <button id="configure" data-dojo-type="dijit.form.Button">Configure</button><br/>
     19            <label for="username">Admin username</label><input type="text" id="username" data-dojo-type="dijit/form/TextBox"/><br/>
     20            <label for="password">Admin password</label><input type="password" id="password" data-dojo-type="dijit/form/TextBox"/><br/>
     21            <label for="reset">Full reset</label><input type="checkbox" id="reset" data-dojo-type="dijit/form/CheckBox"/><br/>
     22            <button id="configure" data-dojo-type="dijit/form/Button">Configure</button><br/>
    2323        </div>
    2424        <pre id="log">Waiting for configurator to initialize...</pre>

  • Dev/branches/rest-dojo-ui/client/rft/ui/LoginDialog.js

    r405 r408  
    11define(['dojo/_base/declare','dojo/_base/lang','dojo/_base/event','dijit/Dialog',
    22    'dijit/_WidgetsInTemplateMixin','../auth', 'dojo/text!./templates/LoginDialog.html',
    3     '../content','dijit/form/Form','dijit/form/Button','dijit/form/TextBox'],
     3    '../app/Controller','dijit/form/Form','dijit/form/Button','dijit/form/TextBox'],
    44    function (declare, lang, event, Dialog, _WidgetsInTemplateMixin, auth, template, content) {
    55        return declare([Dialog,_WidgetsInTemplateMixin], {
Note: See TracChangeset for help on using the changeset viewer.