Spring/spring-flo
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update joint and other libs

Browse Source 
Update joint and other libs

Update joint and other libs

Update joint and other libs

Update joint and other libs

Update joint and other libs

Update joint and other libs

Update joint and other libs

Update joint and other libs

Update joint and other libs

Update joint and other libs

Update joint and other libs
This commit is contained in:
BoykoAlex
2017-03-26 23:06:06 -04:00
parent 0b2f3d05c4
commit 6e3dabc150
16 changed files with 505 additions and 336 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
bower.json
View File

@@ -6,13 +6,11 @@
"dist/spring-flo.js"
],
"dependencies": {
"requirejs": "2.1.15",
"requirejs": "2.1.22",
"angular": "1.3.5",
"jquery": "2.2.0",
"bootstrap": "3.3.4",
"backbone": "1.2.1",
"joint": "0.9.6",
"lodash": "2.4.2",
"backbone": "1.3.3",
"joint": "1.0.3",
"codemirror": "5.18.2",
"jshint": "2.6.3"
},
@@ -22,10 +20,6 @@
"dagre": "0.7.4",
"requirejs-text": "2.0.14"
},
"resolutions": {
"lodash": "2.4.2",
"jquery": "2.2.0"
},
"authors": [
"Andy Clement <aclement@pivotal.io>",
"Alex Boyko <aboyko@pivotal.io"

4
css/flo.css
View File

@@ -346,12 +346,12 @@
outline: none;
}
.element.highlighted rect {
.joint-element.highlighted rect {
stroke: #34302d;
stroke-width: 3;
}
.handle {
.joint-type-handle {
cursor: pointer;
}

356
dist/spring-flo.css vendored
View File

File diff suppressed because one or more lines are too long

203
dist/spring-flo.js vendored
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
define('directives/resizer',[],function () {
'use strict';
return ['$document', function($document) {
@@ -114,7 +114,7 @@ define('directives/resizer',[],function () {
else // Plain browser env
(this || window).CodeMirror = mod();
})(function() {
"use strict";
// BROWSER SNIFFING
@@ -9072,7 +9072,7 @@ define('codemirror', ['codemirror/lib/codemirror'], function (main) { return mai
else // Plain browser env
mod(CodeMirror);
})(function(CodeMirror) {
"use strict";
var GUTTER_ID = "CodeMirror-lint-markers";
function showTooltip(e, content) {
@@ -9312,7 +9312,7 @@ define('codemirror', ['codemirror/lib/codemirror'], function (main) { return mai
else // Plain browser env
mod(CodeMirror);
})(function(CodeMirror) {
"use strict";
var HINT_ELEMENT_CLASS = "CodeMirror-hint";
var ACTIVE_HINT_ELEMENT_CLASS = "CodeMirror-hint-active";
@@ -9814,7 +9814,7 @@ define('codemirror', ['codemirror/lib/codemirror'], function (main) { return mai
else // Plain browser env
mod(CodeMirror);
})(function(CodeMirror) {
"use strict";
CodeMirror.defineExtension("annotateScrollbar", function(options) {
if (typeof options == "string") options = {className: options};
@@ -9933,7 +9933,7 @@ define('codemirror', ['codemirror/lib/codemirror'], function (main) { return mai
else // Plain browser env
mod(CodeMirror);
})(function(CodeMirror) {
"use strict";
function Bar(cls, orientation, scroll) {
this.orientation = orientation;
@@ -10093,7 +10093,7 @@ define('codemirror', ['codemirror/lib/codemirror'], function (main) { return mai
define('controllers/dsl-editor',['require','angular','codemirror','codemirror/addon/lint/lint','codemirror/addon/hint/show-hint','codemirror/addon/display/placeholder','codemirror/addon/scroll/annotatescrollbar','codemirror/addon/scroll/simplescrollbars'],function (require) {
'use strict';
var angular = require('angular');
@@ -10277,7 +10277,7 @@ define('controllers/dsl-editor',['require','angular','codemirror','codemirror/ad
});
/*
* Copyright 2016 the original author or authors.
* Copyright 2016-2017 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -10292,7 +10292,7 @@ define('controllers/dsl-editor',['require','angular','codemirror','codemirror/ad
* limitations under the License.
*/
define('directives/dsl-editor',['controllers/dsl-editor'],function () {
'use strict';
return ['$interpolate', function ($interpolate) {
return {
@@ -10312,7 +10312,7 @@ define('directives/dsl-editor',['controllers/dsl-editor'],function () {
if (attrs.overviewRuler) {
scope.overviewRuler = $interpolate(attrs.overviewRuler)(scope);
}
scope.init(element.context);
scope.init(element[0]);
}
};
}];
@@ -10328,7 +10328,7 @@ define('directives/dsl-editor',['controllers/dsl-editor'],function () {
else // Plain browser env
mod(CodeMirror);
})(function(CodeMirror) {
"use strict";
CodeMirror.modeInfo = [
{name: "APL", mime: "text/apl", mode: "apl", ext: ["dyalog", "apl"]},
@@ -10921,7 +10921,7 @@ define('directives/dsl-editor',['controllers/dsl-editor'],function () {
else // Plain browser env
mod(CodeMirror);
})(function(CodeMirror) {
"use strict";
CodeMirror.defineMode("groovy", function(config) {
function words(str) {
@@ -11152,7 +11152,7 @@ CodeMirror.defineMIME("text/x-groovy", "groovy");
else // Plain browser env
mod(CodeMirror);
})(function(CodeMirror) {
"use strict";
function expressionAllowed(stream, state, backUp) {
return /^(?:operator|sof|keyword c|case|new|[\[{}\(,;:]|=>)$/.test(state.lastType) ||
@@ -11915,7 +11915,7 @@ CodeMirror.defineMIME("application/typescript", { name: "javascript", typescript
else // Plain browser env
mod(CodeMirror);
})(function(CodeMirror) {
"use strict";
function wordRegexp(words) {
return new RegExp("^((" + words.join(")|(") + "))\\b");
@@ -12256,7 +12256,7 @@ CodeMirror.defineMIME("application/typescript", { name: "javascript", typescript
else // Plain browser env
mod(CodeMirror);
})(function(CodeMirror) {
"use strict";
CodeMirror.defineMode("ruby", function(config) {
function wordObj(words) {
@@ -12542,7 +12542,7 @@ CodeMirror.defineMIME("text/x-ruby", "ruby");
else // Plain browser env
mod(CodeMirror);
})(function(CodeMirror) {
"use strict";
function Context(indented, column, type, info, align, prev) {
this.indented = indented;
@@ -18011,7 +18011,7 @@ exports.Lexer = Lexer;
exports.Context = Context;
},{"../data/ascii-identifier-data.js":1,"../data/non-ascii-identifier-part-only.js":2,"../data/non-ascii-identifier-start.js":3,"./reg.js":17,"./state.js":18,"events":5,"underscore":12}],14:[function(require,module,exports){
"use strict";
var _ = require("underscore");
@@ -18244,7 +18244,7 @@ _.each(info, function(desc, code) {
});
},{"underscore":12}],15:[function(require,module,exports){
"use strict";
function NameStack() {
this._stack = [];
@@ -18320,7 +18320,7 @@ NameStack.prototype.infer = function() {
module.exports = NameStack;
},{}],16:[function(require,module,exports){
"use strict";
// These are the JSHint boolean options.
exports.bool = {
@@ -19309,7 +19309,7 @@ exports.fallsThrough = /^\s*\/\*\s*falls?\sthrough\s*\*\/\s*$/;
exports.maxlenException = /^(?:(?:\/\/|\/\*|\*) ?)?[^ ]+$/;
},{}],18:[function(require,module,exports){
"use strict";
var NameStack = require("./name-stack.js");
var state = {
@@ -19342,7 +19342,7 @@ var state = {
exports.state = state;
},{"./name-stack.js":15}],19:[function(require,module,exports){
"use strict";
exports.register = function(linter) {
// Check for properties named __proto__. This special property was
@@ -20255,7 +20255,7 @@ var console = require("console-browserify");
// the JSHINT function itself.
var JSHINT = (function() {
"use strict";
var api, // Extension API
@@ -25772,7 +25772,7 @@ define("jshint", ["lodash"], function(){});
else // Plain browser env
mod(CodeMirror);
})(function(CodeMirror) {
"use strict";
// declare global: JSHINT
var bogus = [ "Dangerous comment" ];
@@ -25927,7 +25927,7 @@ define("jshint", ["lodash"], function(){});
* errors/warnings.
*/
define('controllers/code-editor',['require','angular','codemirror','codemirror/mode/meta','codemirror/addon/lint/lint','codemirror/addon/hint/show-hint','codemirror/addon/mode/loadmode','codemirror/addon/edit/matchbrackets','codemirror/addon/edit/closebrackets','codemirror/addon/display/placeholder','codemirror/addon/scroll/annotatescrollbar','codemirror/addon/scroll/simplescrollbars','codemirror/mode/groovy/groovy','codemirror/mode/javascript/javascript','codemirror/mode/python/python','codemirror/mode/ruby/ruby','codemirror/mode/clike/clike','jshint','codemirror/addon/lint/javascript-lint'],function (require) {
'use strict';
return ['$scope', function ($scope) {
@@ -26085,7 +26085,7 @@ define('controllers/code-editor',['require','angular','codemirror','codemirror/m
}];
});
/*
* Copyright 2016 the original author or authors.
* Copyright 2016-2017 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -26100,14 +26100,14 @@ define('controllers/code-editor',['require','angular','codemirror','codemirror/m
* limitations under the License.
*/
define('directives/code-editor',['controllers/code-editor'],function () {
'use strict';
return [function () {
return {
restrict: 'A',
controller: require('controllers/code-editor'),
link: function(scope, element, attrs) {
scope.init(element.context, attrs);
scope.init(element[0], attrs);
},
scope: {
language: '=codeLanguage',
@@ -26142,7 +26142,7 @@ define('directives/code-editor',['controllers/code-editor'],function () {
* functions to create them.
*/
define('common/shapes-factory',['joint', 'underscore'],function(joint, _) {
'use strict';
var isChrome = !!window.chrome;
var isFF = typeof InstallTrigger !== 'undefined';
@@ -26749,7 +26749,7 @@ define('common/shapes-factory',['joint', 'underscore'],function(joint, _) {
*/
define('controllers/palette',['require','jquery','joint','common/shapes-factory','angular'],function(require) {
'use strict';
var $ = require('jquery');
var joint = require('joint');
@@ -27269,7 +27269,7 @@ define('controllers/palette',['require','jquery','joint','common/shapes-factory'
});
/*
* Copyright 2016 the original author or authors.
* Copyright 2016-2017 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -27284,7 +27284,7 @@ define('controllers/palette',['require','jquery','joint','common/shapes-factory'
* limitations under the License.
*/
define('directives/palette',['controllers/palette'],function () {
'use strict';
return [function () {
@@ -27295,7 +27295,7 @@ define('directives/palette',['controllers/palette'],function () {
if (attrs.metamodelServiceName) {
scope.metamodelServiceName = attrs.metamodelServiceName;
}
scope.init(element.context, attrs);
scope.init(element[0], attrs);
},
controller: require('controllers/palette'),
controllerAs: 'floPalette',
@@ -27334,7 +27334,7 @@ define('directives/palette',['controllers/palette'],function () {
* 'change' - something changed!
*/
define('common/properties-manager',['require','underscore','codemirror','codemirror/addon/mode/loadmode','codemirror/addon/edit/matchbrackets','codemirror/addon/edit/closebrackets','codemirror/mode/groovy/groovy','codemirror/mode/javascript/javascript','codemirror/mode/python/python','codemirror/mode/clike/clike'],function(require) {
'use strict';
var _ = require('underscore');
@@ -28126,7 +28126,7 @@ define('common/properties-manager',['require','underscore','codemirror','codemir
*/
define('common/event-manager',[],function() {
'use strict';
return function() {
@@ -28170,7 +28170,7 @@ define('common/event-manager',[],function() {
});
/*
* Copyright 2016 the original author or authors.
* Copyright 2016-2017 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -28193,7 +28193,7 @@ define('common/event-manager',[],function() {
* Note: controller contains some DOM manipulation logic that will be moved to the corresponding directive link function
*/
define('controllers/graph-editor',['require','angular','joint','jquery','common/shapes-factory','common/properties-manager','common/event-manager'],function(require) {
'use strict';
var isChrome = !!window.chrome;
var isFF = typeof InstallTrigger !== 'undefined';
@@ -28804,7 +28804,10 @@ define('controllers/graph-editor',['require','angular','joint','jquery','common/
function gridSize(size) {
if (size) {
if (!isNaN(size) && size >= 1) {
_gridSize = size;
_gridSize = size;
if (paper) {
paper.setGridSize(size);
}
}
}
return _gridSize;
@@ -29540,39 +29543,39 @@ define('controllers/graph-editor',['require','angular','joint','jquery','common/
graph.on('add remove change:source change:target change:vertices change:position', routingCall);
}
function getGridBackgroundImage(gridX, gridY) {
var canvas = document.createElement('canvas');
canvas.width = gridX * 10;
canvas.height = gridY * 10;
if (gridX > 5 && gridY > 5) {
var context = canvas.getContext('2d');
context.beginPath();
var ox = paper.options.origin.x;
var oy = paper.options.origin.y;
var startX = ox >= 0 ? ((ox * 100) % (gridX * 100)) / 100 : ((gridX * 100) + (ox * 100) % (gridX * 100) - 1 * 100) / 100;
var startY = oy >= 0 ? ((oy * 100) % (gridY * 100)) / 100 : ((gridY * 100) + (oy * 100) % (gridY * 100) - 1 * 100) / 100;
for (var i = 0; i < 10; i++) {
for (var j = 0; j < 10; j++) {
context.rect(startX + gridX * i, startY + gridY * j, 1, 1);
}
}
context.fillStyle = 'black';
context.fill();
}
return canvas.toDataURL('image/png');
}
// function getGridBackgroundImage(gridX, gridY) {
// var canvas = document.createElement('canvas');
// canvas.width = gridX * 10;
// canvas.height = gridY * 10;
//
// if (gridX > 5 && gridY > 5) {
//
// var context = canvas.getContext('2d');
// context.beginPath();
//
// var ox = paper.options.origin.x;
// var oy = paper.options.origin.y;
//
// var startX = ox >= 0 ? ((ox * 100) % (gridX * 100)) / 100 : ((gridX * 100) + (ox * 100) % (gridX * 100) - 1 * 100) / 100;
// var startY = oy >= 0 ? ((oy * 100) % (gridY * 100)) / 100 : ((gridY * 100) + (oy * 100) % (gridY * 100) - 1 * 100) / 100;
//
// for (var i = 0; i < 10; i++) {
// for (var j = 0; j < 10; j++) {
// context.rect(startX + gridX * i, startY + gridY * j, 1, 1);
// }
// }
//
// context.fillStyle = 'black';
// context.fill();
// }
//
// return canvas.toDataURL('image/png');
// }
function refreshGridVisuals() {
var scale = joint.V(paper.viewport).scale(); // jshint ignore:line
$(paper.svg).css('background-image', 'url("' + getGridBackgroundImage(paper.options.gridSize * scale.sx, paper.options.gridSize * scale.sy) + '")');
}
// function refreshGridVisuals() {
// var scale = joint.V(paper.viewport).scale(); // jshint ignore:line
// $(paper.svg).css('background-image', 'url("' + getGridBackgroundImage(paper.options.gridSize * scale.sx, paper.options.gridSize * scale.sy) + '")');
// }
function _isCustomEvent(args) {
return args.length === 5 &&
@@ -29604,14 +29607,14 @@ define('controllers/graph-editor',['require','angular','joint','jquery','common/
autosizePaper();
});
paper.on({
scale: function(sx, sy) { // jshint ignore:line
refreshGridVisuals();
},
translate: function(ox, oy) { // jshint ignore:line
refreshGridVisuals();
}
});
// paper.on({
// scale: function(sx, sy) { // jshint ignore:line
// refreshGridVisuals();
// },
// translate: function(ox, oy) { // jshint ignore:line
// refreshGridVisuals();
// }
// });
paper.on('all', function() {
if (_isCustomEvent(arguments)) {
@@ -29629,7 +29632,8 @@ define('controllers/graph-editor',['require','angular','joint','jquery','common/
// The paper is what will represent the graph on the screen
paper = new PaperExtended({ // http://www.jointjs.com/api#joint.dia.Paper
el: $('#paper', domContext),
gridSize: gridSize(),
gridSize: _gridSize,
drawGrid: true,
model: graph,
elementView: renderService && angular.isFunction(renderService.getNodeView) ? renderService.getNodeView() : mainElementView,
linkView: renderService && angular.isFunction(renderService.getLinkView) ? renderService.getLinkView() : joint.dia.LinkView,
@@ -29662,18 +29666,27 @@ define('controllers/graph-editor',['require','angular','joint','jquery','common/
}
},
highlighting: editorService && angular.isObject(editorService.highlighting) ? editorService.highlighting : {
'default': {
name: 'addClass',
options: {
className: 'highlighted'
}
}
},
linkConnectionPoint: renderService && angular.isFunction(renderService.getLinkAnchorPoint) ? renderService.getLinkAnchorPoint : undefined,
markAvailable: true
markAvailable: true,
});
refreshGridVisuals();
// refreshGridVisuals();
$scope.$watch(function() {
return $scope.flo.gridSize();
}, function(newValue) {
paper.options.gridSize = newValue;
refreshGridVisuals();
});
// $scope.$watch(function() {
// return $scope.flo.gridSize();
// }, function(newValue) {
// paper.options.gridSize = newValue;
// refreshGridVisuals();
// });
// Watch for palette presence model variable changes
$scope.$watch(function() {
@@ -29836,7 +29849,7 @@ define('controllers/graph-editor',['require','angular','joint','jquery','common/
});
/*
* Copyright 2016 the original author or authors.
* Copyright 2016-2017 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -29851,7 +29864,7 @@ define('controllers/graph-editor',['require','angular','joint','jquery','common/
* limitations under the License.
*/
define('directives/graph-editor',['controllers/graph-editor'],function () {
'use strict';
return [function () {
@@ -29878,7 +29891,7 @@ define('directives/graph-editor',['controllers/graph-editor'],function () {
scope.paperPadding = Number(attrs.paperPadding);
}
scope.init(element.context, attrs);
scope.init(element[0], attrs);
element.find('#paper').bind('keydown', function(e) {
if (e.which === 8 || e.which === 46) {
if (!scope.flo.readOnly() /*&& scope.flo.getSelection()*/) {
@@ -29925,7 +29938,7 @@ define('directives/graph-editor',['controllers/graph-editor'],function () {
}];
});
/*
* Copyright 2016 the original author or authors.
* Copyright 2016-2017 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -29940,7 +29953,7 @@ define('directives/graph-editor',['controllers/graph-editor'],function () {
* limitations under the License.
*/
define('directives/generic-dsl-editor',['underscore','angular','codemirror','codemirror/addon/lint/lint','codemirror/addon/hint/show-hint','codemirror/addon/display/placeholder','codemirror/addon/scroll/annotatescrollbar','codemirror/addon/scroll/simplescrollbars'],function () {
'use strict';
var _ = require('underscore');
var angular = require('angular');
@@ -29996,7 +30009,7 @@ define('directives/generic-dsl-editor',['underscore','angular','codemirror','cod
options.hintOptions = scope.hint;
}
doc = CodeMirror.fromTextArea(element.context, options);
doc = CodeMirror.fromTextArea(element[0], options);
// CodeMirror would set 'placeholder` value at construction time based on the string value of placeholder attribute in the DOM
// Thus, set the correct placeholder value in case value is angular expression.
@@ -30053,7 +30066,7 @@ define('directives/generic-dsl-editor',['underscore','angular','codemirror','cod
* @author Alex Boyko
*/
define('floDirectives',['require','angular','directives/resizer','directives/dsl-editor','directives/code-editor','directives/palette','directives/graph-editor','directives/generic-dsl-editor'],function(require) {
'use strict';
var angular = require('angular');
@@ -30089,7 +30102,7 @@ define('floDirectives',['require','angular','directives/resizer','directives/dsl
* @author Alex Boyko
*/
define('floServices',['angular'], function (angular) {
'use strict';
return angular.module('flo.services', [])
.factory('MetamodelUtils', ['$q', function ($q) {
@@ -30190,7 +30203,7 @@ define('floServices',['angular'], function (angular) {
* @author Alex Boyko
*/
define('flo', ['require','angular','floDirectives','floServices'],function(require) {
'use strict';
require('angular');
require('floDirectives');

4
dist/spring-flo.min.css vendored
View File

File diff suppressed because one or more lines are too long

18
dist/spring-flo.min.js vendored
View File

File diff suppressed because one or more lines are too long

99
package.json
View File

@@ -9,66 +9,63 @@
"url": "http://github.com/spring-projects/spring-flo.git"
},
"dependencies": {
"requirejs": "2.1.15",
"requirejs": "2.1.22",
"angular": "1.3.5",
"jquery": "2.2.0",
"bootstrap": "3.3.4",
"backbone": "1.2.1",
"jointjs": "0.9.7",
"lodash": "2.4.2",
"backbone": "1.3.3",
"jointjs": "1.0.3",
"codemirror": "5.18.2",
"jshint": "2.6.3"
},
"devDependencies": {
"bower": "1.3.12",
"grunt": "0.4.5",
"grunt-autoprefixer": "1.0.0",
"bower": "1.8.0",
"grunt": "1.0.1",
"grunt-autoprefixer": "3.0.4",
"grunt-bower-task": "0.4.0",
"grunt-cli": "0.1.13",
"grunt-concurrent": "1.0.0",
"grunt-contrib-clean": "^0.6.0",
"grunt-contrib-concat": "0.5.0",
"grunt-contrib-connect": "0.9.0",
"grunt-contrib-copy": "^0.7.0",
"grunt-contrib-cssmin": "0.10.0",
"grunt-contrib-htmlmin": "0.3.0",
"grunt-contrib-imagemin": "0.9.2",
"grunt-contrib-jshint": "0.11.2",
"grunt-contrib-less": "0.12.0",
"grunt-contrib-nodeunit": "0.4.1",
"grunt-contrib-requirejs": "0.4.4",
"grunt-contrib-uglify": "0.6.0",
"grunt-contrib-watch": "0.6.1",
"load-grunt-tasks": "3.1.0",
"time-grunt": "1.1.1",
"grunt-karma": "0.9.0",
"grunt-newer": "0.8.0",
"grunt-ngmin": "0.0.3",
"grunt-protractor-runner": "^1.2.1",
"grunt-cli": "1.2.0",
"grunt-concurrent": "2.3.1",
"grunt-contrib-clean": "1.0.0",
"grunt-contrib-concat": "1.0.1",
"grunt-contrib-connect": "1.0.2",
"grunt-contrib-copy": "1.0.0",
"grunt-contrib-cssmin": "2.0.0",
"grunt-contrib-htmlmin": "2.3.0",
"grunt-contrib-imagemin": "1.0.1",
"grunt-contrib-jshint": "1.1.0",
"grunt-contrib-less": "1.4.1",
"grunt-contrib-nodeunit": "1.0.0",
"grunt-contrib-requirejs": "1.0.0",
"grunt-contrib-uglify": "2.2.0",
"grunt-contrib-watch": "1.0.0",
"load-grunt-tasks": "3.5.2",
"time-grunt": "1.4.0",
"grunt-karma": "2.0.0",
"grunt-newer": "1.2.0",
"grunt-ng-annotate": "3.0.0",
"grunt-protractor-runner": "5.0.0",
"grunt-rev": "0.1.0",
"grunt-usemin": "2.6.2",
"jasmine-reporters": "^2.0.5",
"jshint-stylish": "1.0.1",
"karma": "0.12.28",
"karma-chrome-launcher": "0.1.6",
"karma-coffee-preprocessor": "0.2.1",
"karma-firefox-launcher": "0.1.3",
"karma-html2js-preprocessor": "0.1.0",
"karma-jasmine": "0.3.5",
"karma-jasmine-html-reporter": "^0.1.6",
"karma-junit-reporter": "^0.2.2",
"karma-ng-html2js-preprocessor": "0.1.2",
"karma-phantomjs-launcher": "1.0.2",
"karma-requirejs": "0.2.2",
"karma-safari-launcher": "0.1.1",
"karma-script-launcher": "0.1.0",
"load-grunt-tasks": "1.0.0",
"phantomjs": "2.1.7",
"protractor": "1.6.0",
"requirejs": "2.1.15",
"time-grunt": "1.0.0"
"grunt-usemin": "3.1.1",
"jasmine-reporters": "2.2.1",
"jshint-stylish": "2.2.1",
"karma": "1.5.0",
"karma-chrome-launcher": "2.0.0",
"karma-coffee-preprocessor": "1.0.1",
"karma-firefox-launcher": "1.0.1",
"karma-html2js-preprocessor": "1.1.0",
"karma-jasmine": "1.1.0",
"karma-jasmine-html-reporter": "0.2.2",
"karma-junit-reporter": "1.2.0",
"karma-ng-html2js-preprocessor": "1.0.0",
"karma-phantomjs-launcher": "1.0.4",
"karma-requirejs": "1.1.0",
"karma-safari-launcher": "1.0.0",
"karma-script-launcher": "1.0.0",
"phantomjs-prebuilt": "2.1.14",
"protractor": "5.1.1",
"requirejs": "2.1.22",
"time-grunt": "1.4.0"
},
"engines": {
"node": ">=0.10.0"
"node": ">=6.0.0"
}
}

4
pom.xml
View File

@@ -41,8 +41,8 @@
<goal>install-node-and-npm</goal>
</goals>
<configuration>
<nodeVersion>v0.12.2</nodeVersion>
<npmVersion>2.9.1</npmVersion>
<nodeVersion>v6.10.1</nodeVersion>
<npmVersion>4.4.4</npmVersion>
</configuration>
</execution>
<execution>

115
src/controllers/graph-editor.js
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2016 the original author or authors.
* Copyright 2016-2017 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -633,7 +633,10 @@ define(function(require) {
function gridSize(size) {
if (size) {
if (!isNaN(size) && size >= 1) {
_gridSize = size;
_gridSize = size;
if (paper) {
paper.setGridSize(size);
}
}
}
return _gridSize;
@@ -1369,39 +1372,39 @@ define(function(require) {
graph.on('add remove change:source change:target change:vertices change:position', routingCall);
}
function getGridBackgroundImage(gridX, gridY) {
var canvas = document.createElement('canvas');
canvas.width = gridX * 10;
canvas.height = gridY * 10;
if (gridX > 5 && gridY > 5) {
var context = canvas.getContext('2d');
context.beginPath();
var ox = paper.options.origin.x;
var oy = paper.options.origin.y;
var startX = ox >= 0 ? ((ox * 100) % (gridX * 100)) / 100 : ((gridX * 100) + (ox * 100) % (gridX * 100) - 1 * 100) / 100;
var startY = oy >= 0 ? ((oy * 100) % (gridY * 100)) / 100 : ((gridY * 100) + (oy * 100) % (gridY * 100) - 1 * 100) / 100;
for (var i = 0; i < 10; i++) {
for (var j = 0; j < 10; j++) {
context.rect(startX + gridX * i, startY + gridY * j, 1, 1);
}
}
context.fillStyle = 'black';
context.fill();
}
return canvas.toDataURL('image/png');
}
// function getGridBackgroundImage(gridX, gridY) {
// var canvas = document.createElement('canvas');
// canvas.width = gridX * 10;
// canvas.height = gridY * 10;
//
// if (gridX > 5 && gridY > 5) {
//
// var context = canvas.getContext('2d');
// context.beginPath();
//
// var ox = paper.options.origin.x;
// var oy = paper.options.origin.y;
//
// var startX = ox >= 0 ? ((ox * 100) % (gridX * 100)) / 100 : ((gridX * 100) + (ox * 100) % (gridX * 100) - 1 * 100) / 100;
// var startY = oy >= 0 ? ((oy * 100) % (gridY * 100)) / 100 : ((gridY * 100) + (oy * 100) % (gridY * 100) - 1 * 100) / 100;
//
// for (var i = 0; i < 10; i++) {
// for (var j = 0; j < 10; j++) {
// context.rect(startX + gridX * i, startY + gridY * j, 1, 1);
// }
// }
//
// context.fillStyle = 'black';
// context.fill();
// }
//
// return canvas.toDataURL('image/png');
// }
function refreshGridVisuals() {
var scale = joint.V(paper.viewport).scale(); // jshint ignore:line
$(paper.svg).css('background-image', 'url("' + getGridBackgroundImage(paper.options.gridSize * scale.sx, paper.options.gridSize * scale.sy) + '")');
}
// function refreshGridVisuals() {
// var scale = joint.V(paper.viewport).scale(); // jshint ignore:line
// $(paper.svg).css('background-image', 'url("' + getGridBackgroundImage(paper.options.gridSize * scale.sx, paper.options.gridSize * scale.sy) + '")');
// }
function _isCustomEvent(args) {
return args.length === 5 &&
@@ -1433,14 +1436,14 @@ define(function(require) {
autosizePaper();
});
paper.on({
scale: function(sx, sy) { // jshint ignore:line
refreshGridVisuals();
},
translate: function(ox, oy) { // jshint ignore:line
refreshGridVisuals();
}
});
// paper.on({
// scale: function(sx, sy) { // jshint ignore:line
// refreshGridVisuals();
// },
// translate: function(ox, oy) { // jshint ignore:line
// refreshGridVisuals();
// }
// });
paper.on('all', function() {
if (_isCustomEvent(arguments)) {
@@ -1458,7 +1461,8 @@ define(function(require) {
// The paper is what will represent the graph on the screen
paper = new PaperExtended({ // http://www.jointjs.com/api#joint.dia.Paper
el: $('#paper', domContext),
gridSize: gridSize(),
gridSize: _gridSize,
drawGrid: true,
model: graph,
elementView: renderService && angular.isFunction(renderService.getNodeView) ? renderService.getNodeView() : mainElementView,
linkView: renderService && angular.isFunction(renderService.getLinkView) ? renderService.getLinkView() : joint.dia.LinkView,
@@ -1491,18 +1495,27 @@ define(function(require) {
}
},
highlighting: editorService && angular.isObject(editorService.highlighting) ? editorService.highlighting : {
'default': {
name: 'addClass',
options: {
className: 'highlighted'
}
}
},
linkConnectionPoint: renderService && angular.isFunction(renderService.getLinkAnchorPoint) ? renderService.getLinkAnchorPoint : undefined,
markAvailable: true
markAvailable: true,
});
refreshGridVisuals();
// refreshGridVisuals();
$scope.$watch(function() {
return $scope.flo.gridSize();
}, function(newValue) {
paper.options.gridSize = newValue;
refreshGridVisuals();
});
// $scope.$watch(function() {
// return $scope.flo.gridSize();
// }, function(newValue) {
// paper.options.gridSize = newValue;
// refreshGridVisuals();
// });
// Watch for palette presence model variable changes
$scope.$watch(function() {

4
src/directives/code-editor.js
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2016 the original author or authors.
* Copyright 2016-2017 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@ define(function () {
restrict: 'A',
controller: require('controllers/code-editor'),
link: function(scope, element, attrs) {
scope.init(element.context, attrs);
scope.init(element[0], attrs);
},
scope: {
language: '=codeLanguage',

4
src/directives/dsl-editor.js
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2016 the original author or authors.
* Copyright 2016-2017 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -34,7 +34,7 @@ define(function () {
if (attrs.overviewRuler) {
scope.overviewRuler = $interpolate(attrs.overviewRuler)(scope);
}
scope.init(element.context);
scope.init(element[0]);
}
};
}];

4
src/directives/generic-dsl-editor.js
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2016 the original author or authors.
* Copyright 2016-2017 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -70,7 +70,7 @@ define(function () {
options.hintOptions = scope.hint;
}
doc = CodeMirror.fromTextArea(element.context, options);
doc = CodeMirror.fromTextArea(element[0], options);
// CodeMirror would set 'placeholder` value at construction time based on the string value of placeholder attribute in the DOM
// Thus, set the correct placeholder value in case value is angular expression.

4
src/directives/graph-editor.js
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2016 the original author or authors.
* Copyright 2016-2017 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -41,7 +41,7 @@ define(function () {
scope.paperPadding = Number(attrs.paperPadding);
}
scope.init(element.context, attrs);
scope.init(element[0], attrs);
element.find('#paper').bind('keydown', function(e) {
if (e.which === 8 || e.which === 46) {
if (!scope.flo.readOnly() /*&& scope.flo.getSelection()*/) {

4
src/directives/palette.js
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2016 the original author or authors.
* Copyright 2016-2017 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -25,7 +25,7 @@ define(function () {
if (attrs.metamodelServiceName) {
scope.metamodelServiceName = attrs.metamodelServiceName;
}
scope.init(element.context, attrs);
scope.init(element[0], attrs);
},
controller: require('controllers/palette'),
controllerAs: 'floPalette',

4
src/main.js
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2016 the original author or authors.
* Copyright 2016-2017 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@ requirejs.config({
angular: '../lib/angular/angular',
jquery: '../lib/jquery/jquery',
bootstrap: '../lib/bootstrap/bootstrap',
lodash: '../lib/lodash/lodash.compat',
lodash: '../lib/lodash/lodash',
jshint: '../lib/jshint/dist/jshint',
floDirectives: './directives',
floServices: './services'

2
tests/karma-test-main.js
View File

@@ -13,7 +13,7 @@ requirejs.config({
angular: '/base/lib/angular/angular',
jquery: '/base/lib/jquery/jquery',
bootstrap: '/base/lib/bootstrap/bootstrap',
lodash: '/base/lib/lodash/lodash.compat',
lodash: '/base/lib/lodash/lodash',
dagre: '/base/lib/dagre/dagre.core.min',
graphlib: '/base/lib/graphlib/graphlib.core',
angularMocks: '/base/lib/angular-mocks/angular-mocks',