Compare commits

...

3 Commits

Author SHA1 Message Date
Joe Bowser
fe450e357c Forgot Apache Headers on MessageTest 2013-12-03 15:52:25 -08:00
Joe Bowser
214934cc03 Set VERSION to 3.3.0-rc1 (via coho) 2013-12-03 15:44:20 -08:00
Joe Bowser
1c710f8459 Update JS snapshot to version 3.3.0-rc1 (via coho) 2013-12-03 15:44:19 -08:00
5 changed files with 24 additions and 6 deletions

View File

@@ -1 +1 @@
3.3.0-dev
3.3.0-rc1

View File

@@ -20,6 +20,6 @@
*/
// Coho updates this line:
var VERSION = "3.3.0-dev";
var VERSION = "3.3.0-rc1";
console.log(VERSION);

View File

@@ -1,5 +1,5 @@
// Platform: android
// 3.3.0-dev-aac4947
// 3.3.0-rc1
/*
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -19,7 +19,7 @@
under the License.
*/
;(function() {
var CORDOVA_JS_BUILD_LABEL = '3.3.0-dev-aac4947';
var CORDOVA_JS_BUILD_LABEL = '3.3.0-rc1';
// file: lib/scripts/require.js
/*jshint -W079 */
@@ -552,7 +552,7 @@ function include(parent, objects, clobber, merge) {
include(result, obj.children, clobber, merge);
}
} catch(e) {
utils.alert('Exception building cordova JS globals: ' + e + ' for key "' + key + '"');
utils.alert('Exception building Cordova JS globals: ' + e + ' for key "' + key + '"');
}
});
}

View File

@@ -68,7 +68,7 @@ import android.widget.FrameLayout;
public class CordovaWebView extends WebView {
public static final String TAG = "CordovaWebView";
public static final String CORDOVA_VERSION = "3.3.0-dev";
public static final String CORDOVA_VERSION = "3.3.0-rc1";
private ArrayList<Integer> keyDownCodes = new ArrayList<Integer>();
private ArrayList<Integer> keyUpCodes = new ArrayList<Integer>();

View File

@@ -1,3 +1,21 @@
/*
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file
to you 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.
*/
package org.apache.cordova.test.junit;
import org.apache.cordova.CordovaPlugin;