zhouxy108/wisemapping-open-source
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove chk, all must be $defined.

Browse Source
This commit is contained in:
Paulo Veiga
2011-07-28 13:06:15 -03:00
parent d4fefed545
commit 899bf85545
10 changed files with 49 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
mindplot/src/main/javascript/BubbleTip.js
View File

@@ -29,7 +29,7 @@ mindplot.BubbleTip = new Class({
height:null,
form:null
};
if ($chk(this.options.form))
if ($defined(this.options.form))
this.scanElements(this.options.form);
this.buildBubble();
this._isMouseOver = false;
@@ -46,14 +46,14 @@ mindplot.BubbleTip = new Class({
var opts = this.options;
var panel = new Element('div').addClass('bubbleContainer');
if ($chk(opts.height))
if ($defined(opts.height))
panel.setStyle('height', opts.height);
if ($chk(opts.width))
if ($defined(opts.width))
panel.setStyle('width', opts.width);
this.center = new Element('div').addClass('bubblePart').addClass('bubbleCenterBlue');
this.center.inject(panel);
if (!$chk(opts.divContainer)) {
if (!$defined(opts.divContainer)) {
opts.divContainer = document.body;
}
panel.injectTop(opts.divContainer);
@@ -76,7 +76,7 @@ mindplot.BubbleTip = new Class({
this.doOpen.delay(500, this, [content,source]);
},
doOpen : function(content, source) {
if ($chk(this._isMouseOver) && !$chk(this._open) && !$chk(this._opening)) {
if ($defined(this._isMouseOver) && !$defined(this._open) && !$defined(this._opening)) {
this._opening = true;
var container = new Element('div');
$(content).inject(container);
@@ -99,10 +99,10 @@ mindplot.BubbleTip = new Class({
},
doClose : function(event) {
if (!$chk(this._isMouseOver) && $chk(this._opening))
if (!$defined(this._isMouseOver) && $defined(this._opening))
this.doClose.delay(500, this, this._evt);
if (!$chk(this._isMouseOver) && $chk(this._open)) {
if (!$defined(this._isMouseOver) && $defined(this._open)) {
this.forceClose();
}
},
@@ -139,9 +139,9 @@ mindplot.BubbleTip = new Class({
},
moveTopic : function(offset, panelHeight, panelWidth, invert, invertX) {
var f = 1, fX = 1;
if ($chk(invert))
if ($defined(invert))
f = 0;
if ($chk(invertX))
if ($defined(invertX))
fX = 0;
var opts = this.options;
$(opts.panel).setStyles({left:offset.x - (panelWidth * fX), top:offset.y - (panelHeight * f)});

4
mindplot/src/main/javascript/IconGroup.js
View File

@@ -104,7 +104,7 @@ mindplot.IconGroup = new Class({
getImageIcon : function(icon) {
var result = null;
this.options.icons.each(function(el, index) {
if (result == null && $chk(el.getModel().isIconModel) && el.getId() == icon.getId() && el.getUiId() == icon.getUiId()) {
if (result == null && $defined(el.getModel().isIconModel) && el.getId() == icon.getId() && el.getUiId() == icon.getUiId()) {
result = el;
}
}, this);
@@ -115,7 +115,7 @@ mindplot.IconGroup = new Class({
var result = null;
this.options.icons.each(function(el, index) {
var elModel = el.getModel();
if (result == null && $chk(elModel.isIconModel) && elModel.getId() == iconModel.getId()) {
if (result == null && $defined(elModel.isIconModel) && elModel.getId() == iconModel.getId()) {
result = el;
}
}, this);

6
mindplot/src/main/javascript/MindmapDesigner.js
View File

@@ -779,7 +779,7 @@ mindplot.MindmapDesigner = new Class({
var topic = null;
if (selectedTopics.length > 0) {
topic = selectedTopics[0];
if (!$chk(topic._hasLink)) {
if (!$defined(topic._hasLink)) {
var msg = new Element('div');
var urlText = new Element('div').inject(msg);
urlText.innerHTML = "URL:"
@@ -832,7 +832,7 @@ mindplot.MindmapDesigner = new Class({
var topic = null;
if (selectedTopics.length > 0) {
topic = selectedTopics[0];
if (!$chk(topic._hasNote)) {
if (!$defined(topic._hasNote)) {
var msg = new Element('div');
var text = new Element('div').inject(msg);
var formElem = new Element('form', {'action': 'none', 'id':'noteFormId'});
@@ -944,7 +944,7 @@ mindplot.MindmapDesigner = new Class({
var key = evt.key;
if (!this._editor.isVisible()) {
if (((evt.code >= 65 && evt.code <= 90) || (evt.code >= 48 && evt.code <= 57)) && !(evt.control || evt.meta)) {
if ($chk(evt.shift)) {
if ($defined(evt.shift)) {
key = key.toUpperCase();
}
this._showEditor(key);

2
mindplot/src/main/javascript/TextEditor.js
View File

@@ -201,7 +201,7 @@ mindplot.TextEditor = new Class({
var textHeight = editor._currentNode.getTextShape().getHeight();
var iconGroup = editor._currentNode.getIconGroup();
var iconGroupSize;
if ($chk(iconGroup)) {
if ($defined(iconGroup)) {
iconGroupSize = editor._currentNode.getIconGroup().getSize();
}
else {

12
mindplot/src/main/javascript/Tip.js
View File

@@ -37,11 +37,11 @@ mindplot.Tip = new Class({
buildTip : function() {
var opts = this.options;
var panel = new Element('div').addClass('bubbleContainer');
if ($chk(opts.height))
if ($defined(opts.height))
panel.setStyle('height', opts.height);
if ($chk(opts.width))
if ($defined(opts.width))
panel.setStyle('width', opts.width);
if (!$chk(opts.divContainer)) {
if (!$defined(opts.divContainer)) {
opts.divContainer = document.body;
}
panel.injectTop(opts.divContainer);
@@ -67,7 +67,7 @@ mindplot.Tip = new Class({
},
doOpen : function(content, source) {
if ($chk(this._isMouseOver) && !$chk(this._open) && !$chk(this._opening)) {
if ($defined(this._isMouseOver) && !$defined(this._open) && !$defined(this._opening)) {
this._opening = true;
var container = new Element('div');
$(content).inject(container);
@@ -93,10 +93,10 @@ mindplot.Tip = new Class({
doClose : function(event) {
if (!$chk(this._isMouseOver) && $chk(this._opening))
if (!$defined(this._isMouseOver) && $defined(this._opening))
this.doClose.delay(500, this, this._evt);
if (!$chk(this._isMouseOver) && $chk(this._open)) {
if (!$defined(this._isMouseOver) && $defined(this._open)) {
this.forceClose();
}
},

12
mindplot/src/main/javascript/Topic.js
View File

@@ -100,12 +100,12 @@ mindplot.Topic.prototype._setShapeType = function(type, updateModel)
//Move iconGroup to front ...
var iconGroup = this.getIconGroup();
if($chk(iconGroup)){
if($defined(iconGroup)){
iconGroup.moveToFront();
}
//Move connector to front
var connector = this.getShrinkConnector();
if($chk(connector)){
if($defined(connector)){
connector.moveToFront();
}
@@ -368,7 +368,7 @@ mindplot.Topic.prototype.removeIcon = function(iconModel){
//Removing the icon from UI
var iconGroup = this.getIconGroup();
if($chk(iconGroup))
if($defined(iconGroup))
{
var imgIcon = iconGroup.findIconFromModel(iconModel);
iconGroup.removeImageIcon(imgIcon);
@@ -385,7 +385,7 @@ mindplot.Topic.prototype.removeLink = function(){
var links = model.getLinks();
model._removeLink(links[0]);
var iconGroup = this.getIconGroup();
if($chk(iconGroup))
if($defined(iconGroup))
{
iconGroup.removeIcon(mindplot.LinkIcon.IMAGE_URL);
if(iconGroup.getIcons().length==0){
@@ -403,7 +403,7 @@ mindplot.Topic.prototype.removeNote = function(){
var notes = model.getNotes();
model._removeNote(notes[0]);
var iconGroup = this.getIconGroup();
if($chk(iconGroup))
if($defined(iconGroup))
{
iconGroup.removeIcon(mindplot.Note.IMAGE_URL);
if(iconGroup.getIcons().length==0){
@@ -484,7 +484,7 @@ mindplot.Topic.prototype._buildTextShape = function(disableEventsListeners)
mindplot.Topic.prototype.getIconOffset = function(){
var iconGroup = this.getIconGroup();
var size = 0;
if($chk(iconGroup))
if($defined(iconGroup))
{
size = iconGroup.getSize().width;
}