Merge remote-tracking branch 'rueger/development' into development
* rueger/development: # some more clean up # code cleanup # updated discoverer to initialize components on the fly # updated to version without ease.js and with synonyms # [Aggregator] moved _getComponentsForUnsatisfiedAttributes() to [Discoverer] + [Discoverer] _getComponentsForUnsatisfiedAttributes() # [Discoverer] _getComponentsForUnsatisfiedAttributes() can initialize components if not already registered # [Interpreter] constructor Interpreter(discoverer, inAttributes, outAttributes) + [Interpreter] inOut # [Interpreter] _init() # [Interpreter] _initInterpreter() # [Interpreter] _initInAttributes() # [Interpreter] _initOutAttributes() # [Interpreter] _doesSatisfyTypeOf() # [Widget] constructor Widget(discoverer, outAttributes) + [Widget] inOut # [Widget] _initWidgetr() # [Widget] _initOutAttributes() # [Widget] _doesSatisfyTypeOf() + .gitignore Conflicts: dist/contactJS.js docs/jaguarjs-jsdoc-master/demo/sample/Car.js docs/jaguarjs-jsdoc-master/demo/sample/Child.js docs/jaguarjs-jsdoc-master/demo/sample/Namespace.js docs/jaguarjs-jsdoc-master/demo/sample/Parent.js js/modules/aggregator/aggregator.js js/modules/attribute/attribute.js js/modules/discoverer/discoverer.js js/modules/interpreter/interpreter.js js/modules/widget/widget.js
Showing
- dist/contactJS.js 446 additions, 195 deletionsdist/contactJS.js
- js/modules/aggregator/aggregator.js 4 additions, 91 deletionsjs/modules/aggregator/aggregator.js
- js/modules/attribute/attribute.js 15 additions, 10 deletionsjs/modules/attribute/attribute.js
- js/modules/discoverer/discoverer.js 256 additions, 4 deletionsjs/modules/discoverer/discoverer.js
- js/modules/interpreter/interpreter.js 40 additions, 9 deletionsjs/modules/interpreter/interpreter.js
- js/modules/widget/widget.js 98 additions, 73 deletionsjs/modules/widget/widget.js
Loading
Please register or sign in to comment