Merge remote-tracking branch 'origin/develop' into mw
* origin/develop: (40 commits)
DATABIND : support the file system (code gen)
ANIMATOR : Refresh Scroll Zoom In/out Scroll is refreshed when zoom in/out flow.
UIB: modify the JNI code
UIB: changed managed.css to index.managed.css
UIB: add data-uib attirbute to script, link tag
DATABIND : bug fix - combo lazy rendering in Set source Dialog.
ANIMATOR : Move PlayHeader During a play time of a page beyond the mask, move the other page.
UIB: added "getNewIdProperty" method in Part Now we can know a part's IdProperty before the part is added. Then unnecessary PropertyChanged event won't be fired.
PAGETEMP: fixed context menu text. from "Delete Page" to "Delete Template"
ANIMATOR : Change TimeTextBox State TextBox's color will be changed If some number is inserted.
UIB: add showInspector func
ANIMATOR : Changed Animator Timeline UI/UX New UI is applied Animator's Timeline.
UIB : add webinspector
DATABIND : Modify Set Source Dialog. change source type name Upper case to lower case( Static, Remote, File System Data source). static data source text update when combo in tree select . data model use compact data string.
ANIMATOR : Implements method that get Previous KeyframeUnit by time When mergeKeyframe unit get Previous Keyframe unit by current time. not index of list
Merge remote-tracking branch 'origin/mw' into develop
UIB : Fix initializing index.html. Remove managed.css when index.html loading time.
PROP : Advanced border style layout.
DATABIND : update listdivider widget descriptor a. add text binding for the listdivider widget
NSCREEN : remove move action 1. nscreen item : remove move action
...
Conflicts:
org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/model/AnimatorFrame.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/model/AnimatorKeyframe.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/ui/views/timeline/TimelineContentContainer.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/ui/views/timeline/common/TimelineConstants.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/ui/views/timeline/tool/TimelineToolbar.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/ui/views/timeline/tree/TimelineOutlineElement.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/ui/views/timeline/widget/KeyFrameUnit.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/app/AppManagerForHTML.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/databinding/dialog/SetSourcePage.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/databinding/dialog/StaticSubPage.java
Change-Id: Ic539c314c421edb068a159059ded07e87164e22e
Signed-off-by: youngduk.hwang <youngduk.hwang@samsung.com>