chore(dependencies): update dmn-js to v0.8.0

related to CAM-6991
camunda · Nov 14, 2016 · bd12055 · bd12055
1 parent 944c746
commit bd12055
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -40,6 +40,8 @@ In those examples, we use uncompiled versions of the library and its dependencie
 #### Available widgets
 
 - `cam-widget-bpmn-viewer`
+- `cam-widget-cmmn-viewer`
+- `cam-widget-dmn-viewer`
 - `cam-widget-debug`
 - `cam-widget-footer`
 - `cam-widget-header`
@@ -49,6 +51,8 @@ In those examples, we use uncompiled versions of the library and its dependencie
 - `cam-widget-search-pill`
 - `cam-widget-variable`
 - `cam-widget-variables-table`
+- `cam-widget-clipboard`
+- `cam-widget-var-template`
 
 #### Developing the widgets
 

diff --git a/lib/widgets/dmn-viewer/cam-widget-dmn-viewer.js b/lib/widgets/dmn-viewer/cam-widget-dmn-viewer.js
@@ -2,7 +2,7 @@
 var fs = require('fs');
 var angular = require('camunda-bpm-sdk-js/vendor/angular');
 var Viewer = require('dmn-js/lib/NavigatedViewer');
-var Modeler = require('dmn-js/lib/table/Modeler');
+var Modeler = require('dmn-js/lib/Modeler');
 var changeDmnNamespace = require('../../util/change-dmn-namespace');
 
 var template = fs.readFileSync(__dirname + '/cam-widget-dmn-viewer.html', 'utf8');
@@ -47,7 +47,7 @@ module.exports = ['$window', function($window) {
       };
 
       $scope.control.highlightRow = function(elementId, className) {
-        var tableViewer = viewer.tableViewer;
+        var tableViewer = viewer.table;
         var elementRegistry = tableViewer.get('elementRegistry');
 
         tableViewer.get('eventBus').on('row.render', function(event) {
@@ -134,6 +134,12 @@ module.exports = ['$window', function($window) {
         });
       });
 
+      viewer.on('view.switch', function(e) {
+        $scope.$apply(function() {
+          $scope.isDrd = e.fromTable;
+        });
+      });
+
       $scope.zoomIn = function() {
         viewer.get('zoomScroll').zoom(1, {
           x: $element[0].offsetWidth / 2,

diff --git a/lib/widgets/dmn-viewer/cam-widget-dmn-viewer.less b/lib/widgets/dmn-viewer/cam-widget-dmn-viewer.less
@@ -1,12 +1,17 @@
 @import "dmn-js/styles/dmn-js";
+// @import (inline) "dmn-js/node_modules/diagram-js/assets/diagram-js.css";
 
 [cam-widget-dmn-viewer] {
   .table-holder {
     width: 100%;
     overflow: visible;
   }
 
-  .dmn-js-powered-by {
+  .dmn-definitions {
+    display: none;
+  }
+
+  .dmn-js-powered-by, .bjs-powered-by {
     display: none !important;
   }
 

diff --git a/lib/widgets/dmn-viewer/test/cam-widget-dmn-viewer.spec.html b/lib/widgets/dmn-viewer/test/cam-widget-dmn-viewer.spec.html
@@ -192,8 +192,6 @@ <h3>DRD Viewer Example</h3>
         <div class="test-container"
              style="max-height: 450px;">
           <div cam-widget-dmn-viewer
-               width="800"
-               height="400"
                xml="drdXML"
                control="control">
           </div>
@@ -217,8 +215,6 @@ <h3>DRD Viewer Single Table Example</h3>
         <div class="test-container"
              style="max-height: 450px;">
           <div cam-widget-dmn-viewer
-               width="800"
-               height="400"
                xml="drdXML"
                table="season"
                control="control">
@@ -227,6 +223,30 @@ <h3>DRD Viewer Single Table Example</h3>
 
       </div><!-- /.widget-example -->
 
+      <div class="widget-example"
+           id="example-6"
+           ng-controller="testController">
+        <h3>DRD Viewer With Navigation</h3>
+        <pre ng-non-bindable>
+&lt;!--
+$scope.drdXML = /* dmn xml string */;
+$scope.control = {};
+--&gt;
+&lt;div cam-widget-dmn-viewer
+     xml="drdXML"
+     enableDrdNavigation="true"
+     control="control"&gt;&lt;/div&gt;</pre>
+        <div class="test-container"
+             style="max-height: 450px;">
+          <div cam-widget-dmn-viewer
+               xml="drdXML"
+               enable-drd-navigation="true"
+               control="control">
+          </div>
+        </div>
+
+      </div><!-- /.widget-example -->
+
     </section>
 
 

diff --git a/package.json b/package.json
@@ -48,7 +48,7 @@
     "camunda-bpm-sdk-js": "git://github.com/camunda/camunda-bpm-sdk-js#master",
     "clipboard": "1.5.10",
     "cmmn-js": "0.5.3",
-    "dmn-js": "0.7.0",
+    "dmn-js": "0.8.0",
     "jquery": "2.1.1",
     "lodash": "2.4.1",
     "mkdirp": "0.5.1",