Permalink
Browse files

Merge branch 'master' into social-share-link

Conflicts:
	index.html
  • Loading branch information...
2 parents 35b17ff + 833939b commit ffe1a749106725d4e77f7fd6b69bdf49f9a7b407 andrew long committed Apr 9, 2012
Showing with 37 additions and 41 deletions.
  1. +27 −0 README.md
  2. +0 −29 index.html
  3. +1 −2 source/AddressInput.js
  4. +2 −2 source/Browser.js
  5. +2 −2 source/BrowserApp.js
  6. +2 −2 source/StartPage.js
  7. +3 −4 source/URLSearch.js
View
@@ -0,0 +1,27 @@
+isis-browser
+============
+
+isis-browser is the enyo browser app for webOS.
+
+It uses the enyo WebView control to display web content which in turn
+uses BrowserAdapter and BrowserServer to talk to webOS webkit.
+
+# Copyright and License Information
+
+All content, including all source code files and documentation files in this repository are:
+ Copyright (c) 2012 Hewlett-Packard Development Company, L.P.
+
+All content, including all source code files and documentation files in this repository are:
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this content except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+# end Copyright and License Information
View
@@ -1,29 +0,0 @@
-<!DOCTYPE html>
-
-<!-- Copyright 2012 Hewlett-Packard Development Company, L.P. -->
-<!>
-<!-- Licensed under the Apache License, Version 2.0 (the "License"); -->
-<!-- you may not use this file except in compliance with the License. -->
-<!-- You may obtain a copy of the License at-->
-<!>
-<!-- http://www.apache.org/licenses/LICENSE-2.0 -->
-<!>
-<!-- Unless required by applicable law or agreed to in writing, software -->
-<!-- distributed under the License is distributed on an "AS IS" BASIS, -->
-<!-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -->
-<!-- See the License for the specific language governing permissions and -->
-<!-- limitations under the License. -->
-
-<html>
-<head>
- <title>Web</title>
- <!--<script src="../../enyo/0.10/framework/enyo.js" type="text/javascript"></script>-->
- <script src="/usr/palm/frameworks/enyo/0.10/framework/enyo.js" type="text/javascript" launch="bridged"></script>
- <!--<script src="/media/work/git/enyo-dev/framework/enyo.js" type="text/javascript" launch="debug"></script>-->
-</head>
-<body>
-<script type="text/javascript">
- enyo.create({kind: "BrowserApp"}).renderInto(document.body);
-</script>
-</body>
-</html>
@@ -114,7 +114,6 @@ enyo.kind({
this.setLoading(true);
var value = this.getUserInput(true);
this.doGo(value);
- // XXX: I dunno why I have to do this
document.activeElement.blur();
},
getUserInput: function(inRaw) {
@@ -127,7 +126,7 @@ enyo.kind({
},
clearInput: function() {
this.$.userinput.setValue("");
- // XXX: input is blurred here causing the keyboard to reappear
+ // input is blurred here causing the keyboard to reappear
this.$.userinput.forceFocus();
},
forceFocus: function() {
View
@@ -451,7 +451,7 @@ enyo.kind({
this.doPageLoadStopped(this.url);
},
loadCompleted: function() {
- // note: seems to be sent spuriously
+ // empty
},
clearProgress: function() {
this.$.actionbar.setProgress(0);
@@ -494,7 +494,7 @@ enyo.kind({
var icon64 = p + "icon64-" + t + ".png";
this.viewCall("saveViewToFile", [thumbnail, 0, 0, w, h]);
this.viewCall("generateIconFromFile", [thumbnail, icon64, 0, 0, w, h]);
- //FIXME: do we resize the icon or thumbnail?
+ //FIXME: resize the icon or thumbnail?
this.viewCall("resizeImage", [icon64, icon32, 32, 32]);
return {thumbnailFile: thumbnail, iconFile32: icon32, iconFile64: icon64};
return {};
@@ -224,7 +224,7 @@ enyo.kind({
},
browserShown: function(inSender, inShowing, inRefresh) {
enyo.keyboard.setResizesWindow(false);
- // FIXME: there's some weird transition skag. trying to eliminate.
+ // FIXME: there's a transition skag. trying to eliminate.
setTimeout(enyo.hitch(this, function() {
this.$.browser.viewCall("activate");
if (inRefresh || !this.$.browser.getUrl()) {
@@ -528,7 +528,7 @@ enyo.kind({
if (this.$.browser) {
this.$.browser.clearHistory();
}
- // XXX remove when open search is redesigned - clearing history
+ // remove when open search is redesigned - clearing history
// also clears user added search engines
this.$.clearOptionalSearchListService.call();
},
View
@@ -62,10 +62,10 @@ enyo.kind({
//* @public
resize: function() {
this.$.actionbar.resize();
- // XXX hack to workaround a repaint issue where the area behind
+ // Workaround a repaint issue where the area behind
// the keyboard does not get repainted when switch cards, if the
// keyboard resizes the window. This is temporary until the native
- // issue is fixed. (DFISH-17918)
+ // issue is fixed.
var b = enyo.calcModalControlBounds(this.$.tall);
this.$.placeholder.applyStyle("height", b.height + "px");
},
View
@@ -59,7 +59,6 @@ enyo.kind({
//* @protected
defaultSearchPreferences: [{
title: "Google",
- //url: "http://www.google.com/m/search?client=ms-palm-webOS&channel=bm&q={$query}",
url: "http://www.google.com/search?q={$query}",
icon: "list-icon-google.png"
}, {
@@ -165,7 +164,7 @@ enyo.kind({
if (!provider) {
return;
}
- // FIXME: this is a pita to have to set top-bottom item styling
+ // FIXME: set top-bottom item styling
var s = inIndex == 0 ? "border-top: 0;" : (inIndex == list.length-1 ? "border-bottom: 0;" : "");
// title
var v = this.$.address.getUserInput(true);
@@ -237,7 +236,7 @@ enyo.kind({
},
//* public
resize: function() {
- // XXX need to handle resize manually here because the
+ // need to handle resize manually here because the
// search dropdown needs to match the width of the
// address bar, and Popup doesn't have a minSize
// setting yet
@@ -253,7 +252,7 @@ enyo.kind({
},
closeSearchPopup: function(inKeepFocus) {
this.log(inKeepFocus);
- // FIXME: try to eliminate some weird transition artifact
+ // FIXME: eliminate transition artifact
setTimeout(enyo.hitch(this, function() {
if (this.$.searchPopup.isOpen) {
this.$.searchPopup.close();

0 comments on commit ffe1a74

Please sign in to comment.