Merge a0972a9 into e598468

Gruntfile.js

@@ -165,7 +165,7 @@ module.exports = function(grunt) {
           'dependencies/css.js',
           'icon/*.png',
           //'icon/iconconfig.js',
-          'lib/templateengine.js',
+          'lib/TemplateEngine.js',
           'designs/**/*.{js,css,png,ttf,svg}',
           'plugins/**/*.{js,css,png,ttf,svg}'
         ],

src/cometvisu.appcache

@@ -16,7 +16,7 @@ icon/comet_webapp_icon_android_96.png
 icon/comet_webapp_icon_android_144.png
 icon/comet_webapp_icon_android_192.png
 icon/iconconfig.js
-lib/templateengine.js
+lib/TemplateEngine.js
 # structure_pure will be inserted here during the release process !DON'T MODIFY!
 dependencies/jquery.ui.touch-punch.js
 dependencies/jquery-ui.js
@@ -26,45 +26,45 @@ dependencies/jquery.js
 dependencies/jsfloorplan.js
 dependencies/Three.js
 dependencies/poly2tri.js
-lib/iconhandler.js
-lib/icontools.js
-lib/compatibility.js
-lib/cometvisu-client.js
-lib/pagehandler.js
-lib/pagepartshandler.js
-lib/trick-o-matic.js
+lib/IconHandler.js
+lib/IconTools.js
+lib/Compatibility.js
+lib/CometVisuClient.js
+lib/PageHandler.js
+lib/PagePartsHandler.js
+lib/TrickOMatic.js
 structure/pure/_common.js
-structure/pure/audio.js
-structure/pure/break.js
-structure/pure/designtoggle.js
-structure/pure/group.js
-structure/pure/image.js
-structure/pure/imagetrigger.js
-structure/pure/include.js
-structure/pure/info.js
-structure/pure/infotrigger.js
-structure/pure/line.js
-structure/pure/multitrigger.js
-structure/pure/navbar.js
-structure/pure/page.js
-structure/pure/pagejump.js
-structure/pure/pushbutton.js
-structure/pure/refresh.js
-structure/pure/reload.js
-structure/pure/rgb.js
-structure/pure/slide.js
-structure/pure/switch.js
-structure/pure/text.js
-structure/pure/toggle.js
-structure/pure/trigger.js
-structure/pure/unknown.js
-structure/pure/urltrigger.js
-structure/pure/video.js
-structure/pure/web.js
-structure/pure/wgplugin_info.js
-transforms/transform_knx.js
-transforms/transform_default.js
-transforms/transform_oh.js
+structure/pure/Audio.js
+structure/pure/Break.js
+structure/pure/DesignToggle.js
+structure/pure/Group.js
+structure/pure/Image.js
+structure/pure/ImageTrigger.js
+structure/pure/Include.js
+structure/pure/Info.js
+structure/pure/InfoTrigger.js
+structure/pure/Line.js
+structure/pure/MultiTrigger.js
+structure/pure/NavBar.js
+structure/pure/Page.js
+structure/pure/PageJump.js
+structure/pure/PushButton.js
+structure/pure/Refresh.js
+structure/pure/Reload.js
+structure/pure/Rgb.js
+structure/pure/Slide.js
+structure/pure/Switch.js
+structure/pure/Text.js
+structure/pure/Toggle.js
+structure/pure/Trigger.js
+structure/pure/Unknown.js
+structure/pure/UrlTrigger.js
+structure/pure/Video.js
+structure/pure/Web.js
+structure/pure/WgPluginInfo.js
+transforms/TransformKnx.js
+transforms/TransformDefault.js
+transforms/TransformOpenHab.js
 designs/alaska_slim/design_setup.js
 designs/alaska_slim/basic.css
 designs/alaska_slim/colors.css

src/demo/media/demo_2d_backdrop_red_pot.js

@@ -3,14 +3,14 @@ require.config({
   waitSeconds: 30, // default: 7 seconds
   paths: {
     'jquery':            '../../dependencies/jquery',
-    'cometvisu-client':  '../../lib/cometvisu-client',
-    'transform_default': '../../transforms/transform_default',
-    'transform_knx':     '../../transforms/transform_knx'
+    'CometvisuClient':  '../../lib/CometVisuClient',
+    'TransformDefault': '../../transforms/TransformDefault',
+    'TransformKnx':     '../../transforms/TransformKnx'
   }
 });
 
 require([
-  'jquery', 'cometvisu-client', 'transform_default', 'transform_knx'
+  'jquery', 'cometvisu-client', 'TransformDefault', 'TransformKnx'
 ], function( jq, CometVisu ) {
   "use strict";
 

src/designs/design_preview.html

@@ -9,7 +9,7 @@
     <meta name="apple-mobile-web-app-capable" content="yes" /> 
     <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
     <script src="../dependencies/jquery.js" type="text/javascript"></script>
-    <script src="../lib/compatibility.js" type="text/javascript"></script>
+    <script src="../lib/Compatibility.js" type="text/javascript"></script>
   </head>
   <body>
       <div id="demo_container" style="width: 100%; height: 90px;">

src/lib/cometvisu-client.js → src/lib/CometVisuClient.js

@@ -1,4 +1,4 @@
-/* cometvisu-client.js 
+/* CometVisuClient.js 
  * 
  * copyright (c) 2010-2016, Christian Mayer and the CometVisu contributers.
  * 
@@ -16,22 +16,22 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * @module Cometvisu-client 
- * @title  CometVisu Cometvisu-client 
+ * @module CometVisuClient 
+ * @title  CometVisu CometVisuClient 
  */
 
 
 /**
  * The JavaScript library that implements the CometVisu protocol.
  *
- * @title CometVisu Client
- * @exports comentvisu-client
+ * @title CometVisu-Client
+ * @exports ComentVisuVlient
  * @requires jQuery
  * @author Christan Mayer
  * @author Tobias Bräutigam
  * @since 2010
  */
-define( 'cometvisu-client', ['jquery'], function( $ ) {
+define( 'CometvisuClient', ['jquery'], function( $ ) {
   "use strict";
 
   // ////////////////////////////////////////////////////////////////////////

src/lib/compatibility.js → src/lib/Compatibility.js

@@ -1,4 +1,4 @@
-/* compatibility.js 
+/* Compatibility.js 
  * 
  * copyright (c) 2010-2016, Christian Mayer and the CometVisu contributers.
  * 

src/lib/iconhandler.js → src/lib/IconHandler.js

@@ -1,4 +1,4 @@
-/* iconhandler.js 
+/* IconHandler.js 
  * 
  * copyright (c) 2010-2016, Christian Mayer and the CometVisu contributers.
  * 
@@ -16,8 +16,8 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * @module Iconhandler 
- * @title  CometVisu Iconhandler 
+ * @module IconHandler 
+ * @title  CometVisu IconHandler 
  */
 
 

src/lib/icontools.js → src/lib/IconTools.js

@@ -1,4 +1,4 @@
-/* icontools.js 
+/* IconTools.js 
  * 
  * copyright (c) 2010-2016, Christian Mayer and the CometVisu contributers.
  * 
@@ -16,8 +16,8 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * @module Icontools 
- * @title  CometVisu Icontools 
+ * @module IconTools 
+ * @title  CometVisu IconTools 
  */
 
 

src/lib/pagehandler.js → src/lib/PageHandler.js

@@ -1,4 +1,4 @@
-/* pagehandler.js 
+/* PageHandler.js 
  * 
  * copyright (c) 2010-2016, Christian Mayer and the CometVisu contributers.
  * 
@@ -16,8 +16,8 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * @module Pagehandler 
- * @title  CometVisu Pagehandler 
+ * @module PageHandler 
+ * @title  CometVisu PageHandler 
  */
 
 

src/lib/pagepartshandler.js → src/lib/PagePartsHandler.js

@@ -1,4 +1,4 @@
-/* pagepartshandler.js 
+/* PagePartsHandler.js 
  * 
  * copyright (c) 2010-2016, Christian Mayer and the CometVisu contributers.
  * 
@@ -16,8 +16,8 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * @module Pagepartshandler 
- * @title  CometVisu Pagepartshandler 
+ * @module PagePartsHandler 
+ * @title  CometVisu PagePartsHandler 
  */
 
 

src/lib/templateengine.js → src/lib/TemplateEngine.js

@@ -1,4 +1,4 @@
-/* templateengine.js 
+/* TemplateEngine.js 
  * 
  * copyright (c) 2010-2016, Christian Mayer and the CometVisu contributers.
  * 
@@ -16,8 +16,8 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * @module Templateengine 
- * @title  CometVisu Templateengine 
+ * @module TemplateEngine 
+ * @title  CometVisu TemplateEngine 
  */
 
 
@@ -35,10 +35,10 @@
 //  Main:
 //
 define([
-  'jquery', '_common', 'structure_custom', 'trick-o-matic', 'pagehandler', 'pagepartshandler', 
-  'cometvisu-client', 'cometvisu-mockup',
-  'compatibility', 'jquery-ui', 'strftime',
-  'jquery.ui.touch-punch', 'jquery.svg.min', 'iconhandler', 
+  'jquery', '_common', 'structure_custom', 'TrickOMatic', 'PageHandler', 'PagePartsHandler',
+  'CometVisuClient', 'CometVisuMockup',
+  'Compatibility', 'jquery-ui', 'strftime',
+  'jquery.ui.touch-punch', 'jquery.svg.min', 'IconHandler', 
   'widget_break', 'widget_designtoggle',
   'widget_group', 'widget_rgb', 'widget_web', 'widget_image',
   'widget_imagetrigger', 'widget_include', 'widget_info', 'widget_infoaction', 'widget_infotrigger',
@@ -47,7 +47,7 @@ define([
   'widget_switch', 'widget_text', 'widget_toggle', 'widget_trigger', 
   'widget_pushbutton', 'widget_urltrigger', 'widget_unknown', 'widget_audio', 
   'widget_video', 'widget_wgplugin_info', 
-  'transform_default', 'transform_knx', 'transform_oh'
+  'TransformDefault', 'TransformKnx', 'TransformOpenHab'
 ], function( $, design, VisuDesign_Custom, Trick_O_Matic, PageHandler, PagePartsHandler, CometVisu, ClientMockup ) {
   "use strict";
 
@@ -163,7 +163,7 @@ define([
   this.initBackendClient = function() {
     if ($.getUrlVar('testMode')) {
       thisTemplateEngine.visu = new ClientMockup();
-      require(['transform_mockup'], function() {});
+      require(['TransformMockup'], function() {});
     }
     else if (thisTemplateEngine.backend=="oh") {
       thisTemplateEngine.visu = new CometVisu('openhab', this.backendUrl);

src/lib/trick-o-matic.js → src/lib/TrickOMatic.js

@@ -1,4 +1,4 @@
-/* trick-o-matic.js 
+/* TrickOMatic.js 
  * 
  * copyright (c) 2010-2016, Christian Mayer and the CometVisu contributers.
  * 
@@ -16,8 +16,8 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * @module Trick-o-matic 
- * @title  CometVisu Trick-o-matic 
+ * @module TrickOMatic 
+ * @title  CometVisu TrickOMatic 
  */
 
 

src/lib/mockup/transform_knx.js → src/lib/mockup/TransformKnx.js

@@ -1,4 +1,4 @@
-/* transform_knx.js 
+/* TransformKnx.js 
  * 
  * copyright (c) 2010-2016, Christian Mayer and the CometVisu contributers.
  * 
@@ -16,8 +16,8 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * @module Transform_knx 
- * @title  CometVisu Transform_knx 
+ * @module TransformKnx 
+ * @title  CometVisu TransformKnx 
  */
 
 
@@ -27,7 +27,7 @@
  * @author Tobias Bräutigam
  * @since 2016
  */
-define( ['transform_default'], function( Transform ) {
+define( ['TransformDefault'], function(Transform ) {
   "use strict";
 
   Transform.addTransform( 'DPT', {