Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: dataarts/dat.gui
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v0.7.8
Choose a base ref
...
head repository: dataarts/dat.gui
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v0.7.9
Choose a head ref
  • 5 commits
  • 9 files changed
  • 3 contributors

Commits on Sep 7, 2021

  1. Fix width on FunctionController property_name 

    Before: Text descriptions for buttons (FunctionController) were being truncated unnecessarily to the same width as other Controllers that must share real estate with input elements.

This PR sets the css width for FunctionController elements to 100%.  I've added to example.html in case it's useful.
    @RussTedrake
    RussTedrake committed Sep 7, 2021
    Copy the full SHA
    475a111 View commit details

Commits on Oct 31, 2021

  1. docs: Fix a few typos 

    There are small typos in:
- tests/qunit.js

Fixes:
- Should read `prove` rather than `proove`.
- Should read `parameters` rather than `paramaters`.
- Should read `modifiers` rather than `modifers`.
- Should read `guarantee` rather than `gurantee`.
- Should read `annotation` rather than `annotaion`.
    @timgates42
    timgates42 committed Oct 31, 2021

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    27281c3 View commit details

Commits on Feb 17, 2022

  1. Merge pull request #309 from timgates42/bugfix_typos 

    docs: Fix a few typos
    @mrdoob
    mrdoob authored Feb 17, 2022

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    68d3d9e View commit details

Commits on Feb 18, 2022

  1. Merge pull request #306 from RussTedrake/button_width 

    Fix width on FunctionController property_name
    @mrdoob
    mrdoob authored Feb 18, 2022
    Copy the full SHA
    884c71e View commit details

Commits on Feb 19, 2022

  1. 0.7.9

    @mrdoob
    mrdoob committed Feb 19, 2022
    Copy the full SHA
    19c4725 View commit details
Showing with 22 additions and 12 deletions.
  1. +1 −1 build/dat.gui.css
  2. +1 −1 build/dat.gui.js
  3. +1 −1 build/dat.gui.min.js
  4. +1 −1 build/dat.gui.module.js
  5. +5 −0 example.html
  6. +2 −2 package-lock.json
  7. +1 −1 package.json
  8. +5 −0 src/dat/gui/_structure.scss
  9. +5 −5 tests/qunit.js
2 changes: 1 addition & 1 deletion build/dat.gui.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion build/dat.gui.js
View file
2 changes: 1 addition & 1 deletion build/dat.gui.min.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/dat.gui.module.js
View file
5 changes: 5 additions & 0 deletions example.html
View file
Original file line number Diff line number Diff line change
@@ -58,6 +58,11 @@
var f3 = f2.addFolder('Nested Folder');
f3.add(obj, 'growthSpeed');

obj['Button with a long description'] = function () {
console.log('Button with a long description pressed');
};
gui.add(obj, 'Button with a long description');

</script>
</body>
</html>
4 changes: 2 additions & 2 deletions package-lock.json
View file
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "dat.gui",
"version": "0.7.8",
"version": "0.7.9",
"description": "A lightweight graphical user interface for changing variables in JavaScript.",
"main": "build/dat.gui.js",
"module": "build/dat.gui.module.js",
5 changes: 5 additions & 0 deletions src/dat/gui/_structure.scss
View file
Original file line number Diff line number Diff line change
@@ -172,6 +172,11 @@ $button-height: 20px;
text-overflow: ellipsis;
}

/** Function controllers can use the entire width */
.cr.function .property-name {
width: 100%;
}

/** Controller-half (right) */
.c {
float: left;
10 changes: 5 additions & 5 deletions tests/qunit.js
View file
Original file line number Diff line number Diff line change
@@ -301,7 +301,7 @@ var QUnit = {
},

/**
* Specify the number of expected assertions to gurantee that failed test (no assertions are run at all) don't slip through.
* Specify the number of expected assertions to guarantee that failed test (no assertions are run at all) don't slip through.
*/
expect: function(asserts) {
config.current.expected = asserts;
@@ -482,7 +482,7 @@ var config = {
moduleDone: []
};

// Load paramaters
// Load parameters
(function() {
var location = window.location || { search: "", protocol: "file:" },
params = location.search.slice( 1 ).split( "&" ),
@@ -1070,7 +1070,7 @@ QUnit.equiv = function () {
// for string, boolean, number and null
function useStrictEquality(b, a) {
if (b instanceof a.constructor || a instanceof b.constructor) {
// to catch short annotaion VS 'new' annotation of a
// to catch short annotation VS 'new' annotation of a
// declaration
// e.g. var i = 1;
// var j = new Number(1);
@@ -1099,7 +1099,7 @@ QUnit.equiv = function () {
"regexp" : function(b, a) {
return QUnit.objectType(b) === "regexp"
&& a.source === b.source && // the regex itself
a.global === b.global && // and its modifers
a.global === b.global && // and its modifiers
// (gmi) ...
a.ignoreCase === b.ignoreCase
&& a.multiline === b.multiline;
@@ -1147,7 +1147,7 @@ QUnit.equiv = function () {

"object" : function(b, a) {
var i, j, loop;
var eq = true; // unless we can proove it
var eq = true; // unless we can prove it
var aProperties = [], bProperties = []; // collection of
// strings