Skip to content

Commit 3f6583f

Browse files
hansonrhansonr
hansonr
authored and
hansonr
committed
try again!
1 parent d44a239 commit 3f6583f

File tree

7 files changed

+3
-37
lines changed

7 files changed

+3
-37
lines changed

‎sources/net.sf.j2s.core/dist/swingjs/SwingJS-site.zip‎

4 MB
Binary file not shown.

‎sources/net.sf.j2s.core/dist/swingjs/timestamp‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
1-
<<<<<<< HEAD
2-
20181222153027
3-
=======
4-
20181220202217
5-
>>>>>>> branch 'hanson1' of https://github.com/BobHanson/java2script.git
1+
20181222154242

‎sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/SwingJS-site.zip‎

4 MB
Binary file not shown.

‎sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/timestamp‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
1-
<<<<<<< HEAD
2-
20181222153027
3-
=======
4-
20181220202217
5-
>>>>>>> branch 'hanson1' of https://github.com/BobHanson/java2script.git
1+
20181222154242

‎sources/net.sf.j2s.java.core/dist/SwingJS-site.zip‎

4 MB
Binary file not shown.

‎sources/net.sf.j2s.java.core/src/swingjs/jquery/j2sMenu.js‎

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -109,12 +109,8 @@ var r=e(t.target).closest(".ui-menu-item");
109109
.children("a").removeUniqueId().removeClass("ui-corner-all ui-state-hover")
110110
.removeAttr("tabIndex").removeAttr("role").removeAttr("aria-haspopup").children().each(function(){var t=e(this);t.data("ui-menu-submenu-carat")&&t.remove()}),this.element.find(".ui-menu-divider").removeClass("ui-menu-divider ui-widget-content")
111111
},
112-
<<<<<<< HEAD
113-
_keydown:function(t){function a(e){return e.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&")}var n,r,i,s,o,u=!0;switch(t.keyCode){case e.ui.keyCode.PAGE_UP:this.previousPage(t);break;case e.ui.keyCode.PAGE_DOWN:this.nextPage(t);break;case e.ui.keyCode.HOME:this._move("first","first",t);break;case e.ui.keyCode.END:this._move("last","last",t);break;case e.ui.keyCode.UP:this.previous(t);break;case e.ui.keyCode.DOWN:this.next(t);break;case e.ui.keyCode.LEFT:this.collapse(t);break;case e.ui.keyCode.RIGHT:this.active&&!this.active.is(".ui-state-disabled")&&this.expand(t);break;case e.ui.keyCode.ENTER:case e.ui.keyCode.SPACE:this._activate(t);break;case e.ui.keyCode.ESCAPE:this.collapse(t);break;default:u=!1,r=this.previousFilter||"",i=String.fromCharCode(t.keyCode),s=!1,clearMe(this.filterTimer),i===r?s=!0:i=r+i,o=new RegExp("^"+a(i),"i"),n=this.activeMenu.children(".ui-menu-item").filter(function(){return o.test(e(this).children("a").text())}),n=s&&n.index(this.active.next())!==-1?this.active.nextAll(".ui-menu-item"):n,n.length||(i=String.fromCharCode(t.keyCode),o=new RegExp("^"+a(i),"i"),n=this.activeMenu.children(".ui-menu-item").filter(function(){return o.test(e(this).children("a").text())})),n.length?(this.focus(t,n),n.length>1?(this.previousFilter=i,
112+
_keydown:function(t){function a(e){return e.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&")}var n,r,i,s,o,u=!0;switch(t.keyCode){case e.ui.keyCode.PAGE_UP:this.previousPage(t);break;case e.ui.keyCode.PAGE_DOWN:this.nextPage(t);break;case e.ui.keyCode.HOME:this._move("first","first",t);break;case e.ui.keyCode.END:this._move("last","last",t);break;case e.ui.keyCode.UP:this.previous(t);break;case e.ui.keyCode.DOWN:this.next(t);break;case e.ui.keyCode.LEFT:this.collapse(t);break;case e.ui.keyCode.RIGHT:this.active&&!this.active.is(".ui-state-disabled")&&this.expand(t);break;case e.ui.keyCode.ENTER:case e.ui.keyCode.SPACE:this._activate(t);break;case e.ui.keyCode.ESCAPE:this.collapse(t);break;default:u=!1,r=this.previousFilter||"",i=String.fromCharCode(t.keyCode),s=!1,clearMe(this.filterTimer),i===r?s=!0:i=r+i,o=new RegExp("^"+a(i),"i"),n=this.activeMenu.children(".ui-menu-item").filter(function(){return o.test(e(this).children("a").text())}),n=s&&n.index(this.active.next())!==-1?this.active.nextAll(".ui-menu-item"):n,n.length||(i=String.fromCharCode(t.keyCode),o=new RegExp("^"+a(i),"i"),n=this.activeMenu.children(".ui-menu-item").filter(function(){return o.test(e(this).children("a").text())})),n.length?(this.focus(t,n),n.length>1?(this.previousFilter=i,
114113
this.filterTimer=delayMe(function(){delete this.previousFilter},1e3)):delete this.previousFilter):delete this.previousFilter}u&&t.preventDefault()},
115-
=======
116-
_keydown:function(t){function a(e){return e.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&")}var n,r,i,s,o,u=!0;switch(t.keyCode){case e.ui.keyCode.PAGE_UP:this.previousPage(t);break;case e.ui.keyCode.PAGE_DOWN:this.nextPage(t);break;case e.ui.keyCode.HOME:this._move("first","first",t);break;case e.ui.keyCode.END:this._move("last","last",t);break;case e.ui.keyCode.UP:this.previous(t);break;case e.ui.keyCode.DOWN:this.next(t);break;case e.ui.keyCode.LEFT:this.collapse(t);break;case e.ui.keyCode.RIGHT:this.active&&!this.active.is(".ui-state-disabled")&&this.expand(t);break;case e.ui.keyCode.ENTER:case e.ui.keyCode.SPACE:this._activate(t);break;case e.ui.keyCode.ESCAPE:this.collapse(t);break;default:u=!1,r=this.previousFilter||"",i=String.fromCharCode(t.keyCode),s=!1,clearTimeout(this.filterTimer),i===r?s=!0:i=r+i,o=new RegExp("^"+a(i),"i"),n=this.activeMenu.children(".ui-menu-item").filter(function(){return o.test(e(this).children("a").text())}),n=s&&n.index(this.active.next())!==-1?this.active.nextAll(".ui-menu-item"):n,n.length||(i=String.fromCharCode(t.keyCode),o=new RegExp("^"+a(i),"i"),n=this.activeMenu.children(".ui-menu-item").filter(function(){return o.test(e(this).children("a").text())})),n.length?(this.focus(t,n),n.length>1?(this.previousFilter=i,this.filterTimer=this._delay(function(){delete this.previousFilter},1e3)):delete this.previousFilter):delete this.previousFilter}u&&t.preventDefault()},
117-
>>>>>>> branch 'hanson1' of https://github.com/BobHanson/java2script.git
118114
_activate:function(e){this.active.is(".ui-state-disabled")||(this.active.children("a[aria-haspopup='true']").length?this.expand(e):this.select(e))},
119115
refresh:function(){
120116
var t,n=this.options.icons.submenu,role=this.options.role,
@@ -137,11 +133,7 @@ var r=e(t.target).closest(".ui-menu-item");
137133
r.attr("id")),
138134
this.active.parent().closest(".ui-menu-item").children("a:first").addClass("ui-state-active"),
139135
e&&e.type==="keydown"?this._close():
140-
<<<<<<< HEAD
141136
this.timer=delayMe(this, function(){this._close()},this.delay),
142-
=======
143-
this.timer=this._delay(function(){this._close()},this.delay),
144-
>>>>>>> branch 'hanson1' of https://github.com/BobHanson/java2script.git
145137
n=t.children(".ui-menu"),n.length&&/^mouse/.test(e.type)
146138
&&this._startOpening(n),this.activeMenu=t.parent(),
147139
this._trigger("focus",e,{item:t})},
@@ -153,7 +145,6 @@ this._trigger("focus",e,{item:t})},
153145
}
154146

155147

156-
<<<<<<< HEAD
157148
t||clearMe(this.timer);if(!this.active)return;
158149

159150
this.active
@@ -163,15 +154,6 @@ this._trigger("focus",e,{item:t})},
163154
_startOpening:function(e){clearMe(this.timer);if(e.attr("aria-hidden")!=="true")return;
164155
this.timer=delayMe(this, function(){this._close(),this._open(e)},this.delay)},
165156
_open:function(t){var n=e.extend({of:this.active},this.options.position);clearMe(this.timer),this.element.find(".ui-menu").not(t.parents(".ui-menu")).hide().attr("aria-hidden","true"),t.show().removeAttr("aria-hidden").attr("aria-expanded","true").position(n)},
166-
=======
167-
t||clearTimeout(this.timer);if(!this.active)return;
168-
169-
this.active
170-
//.children("a")
171-
.removeClass("ui-state-focus"),this.active=null,this._trigger("blur",e,{item:this.active})},
172-
_startOpening:function(e){clearTimeout(this.timer);if(e.attr("aria-hidden")!=="true")return;this.timer=this._delay(function(){this._close(),this._open(e)},this.delay)},
173-
_open:function(t){var n=e.extend({of:this.active},this.options.position);clearTimeout(this.timer),this.element.find(".ui-menu").not(t.parents(".ui-menu")).hide().attr("aria-hidden","true"),t.show().removeAttr("aria-hidden").attr("aria-expanded","true").position(n)},
174-
>>>>>>> branch 'hanson1' of https://github.com/BobHanson/java2script.git
175157
collapseAll:function(t,n){
176158
clearMe(this.timer),
177159
this.timer=delayMe(this,
@@ -200,12 +182,8 @@ e.find(".ui-menu")
200182
collapse:function(e){var t=this.active&&this.active.parent().closest(".ui-menu-item",this.element);t&&t.length&&(this._close(),
201183
this.focus(e,t))
202184
},
203-
<<<<<<< HEAD
204185
expand:function(e){var t=this.active&&this.active.children(".ui-menu ").children(".ui-menu-item").first();t&&t.length&&(this._open(t.parent()),
205186
delayMe(this,function(){this.focus(e,t)}))},
206-
=======
207-
expand:function(e){var t=this.active&&this.active.children(".ui-menu ").children(".ui-menu-item").first();t&&t.length&&(this._open(t.parent()),this._delay(function(){this.focus(e,t)}))},
208-
>>>>>>> branch 'hanson1' of https://github.com/BobHanson/java2script.git
209187
next:function(e){this._move("next","first",e)},
210188
previous:function(e){this._move("prev","last",e)},
211189
isFirstItem:function(){return this.active&&!this.active.prevAll(".ui-menu-item").length},

‎sources/net.sf.j2s.java.core/src/swingjs/plaf/JSTableUI.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -153,11 +153,7 @@ public void setTainted() {
153153
@Override
154154
public void propertyChange(PropertyChangeEvent e) {
155155
String prop = e.getPropertyName();
156-
<<<<<<< HEAD
157156
System.out.println("JSTableUI prop=" + prop);
158-
=======
159-
System.out.println("JSTableUI prop=" + e);
160-
>>>>>>> branch 'hanson1' of https://github.com/BobHanson/java2script.git
161157
switch (prop) {
162158
case "model":
163159
currentRowMin = currentRowMax = -1;

0 commit comments

Comments
 (0)