Skip to content
Snippets Groups Projects
  • Tobias Moebert's avatar
    2efcd27b
    Merge remote-tracking branch 'rueger/development' into development · 2efcd27b
    Tobias Moebert authored
    * 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
    2efcd27b
    History
    Merge remote-tracking branch 'rueger/development' into development
    Tobias Moebert authored
    * 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