Changeset 431


Ignore:
Timestamp:
04/15/13 14:40:30 (12 years ago)
Author:
hendrikvanantwerpen
Message:

Added basic HTML linting.

Added htmllint as grunt task.
Moved jshint and htrmllint options to separate rc files.

Location:
Dev/trunk/client/qed
Files:
2 added
7 edited

Legend:

Unmodified
Added
Removed

  • Dev/trunk/client/qed/Gruntfile.js

    r426 r431  
    1818        jshint: {
    1919            options: {
    20                 /* enforcing options */
    21                 bitwise: true,
    22                 curly: true,
    23                 eqeqeq: true,
    24                 immed: true,
    25                 indent: 4,
    26                 latedef: true,
    27                 newcap: true,
    28                 noarg: true,
    29                 undef: true,
    30                 unused: false,
    31                 strict: false,
    32                 /* relaxing options */
    33                 loopfunc: true,
    34                 /* enverinments */
    35                 devel: true,
    36                 node: true,
    37                 /* globals */
    38                 globals: {
    39                     require: true,
    40                     define: true
    41                 }
     20                jshintrc: ".jshintrc"
    4221            },
    4322            all: {
    4423                files: {
    4524                    src: ['**/*.js', '!node_modules/**']
     25                }
     26            }
     27        },
     28        htmlhint: {
     29            options: {
     30                htmlhintrc: ".htmlhintrc"
     31            },
     32            all: {
     33                files: {
     34                    src: ['**/*.html', '!node_modules/**']
    4635                }
    4736            }
    … …  
    5140    grunt.loadNpmTasks('grunt-contrib-less');
    5241    grunt.loadNpmTasks('grunt-contrib-jshint');
     42    grunt.loadNpmTasks('grunt-htmlhint');
    5343
    54     grunt.registerTask('default', ['less', 'jshint']);
     44    grunt.registerTask('default', ['less', 'jshint', 'htmlhint']);
    5545};

  • Dev/trunk/client/qed/model/widgets/templates/QuestionEditorToolkit.html

    r417 r431  
    99                                        <div data-dojo-attach-point="listNode" class="rftLineListView"></div>
    1010                                        <div data-dojo-attach-point="categoriesBoxNode"></div>
    11                                         <button class="inheritBgColor" data-dojo-type="dijit/form/Button" data-dojo-attach-event="onClick:onCategoryAdd" data-dojo-props="baseClass:'rftBlockButton', iconClass: 'rftIcon rftIconPlus'">Add</button><br>
     11                                        <button class="inheritBgColor" data-dojo-type="dijit/form/Button" data-dojo-attach-event="onClick:onCategoryAdd" data-dojo-props="baseClass:'rftBlockButton', iconClass: 'rftIcon rftIconPlus'">Add</button><br/>
    1212                                        <label>Topic:</label>
    1313                                        <div data-dojo-attach-point="topicBoxNode"></div>

  • Dev/trunk/client/qed/model/widgets/templates/QuestionWidget.html

    r417 r431  
    1313        <fieldset>
    1414            <select data-dojo-type="dijit/form/Select" data-dojo-attach-point="scaleSelector" data-dojo-attach-event="onChange:_onTypeChange" name="scale">
    15                 <option value="string" selected>String</option>
     15                <option value="string" selected="selected">String</option>
    1616                <option value="text">Text</option>
    1717                <option value="singleChoice">Single choice</option>

  • Dev/trunk/client/qed/package.json

    r427 r431  
    1212    "grunt": "~0.4.0",
    1313    "grunt-contrib-less": "~0.5.0",
    14     "grunt-contrib-jshint": "~0.2.0"
     14    "grunt-contrib-jshint": "~0.2.0",
     15    "grunt-htmlhint": "~0.9.2"
    1516  }
    1617}

  • Dev/trunk/client/qed/pages/templates/survey.html

    r419 r431  
    3434                Preview</button>
    3535        </div>
     36    </div>
    3637
    3738    <div data-dojo-type="dijit/Dialog"

  • Dev/trunk/client/qed/pages/templates/surveyRun.html

    r421 r431  
    1616        <fieldset class="qedFieldset">
    1717            <div><div class="qedLabel">General URL</div><div class="qedField" data-dojo-attach-point="runURLNode" style="overflow: ellipsis"></div></div>
    18             <div><div class="qedLabel">Responses <span data-dojo-attach-point="responsesCountNode"></span></div><div class="qedField qedFill" data-dojo-attach-point="responsesNode"></div>
     18            <div><div class="qedLabel">Responses <span data-dojo-attach-point="responsesCountNode"></span></div><div class="qedField qedFill" data-dojo-attach-point="responsesNode"></div></div>
    1919        </fieldset>
    2020    </div>

  • Dev/trunk/client/qed/ui/templates/LoginDialog.html

    r407 r431  
    22    <div data-dojo-attach-point="titleBar" class="dijitDialogTitleBar">
    33        <span data-dojo-attach-point="titleNode" class="dijitDialogTitle"></span>
    4         <span data-dojo-attach-point="closeButtonNode" class="dijitDialogCloseIcon" data-dojo-attach-event="ondijitclick: onCancel" title="${buttonCancel}" role="button" tabIndex="-1">
     4        <span data-dojo-attach-point="closeButtonNode" class="dijitDialogCloseIcon" data-dojo-attach-event="ondijitclick: onCancel" title="${buttonCancel}" role="button" tabindex="-1">
    55            <span data-dojo-attach-point="closeText" class="closeText" title="${buttonCancel}">x</span>
    66        </span>
Note: See TracChangeset for help on using the changeset viewer.