Revision: 18680
http://sourceforge.net/p/jmol/code/18680
Author: hansonr
Date: 2013-09-19 19:08:59 +0000 (Thu, 19 Sep 2013)
Log Message:
-----------
Modified Paths:
--------------
trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java
trunk/Jmol/src/org/jmol/viewer/ActionManager.java
trunk/Jmol/src/org/jmol/viewer/Jmol.properties
Modified: trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java
===================================================================
--- trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java 2013-09-19 04:20:01 UTC
(rev 18679)
+++ trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java 2013-09-19 19:08:59 UTC
(rev 18680)
@@ -2867,7 +2867,7 @@
sx.message += s;
sx.untranslated += s;
if (thisContext != null || chk
- || msg.indexOf("file recognized as a script file:") >= 0)
+ || msg.indexOf(JC.NOTE_SCRIPT_FILE) >= 0)
return;
Logger.error("eval ERROR: " + toString());
if (viewer.autoExit)
Modified: trunk/Jmol/src/org/jmol/viewer/ActionManager.java
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/ActionManager.java 2013-09-19 04:20:01 UTC
(rev 18679)
+++ trunk/Jmol/src/org/jmol/viewer/ActionManager.java 2013-09-19 19:08:59 UTC
(rev 18680)
@@ -1041,6 +1041,13 @@
Long.MAX_VALUE);
checkReleaseAction(x, y, time, dragRelease);
return;
+ case Binding.WHEELED:
+ if (viewer.isApplet() && !viewer.hasFocus())
+ return;
+ setCurrent(time, current.x, current.y, buttonMods);
+ checkDragWheelAction(Binding.getMouseAction(0, buttonMods,
+ Binding.WHEELED), current.x, current.y, 0, y, time, Binding.WHEELED);
+ return;
case Binding.CLICKED:
setMouseMode();
clickedCount = (count > 1 ? count : clicked.check(0, 0, 0, buttonMods,
@@ -1059,13 +1066,6 @@
Binding.CLICKED);
checkClickAction(x, y, time, clickedCount);
return;
- case Binding.WHEELED:
- if (viewer.isApplet() && !viewer.hasFocus())
- return;
- setCurrent(time, current.x, current.y, buttonMods);
- checkDragWheelAction(Binding.getMouseAction(0, buttonMods,
- Binding.WHEELED), current.x, current.y, 0, y, time, Binding.WHEELED);
- return;
}
}
@@ -1237,7 +1237,7 @@
}
}
- if (dragAtomIndex >= 0 && isBound(dragWheelAction, ACTION_assignNew)
+ if (dragAtomIndex >= 0 && mode == Binding.DRAGGED && isBound(clickAction,
ACTION_assignNew)
&& atomPickingMode == PICKING_ASSIGN_ATOM) {
int nearestAtomIndex = viewer.findNearestAtomIndexMovable(x, y, false);
if (nearestAtomIndex >= 0) {
Modified: trunk/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2013-09-19 04:20:01 UTC
(rev 18679)
+++ trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2013-09-19 19:08:59 UTC
(rev 18680)
@@ -11,7 +11,7 @@
# The quotes above look odd for a parameter file, but they are
# important for the JavaScript version of Jmol.
-___JmolVersion="13.3.6"
+___JmolVersion="13.3.6"
code: code merge between 13.2 and 13.3 18 Sept 2013
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
LIMITED TIME SALE - Full Year of Microsoft Training For Just $49.99!
1,500+ hours of tutorials including VisualStudio 2012, Windows 8, SharePoint
2013, SQL 2012, MVC 4, more. BEST VALUE: New Multi-Library Power Pack includes
Mobile, Cloud, Java, and UX Design. Lowest price ever! Ends 9/20/13.
http://pubads.g.doubleclick.net/gampad/clk?id=58041151&iu=/4140/ostg.clktrk
_______________________________________________
Jmol-commits mailing list
Jmol-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jmol-commits
